echarts 3.5.4 → 3.6.0

package/lib/chart/helper/createListFromArray.js

@@ -38,8 +38,13 @@
         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 @@
                     ? 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 @@
      */
     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 @@
             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 @@
             };
         },
 
-        singleAxis: function (data, seriesModel, ecModel) {
+        singleAxis: function (data, seriesModel, ecModel, completeDimOpt) {
 
             var singleAxisModel = ecModel.queryComponents({
                 mainType: 'singleAxis',
@@ -206,7 +211,7 @@
                 stackable: isStackable(singleAxisType)
             }];
 
-            completeDimensions(dimensions, data);
+            dimensions = completeDimensions(dimensions, data, completeDimOpt);
 
             var categoryAxesModels = {};
             if (isCategory) {
@@ -220,7 +225,7 @@
             };
         },
 
-        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 @@
             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 @@
             };
         },
 
-        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/lib/chart/helper/labelHelper.js

@@ -0,0 +1,48 @@
+/**
+ * @module echarts/chart/helper/Symbol
+ */
+
+
+    var graphic = require('../../util/graphic');
+    var zrUtil = require('zrender/lib/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 = '';
+        }
+    };
+
+    module.exports = helper;

package/lib/chart/helper/whiskerBoxCommon.js

@@ -6,10 +6,6 @@
     var WhiskerBoxDraw = require('../helper/WhiskerBoxDraw');
     var zrUtil = require('zrender/lib/core/util');
 
-    function getItemValue(item) {
-        return item.value == null ? item : item.value;
-    }
-
     var seriesModelMixin = {
 
         /**
@@ -51,52 +47,36 @@
                 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;
         },
 
         /**
@@ -107,6 +87,7 @@
             var dim = this._baseAxisDim;
             return this.ecModel.getComponent(dim + 'Axis', this.get(dim + 'AxisIndex')).axis;
         }
+
     };
 
     var viewMixin = {

package/lib/chart/map/mapDataStatistic.js

@@ -14,24 +14,25 @@
 
         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/lib/chart/pie/pieLayout.js

@@ -1,5 +1,3 @@
-// TODO minAngle
-
 
 
     var numberUtil = require('../../util/number');
@@ -36,9 +34,14 @@
 
             var minAngle = seriesModel.get('minAngle') * RADIAN;
 
+            var validDataCount = 0;
+            data.each('value', function (value) {
+                !isNaN(value) && validDataCount++;
+            });
+
             var sum = data.getSum('value');
             // Sum may be 0
-            var unitRadian = Math.PI / (sum || data.count()) * 2;
+            var unitRadian = Math.PI / (sum || validDataCount) * 2;
 
             var clockwise = seriesModel.get('clockwise');
 
@@ -54,8 +57,8 @@
             var valueSumLargerThanMinAngle = 0;
 
             var currentAngle = startAngle;
-
             var dir = clockwise ? 1 : -1;
+
             data.each('value', function (value, idx) {
                 var angle;
                 if (isNaN(value)) {
@@ -80,7 +83,7 @@
                         ? unitRadian : (value * unitRadian);
                 }
                 else {
-                    angle = PI2 / (data.count() || 1);
+                    angle = PI2 / validDataCount;
                 }
 
                 if (angle < minAngle) {
@@ -110,27 +113,32 @@
 
             // Some sector is constrained by minAngle
             // Rest sectors needs recalculate angle
-            if (restAngle < PI2) {
+            if (restAngle < PI2 && validDataCount) {
                 // Average the angle if rest angle is not enough after all angles is
                 // Constrained by minAngle
                 if (restAngle <= 1e-3) {
-                    var angle = PI2 / data.count();
-                    data.each(function (idx) {
-                        var layout = data.getItemLayout(idx);
-                        layout.startAngle = startAngle + dir * idx * angle;
-                        layout.endAngle = startAngle + dir * (idx + 1) * angle;
+                    var angle = PI2 / validDataCount;
+                    data.each('value', function (value, idx) {
+                        if (!isNaN(value)) {
+                            var layout = data.getItemLayout(idx);
+                            layout.angle = angle;
+                            layout.startAngle = startAngle + dir * idx * angle;
+                            layout.endAngle = startAngle + dir * (idx + 1) * angle;
+                        }
                     });
                 }
                 else {
                     unitRadian = restAngle / valueSumLargerThanMinAngle;
                     currentAngle = startAngle;
                     data.each('value', function (value, idx) {
-                        var layout = data.getItemLayout(idx);
-                        var angle = layout.angle === minAngle
-                            ? minAngle : value * unitRadian;
-                        layout.startAngle = currentAngle;
-                        layout.endAngle = currentAngle + dir * angle;
-                        currentAngle += dir * angle;
+                        if (!isNaN(value)) {
+                            var layout = data.getItemLayout(idx);
+                            var angle = layout.angle === minAngle
+                                ? minAngle : value * unitRadian;
+                            layout.startAngle = currentAngle;
+                            layout.endAngle = currentAngle + dir * angle;
+                            currentAngle += dir * angle;
+                        }
                     });
                 }
             }

package/lib/chart/radar/RadarSeries.js

@@ -28,7 +28,7 @@
         getInitialData: function (option, ecModel) {
             var data = option.data || [];
             var dimensions = completeDimensions(
-                [], data, {extraPrefix: 'indicator_'}
+                [], data, {extraPrefix: 'indicator_', extraFromZero: true}
             );
             var list = new List(dimensions, this);
             list.initData(data);

package/lib/chart/scatter/ScatterSeries.js

@@ -8,11 +8,10 @@
 
         type: 'series.scatter',
 
-        dependencies: ['grid', 'polar', 'geo', 'singleAxis'],
+        dependencies: ['grid', 'polar', 'geo', 'singleAxis', 'calendar'],
 
         getInitialData: function (option, ecModel) {
-            var list = createListFromArray(option.data, this, ecModel);
-            return list;
+            return createListFromArray(option.data, this, ecModel);
         },
 
         brushSelector: 'point',

package/lib/chart/themeRiver/ThemeRiverSeries.js

@@ -23,7 +23,7 @@
 
         /**
          * @readOnly
-         * @type {Object}
+         * @type {module:zrender/core/util#HashMap}
          */
         nameMap: null,
 
@@ -150,17 +150,18 @@
 
             var data = this.fixData(filterData || []);
             var nameList = [];
-            var nameMap = this.nameMap = {};
+            var nameMap = this.nameMap = zrUtil.createHashMap();
             var count = 0;
 
             for (var i = 0; i < data.length; ++i) {
                 nameList.push(data[i][DATA_NAME_INDEX]);
-                if (!nameMap[data[i][DATA_NAME_INDEX]]) {
-                    nameMap[data[i][DATA_NAME_INDEX]] = count++;
+                if (!nameMap.get(data[i][DATA_NAME_INDEX])) {
+                    nameMap.set(data[i][DATA_NAME_INDEX], count);
+                    count++;
                 }
             }
 
-            completeDimensions(dimensions, data);
+            dimensions = completeDimensions(dimensions, data);
 
             var list = new List(dimensions, this);
 

package/lib/chart/themeRiver/themeRiverVisual.js

@@ -12,7 +12,7 @@
 
             data.each(function (index) {
                 var name = data.getName(index);
-                var color = colorList[(seriesModel.nameMap[name] - 1) % colorList.length];
+                var color = colorList[(seriesModel.nameMap.get(name) - 1) % colorList.length];
                 rawData.setItemVisual(index, 'color', color);
             });
         });

