Merge branch 'dev-3.0.0' of https://github.com/ecomfe/echarts into dev-3.0.0

build/build.sh

@@ -2,7 +2,13 @@
 
 rm -r ../dist
 
-node r.js -o config.js
-node optimize.js
+node r.js -o config/echarts.simple.js
+node optimize.js -m simple
 
-node r.js -o dataTool.js
+node r.js -o config/echarts.common.js
+node optimize.js -m common
+
+node r.js -o config/echarts.js
+node optimize.js -m all
+
+node r.js -o config/dataTool.js

build/dataTool.js → build/config/dataTool.js

 ({
-    // appDir: './',
-    // baseUrl: '../src',
-    // optimize: 'none',
+    baseUrl: '../',
     name: 'echarts',
     paths: {
         extension: '../extension',
@@ -20,5 +18,5 @@
         'extension/dataTool/prepareBoxplotData',
         'extension/dataTool/gexf'
     ],
-    out: '../dist/extension/dataTool.js'
+    out: '../../dist/extension/dataTool.js'
 })
\ No newline at end of file

build/config/echarts.common.js

+({
+    baseUrl: '../',
+    optimize: 'none',
+    name: 'echarts',
+    packages: [
+        {
+            name: 'zrender',
+            location: '../../zrender/src',
+            main: 'zrender'
+        },
+        {
+            name: 'echarts',
+            location: '../src',
+            main: 'echarts'
+        }
+    ],
+    include:[
+        'echarts/chart/line',
+        'echarts/chart/bar',
+        'echarts/chart/pie',
+        'echarts/chart/scatter',
+        'echarts/component/tooltip',
+        'echarts/component/legend',
+
+        'echarts/component/grid',
+        'echarts/component/title',
+
+        'echarts/component/markPoint',
+        'echarts/component/markLine',
+        'echarts/component/dataZoom',
+        'echarts/component/toolbox',
+
+        'zrender/vml/vml'
+    ],
+    out: '../../dist/echarts.common.js'
+})
\ No newline at end of file

build/config.js → build/config/echarts.js

 ({
-    // appDir: './',
-    // baseUrl: '../src',
+    baseUrl: '../',
     optimize: 'none',
     name: 'echarts',
     packages: [
         {
             name: 'zrender',
-            location: '../../zrender-dev3.0/src',
+            location: '../../zrender/src',
             main: 'zrender'
         },
         {
@@ -54,9 +53,7 @@
         'echarts/component/timeline',
         'echarts/component/toolbox',
 
-        'echarts/scale/Time',
-        'echarts/scale/Log',
         'zrender/vml/vml'
     ],
-    out: '../dist/echarts.js'
+    out: '../../dist/echarts.js'
 })
\ No newline at end of file

build/config/echarts.simple.js

+({
+    baseUrl: '../',
+    optimize: 'none',
+    name: 'echarts',
+    packages: [
+        {
+            name: 'zrender',
+            location: '../../zrender/src',
+            main: 'zrender'
+        },
+        {
+            name: 'echarts',
+            location: '../src',
+            main: 'echarts'
+        }
+    ],
+    include:[
+        'echarts/chart/line',
+        'echarts/chart/bar',
+        'echarts/chart/pie',
+        'echarts/component/grid'
+    ],
+    out: '../../dist/echarts.simple.js'
+})
\ No newline at end of file

build/optimizeString.js → build/mangleString.js

@@ -48,7 +48,7 @@ var base54 = (function(){
     };
 })();
 
