echarts 3.6.1 → 3.7.2

package/src/data/List.js

@@ -983,7 +983,7 @@ define(function (require) {
 
     /**
      * Set layout property.
-     * @param {string} key
+     * @param {string|Object} key
      * @param {*} [val]
      */
     listProto.setLayout = function (key, val) {

package/src/data/Tree.js

@@ -220,7 +220,7 @@ define(function(require) {
         },
 
         /**
-         * @param {string} path
+         * @param {string} [path]
          * @return {module:echarts/model/Model}
          */
         getModel: function (path) {
@@ -405,7 +405,7 @@ define(function(require) {
      * }
      *
      * @static
-     * @param {Objec} dataRoot Root node.
+     * @param {Object} dataRoot Root node.
      * @param {module:echarts/model/Model} hostModel
      * @param {Array.<Object>} levelOptions
      * @return module:echarts/data/Tree

package/src/data/helper/completeDimensions.js

@@ -97,7 +97,6 @@ define(function (require) {
                 if (resultDimIdx != null && resultDimIdx < dimCount) {
                     dataDims[coordDimIndex] = resultDimIdx;
                     applyDim(result[resultDimIdx], coordDim, coordDimIndex);
-                    // coordDim === 'value' && valueCandidate == null && (valueCandidate = resultDimIdx);
                 }
             });
         });
@@ -137,7 +136,6 @@ define(function (require) {
             each(dataDims, function (resultDimIdx, coordDimIndex) {
                 var resultItem = result[resultDimIdx];
                 applyDim(defaults(resultItem, sysDimItem), coordDim, coordDimIndex);
-                // coordDim === 'value' && valueCandidate == null && (valueCandidate = resultDimIdx);
                 if (resultItem.name == null && sysDimItemDimsDef) {
                     resultItem.name = resultItem.tooltipName = sysDimItemDimsDef[coordDimIndex];
                 }
@@ -160,14 +158,6 @@ define(function (require) {
             );
 
             resultItem.name == null && (resultItem.name = genName(
-                // Ensure At least one value dim.
-                // (dataDimNameMap.get('value') == null
-                //     && (valueCandidate == null || valueCandidate === resultDimIdx)
-                //     // Try to set as 'value' only if coordDim is not set as 'extra'.
-                //     && coordDim == null
-                // )
-                // ? 'value'
-                // :
                 resultItem.coordDim,
                 dataDimNameMap
             ));
@@ -214,7 +204,8 @@ define(function (require) {
 
             var value = value[dimIndex];
             // Consider usage convenience, '1', '2' will be treated as "number".
-            if (value != null && isFinite(value)) {
+            // `isFinit('')` get `true`.
+            if (value != null && isFinite(value) && value !== '') {
                 return false;
             }
             else if (isString(value) && value !== '-') {

package/src/echarts.js

@@ -33,6 +33,7 @@ define(function (require) {
     var ExtensionAPI = require('./ExtensionAPI');
     var CoordinateSystemManager = require('./CoordinateSystem');
     var OptionManager = require('./model/OptionManager');
+    var backwardCompat = require('./preprocessor/backwardCompat');
 
     var ComponentModel = require('./model/Component');
     var SeriesModel = require('./model/Series');
@@ -43,12 +44,13 @@ define(function (require) {
     var modelUtil = require('./util/model');
     var throttle = require('./util/throttle');
 
-    var zrender = require('zrender');
+    var zrender = require('zrender/zrender');
     var zrUtil = require('zrender/core/util');
     var colorTool = require('zrender/tool/color');
     var Eventful = require('zrender/mixin/Eventful');
     var timsort = require('zrender/core/timsort');
 
+
     var each = zrUtil.each;
     var parseClassType = ComponentModel.parseClassType;
 
@@ -74,6 +76,7 @@ define(function (require) {
     var OPTION_UPDATED = '__optionUpdated';
     var ACTION_REG = /^[a-zA-Z0-9_]+$/;
 
+
     function createRegisterEventWithLowercaseName(method) {
         return function (eventName, handler, context) {
             // Event name is all lowercase
@@ -114,7 +117,7 @@ define(function (require) {
          */
         this.group;
         /**
-         * @type {HTMLDomElement}
+         * @type {HTMLElement}
          * @private
          */
         this._dom = dom;
@@ -136,11 +139,13 @@ define(function (require) {
          */
         this._throttledZrFlush = throttle.throttle(zrUtil.bind(zr.flush, zr), 17);
 
+        var theme = zrUtil.clone(theme);
+        theme && backwardCompat(theme, true);
         /**
          * @type {Object}
          * @private
          */
-        this._theme = zrUtil.clone(theme);
+        this._theme = theme;
 
         /**
          * @type {Array.<module:echarts/view/Chart>}
@@ -228,7 +233,7 @@ define(function (require) {
         }
     };
     /**
-     * @return {HTMLDomElement}
+     * @return {HTMLElement}
      */
     echartsProto.getDom = function () {
         return this._dom;
@@ -938,6 +943,11 @@ define(function (require) {
             return;
         }
 
+        // Avoid dispatch action before setOption. Especially in `connect`.
+        if (!this._model) {
+            return;
+        }
+
         // May dispatchAction in rendering procedure
         if (this[IN_MAIN_PROCESS]) {
             this._pendingActions.push(payload);
@@ -1516,9 +1526,9 @@ define(function (require) {
         /**
          * @type {number}
          */
-        version: '3.6.1',
+        version: '3.7.2',
         dependencies: {
-            zrender: '3.5.1'
+            zrender: '3.6.2'
         }
     };
 
@@ -1564,7 +1574,7 @@ define(function (require) {
     }
 
     /**
-     * @param {HTMLDomElement} dom
+     * @param {HTMLElement} dom
      * @param {Object} [theme]
      * @param {Object} opts
      * @param {number} [opts.devicePixelRatio] Use window.devicePixelRatio by default
@@ -1681,7 +1691,7 @@ define(function (require) {
     };
 
     /**
-     * @param  {HTMLDomElement} dom
+     * @param  {HTMLElement} dom
      * @return {echarts~ECharts}
      */
     echarts.getInstanceByDom = function (dom) {
@@ -1794,6 +1804,20 @@ define(function (require) {
         CoordinateSystemManager.register(type, CoordinateSystem);
     };
 
+    /**
+     * Get dimensions of specified coordinate system.
+     * @param {string} type
+     * @return {Array.<string|Object>}
+     */
+    echarts.getCoordinateSystemDimensions = function (type) {
+        var coordSysCreator = CoordinateSystemManager.get(type);
+        if (coordSysCreator) {
+            return coordSysCreator.getDimensionsInfo
+                    ? coordSysCreator.getDimensionsInfo()
+                    : coordSysCreator.dimensions.slice();
+        }
+    };
+
     /**
      * Layout is a special stage of visual encoding
      * Most visual encoding like color are common for different chart
@@ -1921,7 +1945,7 @@ define(function (require) {
     };
 
     echarts.registerVisual(PRIORITY_VISUAL_GLOBAL, require('./visual/seriesColor'));
-    echarts.registerPreprocessor(require('./preprocessor/backwardCompat'));
+    echarts.registerPreprocessor(backwardCompat);
     echarts.registerLoading('default', require('./loading/default'));
 
     // Default action
@@ -1936,7 +1960,6 @@ define(function (require) {
         update: 'downplay'
     }, zrUtil.noop);
 
-
     // --------
     // Exports
     // --------

package/src/lang.js

@@ -0,0 +1,43 @@
+define(function(require) {
+
+    return {
+        toolbox: {
+            brush: {
+                title: {
+                    rect: '矩形选择',
+                    polygon: '圈选',
+                    lineX: '横向选择',
+                    lineY: '纵向选择',
+                    keep: '保持选择',
+                    clear: '清除选择'
+                }
+            },
+            dataView: {
+                title: '数据视图',
+                lang: ['数据视图', '关闭', '刷新']
+            },
+            dataZoom: {
+                title: {
+                    zoom: '区域缩放',
+                    back: '区域缩放还原'
+                }
+            },
+            magicType: {
+                title: {
+                    line: '切换为折线图',
+                    bar: '切换为柱状图',
+                    stack: '切换为堆叠',
+                    tiled: '切换为平铺'
+                }
+            },
+            restore: {
+                title: '还原'
+            },
+            saveAsImage: {
+                title: '保存为图片',
+                lang: ['右键另存为图片']
+            }
+        }
+    };
+
+});

package/src/langEN.js

@@ -0,0 +1,43 @@
+define(function(require) {
+
+    return {
+        toolbox: {
+            brush: {
+                title: {
+                    rect: 'Box Select',
+                    polygon: 'Lasso Select',
+                    lineX: 'Horizontally Select',
+                    lineY: 'Vertically Select',
+                    keep: 'Keep Selections',
+                    clear: 'Clear Selections'
+                }
+            },
+            dataView: {
+                title: 'Data View',
+                lang: ['Data View', 'Close', 'Refresh']
+            },
+            dataZoom: {
+                title: {
+                    zoom: 'Zoom',
+                    back: 'Zoom Reset'
+                }
+            },
+            magicType: {
+                title: {
+                    line: 'Switch to Line Chart',
+                    bar: 'Switch to Bar Chart',
+                    stack: 'Stack',
+                    tiled: 'Tile'
+                }
+            },
+            restore: {
+                title: 'Restore'
+            },
+            saveAsImage: {
+                title: 'Save as Image',
+                lang: ['Right Click to Save Image']
+            }
+        }
+    };
+
+});

package/src/layout/barGrid.js

@@ -124,8 +124,9 @@ define(function(require) {
             // TODO
             var barWidth = seriesInfo.barWidth;
             if (barWidth && !stacks[stackId].width) {
-                barWidth = Math.min(columnsOnAxis.remainedWidth, barWidth);
+                // See #6312, do not restrict width.
                 stacks[stackId].width = barWidth;
+                barWidth = Math.min(columnsOnAxis.remainedWidth, barWidth);
                 columnsOnAxis.remainedWidth -= barWidth;
             }
 
@@ -244,7 +245,14 @@ define(function(require) {
                 ? valueAxis.toGlobalCoord(valueAxis.dataToCoord(0))
                 : valueAxis.getGlobalExtent()[0];
 
-            var coords = cartesian.dataToPoints(data, true);
+            var coordDims = [
+                seriesModel.coordDimToDataDim('x')[0],
+                seriesModel.coordDimToDataDim('y')[0]
+            ];
+            var coords = data.mapArray(coordDims, function (x, y) {
+                return cartesian.dataToPoint([x, y]);
+            }, true);
+
             lastStackCoords[stackId] = lastStackCoords[stackId] || [];
             lastStackCoordsOrigin[stackId] = lastStackCoordsOrigin[stackId] || []; // Fix #4243
 
@@ -253,7 +261,7 @@ define(function(require) {
                 size: columnWidth
             });
 
-            data.each(valueAxis.dim, function (value, idx) {
+            data.each(seriesModel.coordDimToDataDim(valueAxis.dim)[0], function (value, idx) {
                 if (isNaN(value)) {
                     return;
                 }

package/src/layout/barPolar.js

@@ -67,11 +67,18 @@ define(function (require) {
             var valueMax = valueAxis.model.get('max');
             var valueMin = valueAxis.model.get('min');
 
-            var coords = polar.dataToPoints(data);
+            var coordDims = [
+                seriesModel.coordDimToDataDim('radius')[0],
+                seriesModel.coordDimToDataDim('angle')[0]
+            ];
+            var coords = data.mapArray(coordDims, function (radius, angle) {
+                return polar.dataToPoint([radius, angle]);
+            }, true);
+
             lastStackCoords[stackId] = lastStackCoords[stackId] || [];
             lastStackCoordsOrigin[stackId] = lastStackCoordsOrigin[stackId] || []; // Fix #4243
 
-            data.each(valueAxis.dim, function (value, idx) {
+            data.each(seriesModel.coordDimToDataDim(valueAxis.dim)[0], function (value, idx) {
                 if (isNaN(value)) {
                     return;
                 }

package/src/model/Model.js

@@ -95,7 +95,7 @@ define(function (require) {
         },
 
         /**
-         * @param {string|Array.<string>} path
+         * @param {string|Array.<string>} [path]
          * @param {module:echarts/model/Model} [parentModel]
          * @return {module:echarts/model/Model}
          */
@@ -179,6 +179,7 @@ define(function (require) {
         return obj;
     }
 
+    // `path` can be null/undefined
     function getParent(model, path) {
         var getParentMethod = clazzUtil.get(model, 'getParent');
         return getParentMethod ? getParentMethod.call(model, path) : model.parentModel;

package/src/model/Series.js

@@ -92,15 +92,22 @@ define(function(require) {
             var inputPositionParams = layoutMode
                 ? layout.getLayoutParams(option) : {};
 
+            // Backward compat: using subType on theme.
+            // But if name duplicate between series subType
+            // (for example: parallel) add component mainType,
+            // add suffix 'Series'.
+            var themeSubType = this.subType;
+            if (ComponentModel.hasClass(themeSubType)) {
+                themeSubType += 'Series';
+            }
             zrUtil.merge(
                 option,
                 ecModel.getTheme().get(this.subType)
             );
             zrUtil.merge(option, this.getDefaultOption());
 
-            // Default label emphasis `position` and `show`
-            // FIXME Set label in mergeOption
-            modelUtil.defaultEmphasis(option.label, modelUtil.LABEL_OPTIONS);
+            // Default label emphasis `show`
+            modelUtil.defaultEmphasis(option.label, ['show']);
 
             this.fillDataTextStyle(option.data);
 
@@ -127,13 +134,14 @@ define(function(require) {
         },
 
         fillDataTextStyle: function (data) {
-            // Default data label emphasis `position` and `show`
+            // Default data label emphasis `show`
             // FIXME Tree structure data ?
             // FIXME Performance ?
             if (data) {
+                var props = ['show'];
                 for (var i = 0; i < data.length; i++) {
                     if (data[i] && data[i].label) {
-                        modelUtil.defaultEmphasis(data[i].label, modelUtil.LABEL_OPTIONS);
+                        modelUtil.defaultEmphasis(data[i].label, props);
                     }
                 }
             }
@@ -218,7 +226,7 @@ define(function(require) {
             function formatArrayValue(value) {
                 var vertially = zrUtil.reduce(value, function (vertially, val, idx) {
                     var dimItem = data.getDimensionInfo(idx);
-                    return vertially |= dimItem.tooltip !== false && dimItem.tooltipName != null;
+                    return vertially |= dimItem && dimItem.tooltip !== false && dimItem.tooltipName != null;
                 }, 0);
 
                 var result = [];

package/src/model/mixin/textStyle.js

@@ -3,15 +3,20 @@ define(function (require) {
     var textContain = require('zrender/contain/text');
     var graphicUtil = require('../../util/graphic');
 
+    var PATH_COLOR = ['textStyle', 'color'];
+
     return {
         /**
          * Get color property or get color from option.textStyle.color
+         * @param {boolean} [isEmphasis]
          * @return {string}
          */
-        getTextColor: function () {
+        getTextColor: function (isEmphasis) {
             var ecModel = this.ecModel;
             return this.getShallow('color')
-                || (ecModel && ecModel.get('textStyle.color'));
+                || (
+                    (!isEmphasis && ecModel) ? ecModel.get(PATH_COLOR) : null
+                );
         },
 
         /**
@@ -32,13 +37,10 @@ define(function (require) {
                 text,
                 this.getFont(),
                 this.getShallow('align'),
-                this.getShallow('baseline')
-            );
-        },
-
-        truncateText: function (text, containerWidth, ellipsis, options) {
-            return textContain.truncateText(
-                text, containerWidth, this.getFont(), ellipsis, options
+                this.getShallow('verticalAlign') || this.getShallow('baseline'),
+                this.getShallow('padding'),
+                this.getShallow('rich'),
+                this.getShallow('truncateText')
             );
         }
     };

package/src/preprocessor/backwardCompat.js

@@ -56,16 +56,17 @@ define(function (require) {
 
     var each = zrUtil.each;
 
-    return function (option) {
-        each(option.series, function (seriesOpt) {
+    return function (option, isTheme) {
+        compatStyle(option, isTheme);
+
+        var series = option.series;
+        each(zrUtil.isArray(series) ? series : [series], function (seriesOpt) {
             if (!zrUtil.isObject(seriesOpt)) {
                 return;
             }
 
             var seriesType = seriesOpt.type;
 
-            compatStyle(seriesOpt);
-
             if (seriesType === 'pie' || seriesType === 'gauge') {
                 if (seriesOpt.clockWise != null) {
                     seriesOpt.clockwise = seriesOpt.clockWise;