package/lib/chart/treemap/TreemapSeries.js

@@ -237,7 +237,7 @@
             var idIndexMap = this._idIndexMap;
 
             if (!idIndexMap) {
-                idIndexMap = this._idIndexMap = {};
+                idIndexMap = this._idIndexMap = zrUtil.createHashMap();
                 /**
                  * @private
                  * @type {number}
@@ -245,9 +245,9 @@
                 this._idIndexMapCount = 0;
             }
 
-            var index = idIndexMap[id];
+            var index = idIndexMap.get(id);
             if (index == null) {
-                idIndexMap[id] = index = this._idIndexMapCount++;
+                idIndexMap.set(id, index = this._idIndexMapCount++);
             }
 
             return index;

package/lib/component/axisPointer/BaseAxisPointer.js

@@ -358,16 +358,17 @@
             }
 
             var payloadInfo = this._payloadInfo;
-            var payload = {
+            var axisModel = this._axisModel;
+            this._api.dispatchAction({
                 type: 'updateAxisPointer',
                 x: payloadInfo.cursorPoint[0],
                 y: payloadInfo.cursorPoint[1],
                 tooltipOption: payloadInfo.tooltipOption,
-                highDownKey: 'axisPointerHandle'
-            };
-            var axis = this._axisModel.axis;
-            payload[axis.dim + 'AxisId'] = this._axisModel.id;
-            this._api.dispatchAction(payload);
+                axesInfo: [{
+                    axisDim: axisModel.axis.dim,
+                    axisIndex: axisModel.componentIndex
+                }]
+            });
         },
 
         /**