-function optimizeString(source) {
+function mangleString(source) {
 
     var ast = esprima.parse(source, {
         loc: true
@@ -162,4 +162,4 @@ function optimizeString(source) {
     );
 }
 
-exports = module.exports = optimizeString;
\ No newline at end of file
+exports = module.exports = mangleString;
\ No newline at end of file

build/optimize.js

 var UglifyJS = require('uglify-js');
 var fs = require('fs');
 var etpl = require('etpl');
+var argv = require('optimist').argv;
 
 etpl.config({
     commandOpen: '/**',
     commandClose: '*/'
 });
 
-var config = eval('(' + fs.readFileSync('config.js', 'utf-8') + ')');
-var mainCode = fs.readFileSync('../dist/echarts.js', 'utf-8');
+var mode = argv.m || 'all';
+var configPath = mode === 'all' ? 'config/echarts.js' : 'config/echarts.' + mode + '.js';
+var outPath = mode === 'all' ? '../dist/echarts.js' : '../dist/echarts.' + mode + '.js';
+
+var config = eval('(' + fs.readFileSync(configPath, 'utf-8') + ')');
+var mainCode = fs.readFileSync(outPath, 'utf-8');
 var startCode = fs.readFileSync('wrap/start.js', 'utf-8');
 var nutCode = fs.readFileSync('wrap/nut.js', 'utf-8');
 var endCode = fs.readFileSync('wrap/end.js', 'utf-8');
@@ -18,8 +23,7 @@ endCode = etpl.compile(endCode)({
 });
 
 // FIXME
-var sourceCode = [startCode, nutCode, require('./optimizeString')(mainCode), endCode].join('\n');
-// var sourceCode = [startCode, nutCode, mainCode, endCode].join('\n');
+var sourceCode = [startCode, nutCode, require('./mangleString')(mainCode), endCode].join('\n');
 
 var ast = UglifyJS.parse(sourceCode);
 /* jshint camelcase: false */
@@ -32,5 +36,5 @@ ast.figure_out_scope();
 ast.compute_char_frequency();
 ast.mangle_names();
 
-fs.writeFileSync('../dist/echarts.js', [startCode, nutCode, mainCode, endCode].join('\n'), 'utf-8');
-fs.writeFileSync('../dist/echarts.min.js', ast.print_to_string(), 'utf-8');
\ No newline at end of file
+fs.writeFileSync(outPath, [startCode, nutCode, mainCode, endCode].join('\n'), 'utf-8');
+fs.writeFileSync(outPath.replace('.js', '.min.js'), ast.print_to_string(), 'utf-8');
\ No newline at end of file

build/wrap/end.js

@@ -4,9 +4,5 @@ var echarts = require('echarts');
 require("${mod}");
 /** /for */
 
-/** if: ${vml} */
-require('zrender/vml/vml');
-/** /if */
-
 return echarts;
 }));

src/action/createDataSelectAction.js

@@ -10,14 +10,25 @@ define(function (require) {
              * @property {string} name
              */
             echarts.registerAction(actionInfo, function (payload, ecModel) {
+                var selected = {};
                 ecModel.eachComponent(
                     {mainType: 'series', subType: seriesType, query: payload},
                     function (seriesModel) {
                         if (seriesModel[actionInfo.method]) {
                             seriesModel[actionInfo.method](payload.name);
                         }
+                        var data = seriesModel.getData();
+                        // Create selected map
+                        data.each(function (idx) {
+                            var name = data.getName(idx);
+                            selected[name] = seriesModel.isSelected(name) || false;
+                        });
                     }
                 );
+                return {
+                    name: payload.name,
+                    selected: selected
+                };
             });
         });
     };

src/chart/line/LineSeries.js

