echarts 3.5.1 → 3.6.0

package/lib/coord/polar/prepareCustom.js

@@ -0,0 +1,53 @@
+
+
+    var zrUtil = require('zrender/lib/core/util');
+
+    function dataToCoordSize(dataSize, dataItem) {
+        // dataItem is necessary in log axis.
+        return zrUtil.map(['Radius', 'Angle'], function (dim, dimIdx) {
+            var axis = this['get' + dim + 'Axis']();
+            var val = dataItem[dimIdx];
+            var halfSize = dataSize[dimIdx] / 2;
+            var method = 'dataTo' + dim;
+
+            var result = axis.type === 'category'
+                ? axis.getBandWidth()
+                : Math.abs(axis[method](val - halfSize) - axis[method](val + halfSize));
+
+            if (dim === 'Angle') {
+                result = result * Math.PI / 180;
+            }
+
+            return result;
+
+        }, this);
+    }
+
+    function prepareCustom(coordSys) {
+        var radiusAxis = coordSys.getRadiusAxis();
+        var angleAxis = coordSys.getAngleAxis();
+        var radius = radiusAxis.getExtent();
+        radius[0] > radius[1] && radius.reverse();
+
+        return {
+            coordSys: {
+                type: 'polar',
+                cx: coordSys.cx,
+                cy: coordSys.cy,
+                r: radius[1],
+                r0: radius[0]
+            },
+            api: {
+                coord: zrUtil.bind(function (data) {
+                    var radius = radiusAxis.dataToRadius(data[0]);
+                    var angle = angleAxis.dataToAngle(data[1]);
+                    var coord = coordSys.coordToPoint([radius, angle]);
+                    coord.push(radius, angle * Math.PI / 180);
+                    return coord;
+                }),
+                size: zrUtil.bind(dataToCoordSize, coordSys)
+            }
+        };
+    }
+
+    module.exports = prepareCustom;

package/lib/coord/single/Single.js

@@ -167,19 +167,19 @@
             var extentSum = axisExtent[0] + axisExtent[1];
             var isHorizontal = axis.isHorizontal();
 
-            axis.toGlobalCoord = isHorizontal ?
-                function (coord) {
+            axis.toGlobalCoord = isHorizontal
+                ? function (coord) {
                     return coord + coordBase;
-                } :
-                function (coord) {
+                }
+                : function (coord) {
                     return extentSum - coord + coordBase;
                 };
 
-            axis.toLocalCoord = isHorizontal ?
-                function (coord) {
+            axis.toLocalCoord = isHorizontal
+                ? function (coord) {
                     return coord - coordBase;
-                } :
-                function (coord) {
+                }
+                : function (coord) {
                     return extentSum - coord + coordBase;
                 };
         },
@@ -267,6 +267,7 @@
             pt[1 - idx] = idx === 0 ? (rect.y + rect.height / 2) : (rect.x + rect.width / 2);
             return pt;
         }
+
     };
 
     module.exports = Single;

package/lib/coord/single/SingleAxis.js

@@ -2,7 +2,6 @@
 
     var zrUtil = require('zrender/lib/core/util');
     var Axis = require('../Axis');
-    var axisHelper = require('../axisHelper');
 
     /**
      * @constructor  module:echarts/coord/single/SingleAxis
@@ -72,32 +71,6 @@
 
         },
 
-        /**
-         * Get interval of the axis label.
-         * @return {number}
-         */
-        getLabelInterval: function () {
-            var labelInterval = this._labelInterval;
-            if (!labelInterval) {
-                var axisModel = this.model;
-                var labelModel = axisModel.getModel('axisLabel');
-                var interval = labelModel.get('interval');
-                if (!(this.type === 'category' && interval === 'auto')) {
-
-                    labelInterval = this._labelInterval = interval === 'auto' ? 0 : interval;
-                    return labelInterval;
-                }
-                labelInterval = this._labelInterval =
-                    axisHelper.getAxisLabelInterval(
-                        zrUtil.map(this.scale.getTicks(), this.dataToCoord, this),
-                        axisModel.getFormattedLabels(),
-                        labelModel.getModel('textStyle').getFont(),
-                        this.isHorizontal()
-                    );
-            }
-            return labelInterval;
-        },
-
         /**
          * @override
          */

