echarts 3.5.1 → 3.6.0

package/src/chart/heatmap/HeatmapView.js

@@ -109,7 +109,6 @@ define(function (require) {
 
             }
 
-
             var group = this.group;
             var data = seriesModel.getData();
 
@@ -121,90 +120,93 @@ define(function (require) {
             var hoverStl = seriesModel.getModel(hoverItemStyleQuery).getItemStyle();
             var labelModel = seriesModel.getModel('label.normal');
             var hoverLabelModel = seriesModel.getModel('label.emphasis');
+            var coordSysType = coordSys.type;
 
-
-
-            data.each(
-                coordSys.type === 'cartesian2d' ? ['x', 'y', 'z'] : ['time', 'value'],
-
-                function (x, y, z, idx) {
-                    var rect;
-
-                    if (coordSys.type === 'cartesian2d') {
-
-                        // Ignore empty data
-                        if (isNaN(z)) {
-                            return;
-                        }
-
-                        var point = coordSys.dataToPoint([x, y]);
-
-                        rect = new graphic.Rect({
-                            shape: {
-                                x: point[0] - width / 2,
-                                y: point[1] - height / 2,
-                                width: width,
-                                height: height
-                            },
-                            style: {
-                                fill: data.getItemVisual(idx, 'color'),
-                                opacity: data.getItemVisual(idx, 'opacity')
-                            }
-                        });
+            var dataDims = coordSysType === 'cartesian2d'
+                ? [
+                    seriesModel.coordDimToDataDim('x')[0],
+                    seriesModel.coordDimToDataDim('y')[0],
+                    seriesModel.coordDimToDataDim('value')[0]
+                ]
+                : [
+                    seriesModel.coordDimToDataDim('time')[0],
+                    seriesModel.coordDimToDataDim('value')[0]
+                ];
+
+            data.each(function (idx) {
+                var rect;
+
+                if (coordSysType === 'cartesian2d') {
+                    // Ignore empty data
+                    if (isNaN(data.get(dataDims[2], idx))) {
+                        return;
                     }
-                    else {
-                        // x => time y => value z => idx
 
-                        // Ignore empty data
-                        if (isNaN(y)) {
-                            return;
+                    var point = coordSys.dataToPoint([
+                        data.get(dataDims[0], idx),
+                        data.get(dataDims[1], idx)
+                    ]);
+
+                    rect = new graphic.Rect({
+                        shape: {
+                            x: point[0] - width / 2,
+                            y: point[1] - height / 2,
+                            width: width,
+                            height: height
+                        },
+                        style: {
+                            fill: data.getItemVisual(idx, 'color'),
+                            opacity: data.getItemVisual(idx, 'opacity')
                         }
-
-                        idx = z;
-
-                        rect = new graphic.Rect({
-                            z2: 1,
-                            shape: coordSys.dataToRect([x, y]).contentShape,
-                            style: {
-                                fill: data.getItemVisual(idx, 'color'),
-                                opacity: data.getItemVisual(idx, 'opacity')
-                            }
-                        });
+                    });
+                }
+                else {
+                    // Ignore empty data
+                    if (isNaN(data.get(dataDims[1], idx))) {
+                        return;
                     }
 
+                    rect = new graphic.Rect({
+                        z2: 1,
+                        shape: coordSys.dataToRect([data.get(dataDims[0], idx)]).contentShape,
+                        style: {
+                            fill: data.getItemVisual(idx, 'color'),
+                            opacity: data.getItemVisual(idx, 'opacity')
+                        }
+                    });
+                }
 
-                    var itemModel = data.getItemModel(idx);
+                var itemModel = data.getItemModel(idx);
 
-                    // Optimization for large datset
-                    if (data.hasItemOption) {
-                        style = itemModel.getModel(itemStyleQuery).getItemStyle(['color']);
-                        hoverStl = itemModel.getModel(hoverItemStyleQuery).getItemStyle();
-                        labelModel = itemModel.getModel(labelQuery);
-                        hoverLabelModel = itemModel.getModel(hoverLabelQuery);
-                    }
+                // Optimization for large datset
+                if (data.hasItemOption) {
+                    style = itemModel.getModel(itemStyleQuery).getItemStyle(['color']);
+                    hoverStl = itemModel.getModel(hoverItemStyleQuery).getItemStyle();
+                    labelModel = itemModel.getModel(labelQuery);
+                    hoverLabelModel = itemModel.getModel(hoverLabelQuery);
+                }
 
-                    var rawValue = seriesModel.getRawValue(idx);
-                    var defaultText = '-';
-                    if (rawValue && rawValue[2] != null) {
-                        defaultText = rawValue[2];
-                    }
-                    if (labelModel.getShallow('show')) {
-                        graphic.setText(style, labelModel);
-                        style.text = seriesModel.getFormattedLabel(idx, 'normal') || defaultText;
-                    }
-                    if (hoverLabelModel.getShallow('show')) {
-                        graphic.setText(hoverStl, hoverLabelModel);
-                        hoverStl.text = seriesModel.getFormattedLabel(idx, 'emphasis') || defaultText;
-                    }
+                var rawValue = seriesModel.getRawValue(idx);
+                var defaultText = '-';
+                if (rawValue && rawValue[2] != null) {
+                    defaultText = rawValue[2];
+                }
+                if (labelModel.getShallow('show')) {
+                    graphic.setText(style, labelModel);
+                    style.text = seriesModel.getFormattedLabel(idx, 'normal') || defaultText;
+                }
+                if (hoverLabelModel.getShallow('show')) {
+                    graphic.setText(hoverStl, hoverLabelModel);
+                    hoverStl.text = seriesModel.getFormattedLabel(idx, 'emphasis') || defaultText;
+                }
 
-                    rect.setStyle(style);
+                rect.setStyle(style);
 
-                    graphic.setHoverStyle(rect, data.hasItemOption ? hoverStl : zrUtil.extend({}, hoverStl));
+                graphic.setHoverStyle(rect, data.hasItemOption ? hoverStl : zrUtil.extend({}, hoverStl));
 
-                    group.add(rect);
-                    data.setItemGraphicEl(idx, rect);
-                }
-            );
+                group.add(rect);
+                data.setItemGraphicEl(idx, rect);
+            });
         },
 
         _renderOnGeo: function (geo, seriesModel, visualMapModel, api) {

package/src/chart/helper/Symbol.js

@@ -7,6 +7,7 @@ define(function (require) {
     var symbolUtil = require('../../util/symbol');
     var graphic = require('../../util/graphic');
     var numberUtil = require('../../util/number');
+    var labelHelper = require('./labelHelper');
 
     function getSymbolSize(data, idx) {
         var symbolSize = data.getItemVisual(idx, 'symbolSize');
@@ -218,37 +219,13 @@ define(function (require) {
             elStyle.opacity = opacity;
         }
 
-        // Get last value dim
-        var dimensions = data.dimensions.slice();
-        var valueDim;
-        var dataType;
-        while (dimensions.length && (
-            valueDim = dimensions.pop(),
-            dataType = data.getDimensionInfo(valueDim).type,
-            dataType === 'ordinal' || dataType === 'time'
-        )) {} // jshint ignore:line
-
-        if (valueDim != null && labelModel.getShallow('show')) {
-            graphic.setText(elStyle, labelModel, color);
-            elStyle.text = zrUtil.retrieve(
-                seriesModel.getFormattedLabel(idx, 'normal'),
-                data.get(valueDim, idx)
-            );
-        }
-        else {
-            elStyle.text = '';
-        }
-
-        if (valueDim != null && hoverLabelModel.getShallow('show')) {
-            graphic.setText(hoverItemStyle, hoverLabelModel, color);
-            hoverItemStyle.text = zrUtil.retrieve(
-                seriesModel.getFormattedLabel(idx, 'emphasis'),
-                data.get(valueDim, idx)
-            );
-        }
-        else {
-            hoverItemStyle.text = '';
-        }
+        var valueDim = labelHelper.findLabelValueDim(data);
+        labelHelper.setTextToStyle(
+            data, idx, valueDim, elStyle, seriesModel, labelModel, color
+        );
+        labelHelper.setTextToStyle(
+            data, idx, valueDim, hoverItemStyle, seriesModel, hoverLabelModel, color
+        );
 
         symbolPath.off('mouseover')
             .off('mouseout')

package/src/chart/helper/createListFromArray.js

@@ -38,8 +38,13 @@ define(function(require) {
         var coordSysName = seriesModel.get('coordinateSystem');
         var creator = creators[coordSysName];
         var registeredCoordSys = CoordinateSystem.get(coordSysName);
+        var completeDimOpt = {
+            encodeDef: seriesModel.get('encode'),
+            dimsDef: seriesModel.get('dimensions')
+        };
+
         // FIXME
-        var axesInfo = creator && creator(data, seriesModel, ecModel);
+        var axesInfo = creator && creator(data, seriesModel, ecModel, completeDimOpt);
         var dimensions = axesInfo && axesInfo.dimensions;
         if (!dimensions) {
             // Get dimensions from registered coordinate system
@@ -48,7 +53,7 @@ define(function(require) {
                     ? registeredCoordSys.getDimensionsInfo()
                     : registeredCoordSys.dimensions.slice()
             )) || ['x', 'y'];
-            dimensions = completeDimensions(dimensions, data, {defaultNames: dimensions.concat(['value'])});
+            dimensions = completeDimensions(dimensions, data, completeDimOpt);
         }
 
         var categoryIndex = axesInfo ? axesInfo.categoryIndex : -1;
@@ -118,7 +123,7 @@ define(function(require) {
      */
     var creators = {
 
-        cartesian2d: function (data, seriesModel, ecModel) {
+        cartesian2d: function (data, seriesModel, ecModel, completeDimOpt) {
 
             var axesModels = zrUtil.map(['xAxis', 'yAxis'], function (name) {
                 return ecModel.queryComponents({
@@ -167,7 +172,7 @@ define(function(require) {
             var isXAxisCateogry = xAxisType === 'category';
             var isYAxisCategory = yAxisType === 'category';
 
-            completeDimensions(dimensions, data, {defaultNames: ['x', 'y', 'z']});
+            dimensions = completeDimensions(dimensions, data, completeDimOpt);
 
             var categoryAxesModels = {};
             if (isXAxisCateogry) {
@@ -183,7 +188,7 @@ define(function(require) {
             };
         },
 
-        singleAxis: function (data, seriesModel, ecModel) {
+        singleAxis: function (data, seriesModel, ecModel, completeDimOpt) {
 
             var singleAxisModel = ecModel.queryComponents({
                 mainType: 'singleAxis',
@@ -206,7 +211,7 @@ define(function(require) {
                 stackable: isStackable(singleAxisType)
             }];
 
-            completeDimensions(dimensions, data);
+            dimensions = completeDimensions(dimensions, data, completeDimOpt);
 
             var categoryAxesModels = {};
             if (isCategory) {
@@ -220,7 +225,7 @@ define(function(require) {
             };
         },
 
-        polar: function (data, seriesModel, ecModel) {
+        polar: function (data, seriesModel, ecModel, completeDimOpt) {
             var polarModel = ecModel.queryComponents({
                 mainType: 'polar',
                 index: seriesModel.get('polarIndex'),
@@ -257,7 +262,7 @@ define(function(require) {
             var isAngleAxisCateogry = angleAxisType === 'category';
             var isRadiusAxisCateogry = radiusAxisType === 'category';
 
-            completeDimensions(dimensions, data, {defaultNames: ['radius', 'angle', 'value']});
+            dimensions = completeDimensions(dimensions, data, completeDimOpt);
 
             var categoryAxesModels = {};
             if (isRadiusAxisCateogry) {
@@ -273,14 +278,14 @@ define(function(require) {
             };
         },
 
-        geo: function (data, seriesModel, ecModel) {
+        geo: function (data, seriesModel, ecModel, completeDimOpt) {
             // TODO Region
             // 多个散点图系列在同一个地区的时候
             return {
                 dimensions: completeDimensions([
                     {name: 'lng'},
                     {name: 'lat'}
-                ], data, {defaultNames: ['lng', 'lat', 'value']})
+                ], data, completeDimOpt)
             };
         }
     };

package/src/chart/helper/labelHelper.js

@@ -0,0 +1,49 @@
+/**
+ * @module echarts/chart/helper/Symbol
+ */
+define(function (require) {
+
+    var graphic = require('../../util/graphic');
+    var zrUtil = require('zrender/core/util');
+    var modelUtil = require('../../util/model');
+
+    var helper = {};
+
+    helper.findLabelValueDim = function (data) {
+        var valueDim;
+        var labelDims = modelUtil.otherDimToDataDim(data, 'label');
+
+        if (labelDims.length) {
+            valueDim = labelDims[0];
+        }
+        else {
+            // Get last value dim
+            var dimensions = data.dimensions.slice();
+            var dataType;
+            while (dimensions.length && (
+                valueDim = dimensions.pop(),
+                dataType = data.getDimensionInfo(valueDim).type,
+                dataType === 'ordinal' || dataType === 'time'
+            )) {} // jshint ignore:line
+        }
+
+        return valueDim;
+    };
+
+    helper.setTextToStyle = function (
+        data, dataIndex, valueDim, elStyle, seriesModel, labelModel, color
+    ) {
+        if (valueDim != null && labelModel.getShallow('show')) {
+            graphic.setText(elStyle, labelModel, color);
+            elStyle.text = zrUtil.retrieve(
+                seriesModel.getFormattedLabel(dataIndex, 'normal'),
+                data.get(valueDim, dataIndex)
+            );
+        }
+        else {
+            elStyle.text = '';
+        }
+    };
+
+    return helper;
+});

package/src/chart/helper/whiskerBoxCommon.js

@@ -7,10 +7,6 @@ define(function(require) {
     var WhiskerBoxDraw = require('../helper/WhiskerBoxDraw');
     var zrUtil = require('zrender/core/util');
 
-    function getItemValue(item) {
-        return item.value == null ? item : item.value;
-    }
-
     var seriesModelMixin = {
 
         /**
@@ -52,52 +48,36 @@ define(function(require) {
                 option.layout = option.layout || 'horizontal';
             }
 
-            this._baseAxisDim = option.layout === 'horizontal' ? 'x' : 'y';
-
+            var coordDims = ['x', 'y'];
+            var baseAxisDimIndex = option.layout === 'horizontal' ? 0 : 1;
+            var baseAxisDim = this._baseAxisDim = coordDims[baseAxisDimIndex];
+            var otherAxisDim = coordDims[1 - baseAxisDimIndex];
             var data = option.data;
-            var dimensions = this.dimensions = ['base'].concat(this.valueDimensions);
-            completeDimensions(dimensions, data);
 
-            var list = new List(dimensions, this);
-            list.initData(data, categories ? categories.slice() : null, function (dataItem, dimName, idx, dimIdx) {
-                var value = getItemValue(dataItem);
-                return addOrdinal ? (dimName === 'base' ? idx : value[dimIdx - 1]) : value[dimIdx];
+            addOrdinal && zrUtil.each(data, function (item, index) {
+                zrUtil.isArray(item) && item.unshift(index);
             });
 
-            return list;
-        },
-
-        /**
-         * Used by Gird.
-         * @param {string} axisDim 'x' or 'y'
-         * @return {Array.<string>} dimensions on the axis.
-         */
-        coordDimToDataDim: function (axisDim) {
-            var dims = this.valueDimensions.slice();
-            var baseDim = ['base'];
-            var map = {
-                horizontal: {x: baseDim, y: dims},
-                vertical: {x: dims, y: baseDim}
-            };
-            return map[this.get('layout')][axisDim];
-        },
-
-        /**
-         * @override
-         * @param {string|number} dataDim
-         * @return {string} coord dimension
-         */
-        dataDimToCoordDim: function (dataDim) {
-            var dim;
+            var dimensions = [{
+                name: baseAxisDim,
+                otherDims: {
+                    tooltip: false
+                },
+                dimsDef: ['base']
+            }, {
+                name: otherAxisDim,
+                dimsDef: this.defaultValueDimensions.slice()
+            }];
+
+            dimensions = completeDimensions(dimensions, data, {
+                encodeDef: this.get('encode'),
+                dimsDef: this.get('dimensions')
+            });
 
-            zrUtil.each(['x', 'y'], function (coordDim, index) {
-                var dataDims = this.coordDimToDataDim(coordDim);
-                if (zrUtil.indexOf(dataDims, dataDim) >= 0) {
-                    dim = coordDim;
-                }
-            }, this);
+            var list = new List(dimensions, this);
+            list.initData(data, categories ? categories.slice() : null);
 
-            return dim;
+            return list;
         },
 
         /**
@@ -108,6 +88,7 @@ define(function(require) {
             var dim = this._baseAxisDim;
             return this.ecModel.getComponent(dim + 'Axis', this.get(dim + 'AxisIndex')).axis;
         }
+
     };
 
     var viewMixin = {

package/src/chart/map/mapDataStatistic.js

@@ -14,24 +14,25 @@ define(function (require) {
 
         zrUtil.each(datas, function (data) {
             data.each(dims, function (value, idx) {
-                var name = data.getName(idx);
-                dataNameMap[name] = dataNameMap[name] || [];
+                // Add prefix to avoid conflict with Object.prototype.
+                var mapKey = 'ec-' + data.getName(idx);
+                dataNameMap[mapKey] = dataNameMap[mapKey] || [];
                 if (!isNaN(value)) {
-                    dataNameMap[name].push(value);
+                    dataNameMap[mapKey].push(value);
                 }
             });
         });
 
         return datas[0].map(dims, function (value, idx) {
-            var name = datas[0].getName(idx);
+            var mapKey = 'ec-' + datas[0].getName(idx);
             var sum = 0;
             var min = Infinity;
             var max = -Infinity;
-            var len = dataNameMap[name].length;
+            var len = dataNameMap[mapKey].length;
             for (var i = 0; i < len; i++) {
-                min = Math.min(min, dataNameMap[name][i]);
-                max = Math.max(max, dataNameMap[name][i]);
-                sum += dataNameMap[name][i];
+                min = Math.min(min, dataNameMap[mapKey][i]);
+                max = Math.max(max, dataNameMap[mapKey][i]);
+                sum += dataNameMap[mapKey][i];
             }
             var result;
             if (statisticType === 'min') {

package/src/chart/parallel/ParallelSeries.js

@@ -11,6 +11,8 @@ define(function(require) {
 
         dependencies: ['parallel'],
 
+        visualColorAccessPath: 'lineStyle.normal.color',
+
         getInitialData: function (option, ecModel) {
             var parallelModel = ecModel.getComponent(
                 'parallel', this.get('parallelIndex')

package/src/chart/parallel/ParallelView.js

@@ -29,7 +29,7 @@ define(function (require) {
          * @override
          */
         render: function (seriesModel, ecModel, api, payload) {
-            this._renderForNormal(seriesModel);
+            this._renderForNormal(seriesModel, payload);
             // this[
             //     seriesModel.option.progressive
             //         ? '_renderForProgressive'
@@ -42,7 +42,7 @@ define(function (require) {
         /**
          * @private
          */
-        _renderForNormal: function (seriesModel) {
+        _renderForNormal: function (seriesModel, payload) {
             var dataGroup = this._dataGroup;
             var data = seriesModel.getData();
             var oldData = this._data;
@@ -86,7 +86,8 @@ define(function (require) {
                 var line = oldData.getItemGraphicEl(oldDataIndex);
                 var points = createLinePoints(data, newDataIndex, dimensions, coordSys);
                 data.setItemGraphicEl(newDataIndex, line);
-                graphic.updateProps(line, {shape: {points: points}}, seriesModel, newDataIndex);
+                var animationModel = (payload && payload.animation === false) ? null : seriesModel;
+                graphic.updateProps(line, {shape: {points: points}}, animationModel, newDataIndex);
             }
 
             function remove(oldDataIndex) {
@@ -190,17 +191,17 @@ define(function (require) {
             if (data.hasItemOption) {
                 var itemModel = data.getItemModel(dataIndex);
                 var lineStyleModel = itemModel.getModel('lineStyle.normal', seriesStyleModel);
-                lineStyle = lineStyleModel.getLineStyle();
+                lineStyle = lineStyleModel.getLineStyle(['color', 'stroke']);
             }
 
-            line.useStyle(zrUtil.extend(
-                lineStyle,
-                {
-                    fill: null,
-                    stroke: data.getItemVisual(dataIndex, 'color'),
-                    opacity: data.getItemVisual(dataIndex, 'opacity')
-                }
-            ));
+            line.useStyle(zrUtil.extend(lineStyle, {
+                fill: null,
+                // lineStyle.color have been set to itemVisual in module:echarts/visual/seriesColor.
+                stroke: data.getItemVisual(dataIndex, 'color'),
+                // lineStyle.opacity have been set to itemVisual in parallelVisual.
+                opacity: data.getItemVisual(dataIndex, 'opacity')
+            }));
+
             line.shape.smooth = smooth;
         });
     }

package/src/chart/parallel/parallelVisual.js

@@ -1,5 +1,7 @@
 define(function (require) {
 
+    var opacityAccessPath = ['lineStyle', 'normal', 'opacity'];
+
     return function (ecModel) {
 
         ecModel.eachSeriesByType('parallel', function (seriesModel) {
@@ -25,7 +27,13 @@ define(function (require) {
             };
 
             coordSys.eachActiveState(data, function (activeState, dataIndex) {
-                data.setItemVisual(dataIndex, 'opacity', opacityMap[activeState]);
+                var itemModel = data.getItemModel(dataIndex);
+                var opacity = opacityMap[activeState];
+                if (activeState === 'normal') {
+                    var itemOpacity = itemModel.get(opacityAccessPath, true);
+                    itemOpacity != null && (opacity = itemOpacity);
+                }
+                data.setItemVisual(dataIndex, 'opacity', opacity);
             });
 
             data.setVisual('color', color);