@@ -28,6 +28,9 @@ define(function(require) {
 
             polarIndex: 0,
 
+            // If clip the overflow value
+            clipOverflow: true,
+
             label: {
                 normal: {
                     // show: false,

src/chart/line/LineView.js

@@ -99,15 +99,16 @@ define(function(require) {
         var width = xExtent[1] - x;
         var height = yExtent[1] - y;
         // Expand clip shape to avoid line value exceeds axis
-        if (isHorizontal) {
-            height *= 10;
-            y -= height / 2;
-        }
-        else {
-            width *= 10;
-            x -= width / 2;
+        if (!seriesModel.get('clipOverflow')) {
+            if (isHorizontal) {
+                y -= height;
+                height *= 3;
+            }
+            else {
+                x -= width;
+                width *= 3;
+            }
         }
-        isHorizontal ? (height *= 10) : (width *= 10);
         var clipPath = new graphic.Rect({
             shape: {
                 x: x,

src/component/legend/LegendModel.js

@@ -30,15 +30,18 @@ define(function(require) {
 
             // If has any selected in option.selected
             var selectedMap = this.option.selected;
-            var hasSelected = false;
-            for (var name in selectedMap) {
-                if (selectedMap[name]) {
-                    legendData[0] && this.select(name);
-                    hasSelected = true;
+            // If selectedMode is single, try to select one
+            if (legendData[0] && this.get('selectedMode') === 'single') {
+                var hasSelected = false;
+                for (var name in selectedMap) {
+                    if (selectedMap[name]) {
+                        this.select(name);
+                        hasSelected = true;
+                    }
                 }
+                // Try select the first if selectedMode is single
+                !hasSelected && this.select(legendData[0].get('name'));
             }
-            // Try select the first if selectedMode is single
-            !hasSelected && legendData[0] && this.select(legendData[0].get('name'));
         },
 
         mergeOption: function (option) {

src/component/legend/legendAction.js

@@ -6,11 +6,21 @@ define(function(require) {
     var echarts = require('../../echarts');
     var zrUtil = require('zrender/core/util');
 
-    function legendSelectActionHandler(methodName, action, ecModel) {
+    function legendSelectActionHandler(methodName, payload, ecModel) {
         var selectedMap = {};
+        var isToggleSelect = methodName === 'toggleSelected';
+        var isSelected;
         // Update all legend components
         ecModel.eachComponent('legend', function (legendModel) {
-            legendModel[methodName](action.name);
+            if (isToggleSelect && isSelected != null) {
+                // Force other legend has same selected status
+                // Or the first is toggled to true and other are toggled to false
+                legendModel[isSelected ? 'select' : 'unSelect'](payload.name);
+            }
+            else {
+                legendModel[methodName](payload.name);
+                isSelected = legendModel.isSelected(payload.name);
+            }
             var legendData = legendModel.getData();
             zrUtil.each(legendData, function (model) {
                 var name = model.get('name');
@@ -30,7 +40,7 @@ define(function(require) {
         });
         // Return the event explicitly
         return {
-            name: action.name,
+            name: payload.name,
             selected: selectedMap
         };
     }

src/component/toolbox/feature/MagicType.js

@@ -128,6 +128,7 @@ define(function(require) {
         );
         api.dispatchAction({
             type: 'changeMagicType',
+            currentType: type,
             newOption: newOption
         });
     };

src/echarts.js

@@ -572,8 +572,10 @@ define(function (require) {
             var updateMethod = actionInfo.update || 'update';
 
             var payloads = [payload];
+            var batched = false;
             // Batch action
             if (payload.batch) {
+                batched = true;
                 payloads = zrUtil.map(payload.batch, function (item) {
                     item = zrUtil.defaults(zrUtil.extend({}, item), payload);
                     item.batch = null;
@@ -594,7 +596,7 @@ define(function (require) {
                 eventObj.type = actionInfo.event || eventObj.type;
                 eventObjBatch.push(eventObj);
 
-                // Highlight and downplay is special.
+                // Highlight and downplay are special.
                 isHighlightOrDownplay && updateMethods[updateMethod].call(this, batchItem);
             }
 
@@ -602,7 +604,8 @@ define(function (require) {
                 && updateMethods[updateMethod].call(this, payload);
 
             if (!silent) {
-                if (eventObjBatch.length > 1) {
+                // Follow the rule of action batch
+                if (batched) {
                     eventObj = {
                         type: eventObjBatch[0].type,
                         batch: eventObjBatch