package/lib/coord/single/prepareCustom.js

@@ -0,0 +1,33 @@
+
+
+    var zrUtil = require('zrender/lib/core/util');
+
+    function dataToCoordSize(dataSize, dataItem) {
+        // dataItem is necessary in log axis.
+        var axis = this.getAxis();
+        var val = dataItem instanceof Array ? dataItem[0] : dataItem;
+        var halfSize = (dataSize instanceof Array ? dataSize[0] : dataSize) / 2;
+        return axis.type === 'category'
+            ? axis.getBandWidth()
+            : Math.abs(axis.dataToCoord(val - halfSize) - axis.dataToCoord(val + halfSize));
+    }
+
+    function prepareCustom(coordSys) {
+        var rect = coordSys.getRect();
+
+        return {
+            coordSys: {
+                type: 'singleAxis',
+                x: rect.x,
+                y: rect.y,
+                width: rect.width,
+                height: rect.height
+            },
+            api: {
+                coord: zrUtil.bind(coordSys.dataToPoint, coordSys),
+                size: zrUtil.bind(dataToCoordSize, coordSys)
+            }
+        };
+    }
+
+    module.exports = prepareCustom;

package/lib/data/DataDiffer.js

@@ -105,7 +105,8 @@
 
     function initIndexMap(arr, map, keyArr, keyGetter) {
         for (var i = 0; i < arr.length; i++) {
-            var key = keyGetter(arr[i], i);
+            // Add prefix to avoid conflict with Object.prototype.
+            var key = '_ec_' + keyGetter(arr[i], i);
             var existence = map[key];
             if (existence == null) {
                 keyArr.push(key);

package/lib/data/Graph.js

@@ -9,6 +9,10 @@
 
     var zrUtil = require('zrender/lib/core/util');
 
+    // id may be function name of Object, add a prefix to avoid this problem.
+    function generateNodeKey (id) {
+        return '_EC_' + id;
+    }
     /**
      * @alias module:echarts/data/Graph
      * @constructor
@@ -82,7 +86,7 @@
 
         var nodesMap = this._nodesMap;
 
-        if (nodesMap[id]) {
+        if (nodesMap[generateNodeKey(id)]) {
             return;
         }
 
@@ -91,7 +95,7 @@
 
         this.nodes.push(node);
 
-        nodesMap[id] = node;
+        nodesMap[generateNodeKey(id)] = node;
         return node;
     };
 
@@ -110,7 +114,7 @@
      * @return {module:echarts/data/Graph.Node}
      */
     graphProto.getNodeById = function (id) {
-        return this._nodesMap[id];
+        return this._nodesMap[generateNodeKey(id)];
     };
 
     /**
@@ -133,10 +137,10 @@
         }
 
         if (!(n1 instanceof Node)) {
-            n1 = nodesMap[n1];
+            n1 = nodesMap[generateNodeKey(n1)];
         }
         if (!(n2 instanceof Node)) {
-            n2 = nodesMap[n2];
+            n2 = nodesMap[generateNodeKey(n2)];
         }
         if (!n1 || !n2) {
             return;
@@ -243,7 +247,7 @@
         cb, startNode, direction, context
     ) {
         if (!(startNode instanceof Node)) {
-            startNode = this._nodesMap[startNode];
+            startNode = this._nodesMap[generateNodeKey(startNode)];
         }
         if (!startNode) {
             return;
@@ -270,7 +274,7 @@
                 var otherNode = e.node1 === currentNode
                     ? e.node2 : e.node1;
                 if (!otherNode.__visited) {
-                    if (cb.call(otherNode, otherNode, currentNode)) {
+                    if (cb.call(context, otherNode, currentNode)) {
                         // Stop traversing
                         return;
                     }

package/lib/data/List.js

@@ -31,7 +31,7 @@
         'stackedOn', 'hasItemOption', '_nameList', '_idList', '_rawData'
     ];
 
-    var transferProperties = function (a, b) {
+    function transferProperties(a, b) {
         zrUtil.each(TRANSFERABLE_PROPERTIES.concat(b.__wrappedMethods || []), function (propName) {
             if (b.hasOwnProperty(propName)) {
                 a[propName] = b[propName];
@@ -39,6 +39,19 @@
         });
 
         a.__wrappedMethods = b.__wrappedMethods;
+    }
+
+    function DefaultDataProvider(dataArray) {
+        this._array = dataArray || [];
+    }
+
+    DefaultDataProvider.prototype.pure = false;
+
+    DefaultDataProvider.prototype.count = function () {
+        return this._array.length;
+    };
+    DefaultDataProvider.prototype.getItem = function (idx) {
+        return this._array[idx];
     };
 
     /**
@@ -63,6 +76,8 @@
                 dimensionName = dimensions[i];
                 dimensionInfo = {
                     name: dimensionName,
+                    coordDim: dimensionName,
+                    coordDimIndex: 0,
                     stackable: false,
                     // Type can be 'float', 'int', 'number'
                     // Default is number, Precision of float may not enough
@@ -73,10 +88,16 @@
                 dimensionInfo = dimensions[i];
                 dimensionName = dimensionInfo.name;
                 dimensionInfo.type = dimensionInfo.type || 'number';
+                if (!dimensionInfo.coordDim) {
+                    dimensionInfo.coordDim = dimensionName;
+                    dimensionInfo.coordDimIndex = 0;
+                }
             }
+            dimensionInfo.otherDims = dimensionInfo.otherDims || {};
             dimensionNames.push(dimensionName);
             dimensionInfos[dimensionName] = dimensionInfo;
         }
+
         /**
          * @readOnly
          * @type {Array.<string>}
@@ -122,6 +143,7 @@
          * @type {Array.<string>}
          */
         this._idList = [];
+
         /**
          * Models of data option is stored sparse for optimizing memory cost
          * @type {Array.<module:echarts/model/Model>}
@@ -185,6 +207,7 @@
     var listProto = List.prototype;
 
     listProto.type = 'list';
+
     /**
      * If each data item has it's own option
      * @type {boolean}
@@ -204,6 +227,7 @@
         }
         return dim;
     };
+
     /**
      * Get type and stackable info of particular dimension
      * @param {string|number} dim
@@ -223,9 +247,13 @@
     listProto.initData = function (data, nameList, dimValueGetter) {
         data = data || [];
 
+        var isDataArray = zrUtil.isArray(data);
+        if (isDataArray) {
+            data = new DefaultDataProvider(data);
+        }
         if (__DEV__) {
-            if (!zrUtil.isArray(data)) {
-                throw new Error('Invalid data.');
+            if (!isDataArray && (typeof data.getItem != 'function' || typeof data.count != 'function')) {
+                throw new Error('Inavlid data provider.');
             }
         }
 
@@ -236,17 +264,20 @@
         var indices = this.indices = [];
 
         var dimensions = this.dimensions;
-        var size = data.length;
         var dimensionInfoMap = this._dimensionInfos;
 
+        var size = data.count();
+
         var idList = [];
         var nameRepeatCount = {};
+        var nameDimIdx;
 
         nameList = nameList || [];
 
         // Init storage
         for (var i = 0; i < dimensions.length; i++) {
             var dimInfo = dimensionInfoMap[dimensions[i]];
+            dimInfo.otherDims.itemName === 0 && (nameDimIdx = i);
             var DataCtor = dataCtors[dimInfo.type];
             storage[dimensions[i]] = new DataCtor(size);
         }
@@ -271,8 +302,9 @@
             );
         };
 
-        for (var idx = 0; idx < data.length; idx++) {
-            var dataItem = data[idx];
+        for (var i = 0; i < size; i++) {
+            // NOTICE: Try not to write things into dataItem
+            var dataItem = data.getItem(i);
             // Each data item is value
             // [1, 2]
             // 2
@@ -285,22 +317,26 @@
                 var dim = dimensions[k];
                 var dimStorage = storage[dim];
                 // PENDING NULL is empty or zero
-                dimStorage[idx] = dimValueGetter(dataItem, dim, idx, k);
+                dimStorage[i] = dimValueGetter(dataItem, dim, i, k);
             }
 
-            indices.push(idx);
+            indices.push(i);
         }
 
         // Use the name in option and create id
-        for (var i = 0; i < data.length; i++) {
-            if (!nameList[i]) {
-                if (data[i] && data[i].name != null) {
-                    nameList[i] = data[i].name;
+        for (var i = 0; i < size; i++) {
+            var dataItem = data.getItem(i);
+            if (!nameList[i] && dataItem) {
+                if (dataItem.name != null) {
+                    nameList[i] = dataItem.name;
+                }
+                else if (nameDimIdx != null) {
+                    nameList[i] = storage[dimensions[nameDimIdx]][i];
                 }
             }
             var name = nameList[i] || '';
             // Try using the id in option
-            var id = data[i] && data[i].id;
+            var id = dataItem && dataItem.id;
 
             if (!id && name) {
                 // Use name as id and add counter to avoid same name
@@ -337,11 +373,11 @@
         var dataIndex = this.indices[idx];
 
         // If value not exists
-        if (dataIndex == null) {
+        if (dataIndex == null || !storage[dim]) {
             return NaN;
         }
 
-        var value = storage[dim] && storage[dim][dataIndex];
+        var value = storage[dim][dataIndex];
         // FIXME ordinal data type is not stackable
         if (stack) {
             var dimensionInfo = this._dimensionInfos[dim];
@@ -549,7 +585,7 @@
      * @param {number} [maxDistance=Infinity]
      * @return {Array.<number>} Considere multiple points has the same value.
      */
-    listProto.indexOfNearest = function (dim, value, stack, maxDistance) {
+    listProto.indicesOfNearest = function (dim, value, stack, maxDistance) {
         var storage = this._storage;
         var dimData = storage[dim];
         var nearestIndices = [];
@@ -598,7 +634,7 @@
      * @return {number}
      */
     listProto.getRawDataItem = function (idx) {
-        return this._rawData[this.getRawIndex(idx)];
+        return this._rawData.getItem(this.getRawIndex(idx));
     };
 
     /**
@@ -707,7 +743,10 @@
         for (var i = 0; i < indices.length; i++) {
             var keep;
             // Simple optimization
-            if (dimSize === 1) {
+            if (!dimSize) {
+                keep = cb.call(context, i);
+            }
+            else if (dimSize === 1) {
                 keep = cb.call(
                     context, this.get(dimensions[0], i, stack), i
                 );
@@ -882,7 +921,7 @@
     listProto.getItemModel = function (idx) {
         var hostModel = this.hostModel;
         idx = this.indices[idx];
-        return new Model(this._rawData[idx], hostModel, hostModel && hostModel.ecModel);
+        return new Model(this._rawData.getItem(idx), hostModel, hostModel && hostModel.ecModel);
     };
 
     /**
@@ -999,7 +1038,7 @@
      * Get visual property of single data item
      * @param {number} idx
      * @param {string} key
-     * @param {boolean} ignoreParent
+     * @param {boolean} [ignoreParent=false]
      */
     listProto.getItemVisual = function (idx, key, ignoreParent) {
         var itemVisual = this._itemVisuals[idx];