echarts 3.5.4 → 3.6.0

package/lib/component/legend/LegendView.js

@@ -63,7 +63,7 @@
                     ? 'right' : 'left';
             }
 
-            var legendDrawedMap = {};
+            var legendDrawedMap = zrUtil.createHashMap();
 
             zrUtil.each(legendModel.getData(), function (itemModel) {
                 var name = itemModel.get('name');
@@ -78,7 +78,7 @@
 
                 var seriesModel = ecModel.getSeriesByName(name)[0];
 
-                if (legendDrawedMap[name]) {
+                if (legendDrawedMap.get(name)) {
                     // Have been drawed
                     return;
                 }
@@ -109,13 +109,13 @@
                         .on('mouseover', curry(dispatchHighlightAction, seriesModel, null, api))
                         .on('mouseout', curry(dispatchDownplayAction, seriesModel, null, api));
 
-                    legendDrawedMap[name] = true;
+                    legendDrawedMap.set(name, true);
                 }
                 else {
                     // Data legend of pie, funnel
                     ecModel.eachRawSeries(function (seriesModel) {
                         // In case multiple series has same data name
-                        if (legendDrawedMap[name]) {
+                        if (legendDrawedMap.get(name)) {
                             return;
                         }
                         if (seriesModel.legendDataProvider) {
@@ -141,13 +141,13 @@
                                 .on('mouseover', curry(dispatchHighlightAction, seriesModel, name, api))
                                 .on('mouseout', curry(dispatchDownplayAction, seriesModel, name, api));
 
-                            legendDrawedMap[name] = true;
+                            legendDrawedMap.set(name, true);
                         }
                     }, this);
                 }
 
                 if (__DEV__) {
-                    if (!legendDrawedMap[name]) {
+                    if (!legendDrawedMap.get(name)) {
                         console.warn(name + ' series not exists. Legend data should be same with series name or data name.');
                     }
                 }

package/lib/component/legend/legendAction.js

@@ -31,7 +31,7 @@
                     return;
                 }
                 var isItemSelected = legendModel.isSelected(name);
-                if (name in selectedMap) {
+                if (selectedMap.hasOwnProperty(name)) {
                     // Unselected if any legend is unselected
                     selectedMap[name] = selectedMap[name] && isItemSelected;
                 }

package/lib/component/marker/MarkAreaView.js

@@ -155,12 +155,9 @@
             var seriesData = seriesModel.getData();
 
             var areaGroupMap = this.markerGroupMap;
-            var polygonGroup = areaGroupMap[seriesName];
-            if (!polygonGroup) {
-                polygonGroup = areaGroupMap[seriesName] = {
-                    group: new graphic.Group()
-                };
-            }
+            var polygonGroup = areaGroupMap.get(seriesName)
+                || areaGroupMap.set(seriesName, {group: new graphic.Group()});
+
             this.group.add(polygonGroup.group);
             polygonGroup.__keep = true;
 

package/lib/component/marker/MarkLineView.js

@@ -200,7 +200,7 @@
                         ]);
                     });
 
-                    this.markerGroupMap[seriesModel.name].updateLayout();
+                    this.markerGroupMap.get(seriesModel.name).updateLayout();
 
                 }
             }, this);
@@ -212,10 +212,8 @@
             var seriesData = seriesModel.getData();
 
             var lineDrawMap = this.markerGroupMap;
-            var lineDraw = lineDrawMap[seriesName];
-            if (!lineDraw) {
-                lineDraw = lineDrawMap[seriesName] = new LineDraw();
-            }
+            var lineDraw = lineDrawMap.get(seriesName)
+                || lineDrawMap.set(seriesName, new LineDraw());
             this.group.add(lineDraw.group);
 
             var mlData = createList(coordSys, seriesModel, mlModel);

package/lib/component/marker/MarkPointView.js

@@ -53,7 +53,7 @@
                 var mpModel = seriesModel.markPointModel;
                 if (mpModel) {
                     updateMarkerLayout(mpModel.getData(), seriesModel, api);
-                    this.markerGroupMap[seriesModel.name].updateLayout(mpModel);
+                    this.markerGroupMap.get(seriesModel.name).updateLayout(mpModel);
                 }
             }, this);
         },
@@ -64,10 +64,8 @@
             var seriesData = seriesModel.getData();
 
             var symbolDrawMap = this.markerGroupMap;
-            var symbolDraw = symbolDrawMap[seriesName];
-            if (!symbolDraw) {
-                symbolDraw = symbolDrawMap[seriesName] = new SymbolDraw();
-            }
+            var symbolDraw = symbolDrawMap.get(seriesName)
+                || symbolDrawMap.set(seriesName, new SymbolDraw());
 
             var mpData = createList(coordSys, seriesModel, mpModel);
 

package/lib/component/marker/MarkerView.js

@@ -1,5 +1,7 @@
 
 
+    var zrUtil = require('zrender/lib/core/util');
+
     module.exports = require('../../echarts').extendComponentView({
 
         type: 'marker',
@@ -8,18 +10,16 @@
             /**
              * Markline grouped by series
              * @private
-             * @type {Object}
+             * @type {module:zrender/core/util.HashMap}
              */
-            this.markerGroupMap = {};
+            this.markerGroupMap = zrUtil.createHashMap();
         },
 
         render: function (markerModel, ecModel, api) {
             var markerGroupMap = this.markerGroupMap;
-            for (var name in markerGroupMap) {
-                if (markerGroupMap.hasOwnProperty(name)) {
-                    markerGroupMap[name].__keep = false;
-                }
-            }
+            markerGroupMap.each(function (item) {
+                item.__keep = false;
+            });
 
             var markerModelKey = this.type + 'Model';
             ecModel.eachSeries(function (seriesModel) {
@@ -27,11 +27,9 @@
                 markerModel && this.renderSeries(seriesModel, markerModel, ecModel, api);
             }, this);
 
-            for (var name in markerGroupMap) {
-                if (markerGroupMap.hasOwnProperty(name) && !markerGroupMap[name].__keep) {
-                    this.group.remove(markerGroupMap[name].group);
-                }
-            }
+            markerGroupMap.each(function (item) {
+                !item.__keep && this.group.remove(item.group);
+            }, this);
         },
 
         renderSeries: function () {}

package/lib/component/polar.js

@@ -1,6 +1,8 @@
 'use strict';
 
 
+    var zrUtil = require('zrender/lib/core/util');
+
     require('../coord/polar/polarCreator');
     require('./angleAxis');
     require('./radiusAxis');
@@ -8,6 +10,9 @@
 
     require('./axisPointer/PolarAxisPointer');
 
+    // For reducing size of echarts.min, barLayoutPolar is required by polar.
+    require('../echarts').registerLayout(zrUtil.curry(require('../layout/barPolar'), 'bar'));
+
     // Polar view
     require('../echarts').extendComponentView({
         type: 'polar'

package/lib/component/timeline/SliderTimelineView.js

@@ -47,7 +47,7 @@
             this._timer;
 
             /**
-             * @type {module:zrende/Element}
+             * @type {module:zrender/Element}
              */
             this._currentPointer;
 

package/lib/component/toolbox/feature/DataZoom.js

@@ -5,6 +5,7 @@
     var BrushController = require('../../helper/BrushController');
     var BrushTargetManager = require('../../helper/BrushTargetManager');
     var history = require('../../dataZoom/history');
+    var sliderMove = require('../../helper/sliderMove');
 
     var each = zrUtil.each;
 
@@ -122,7 +123,19 @@
         this._dispatchZoomAction(snapshot);
 
         function setBatch(dimName, coordSys, minMax) {
-            var dataZoomModel = findDataZoom(dimName, coordSys.getAxis(dimName).model, ecModel);
+            var axis = coordSys.getAxis(dimName);
+            var axisModel = axis.model;
+            var dataZoomModel = findDataZoom(dimName, axisModel, ecModel);
+
+            // Restrict range.
+            var minMaxSpan = dataZoomModel.findRepresentativeAxisProxy(axisModel).getMinMaxSpan();
+            if (minMaxSpan.minValueSpan != null || minMaxSpan.maxValueSpan != null) {
+                minMax = sliderMove(
+                    0, minMax.slice(), axis.scale.getExtent(), 0,
+                    minMaxSpan.minValueSpan, minMaxSpan.maxValueSpan
+                );
+            }
+
             dataZoomModel && (snapshot[dataZoomModel.id] = {
                 dataZoomId: dataZoomModel.id,
                 startValue: minMax[0],

package/lib/component/tooltip/TooltipView.js

@@ -613,13 +613,13 @@
             var contentNotChanged = !!lastCoordSys
                 && lastCoordSys.length === dataByCoordSys.length;
 
-            each(lastCoordSys, function (lastItemCoordSys, indexCoordSys) {
+            contentNotChanged && each(lastCoordSys, function (lastItemCoordSys, indexCoordSys) {
                 var lastDataByAxis = lastItemCoordSys.dataByAxis || {};
                 var thisItemCoordSys = dataByCoordSys[indexCoordSys] || {};
                 var thisDataByAxis = thisItemCoordSys.dataByAxis || [];
                 contentNotChanged &= lastDataByAxis.length === thisDataByAxis.length;
 
-                each(lastDataByAxis, function (lastItem, indexAxis) {
+                contentNotChanged && each(lastDataByAxis, function (lastItem, indexAxis) {
                     var thisItem = thisDataByAxis[indexAxis] || {};
                     var lastIndices = lastItem.seriesDataIndices || [];
                     var newIndices = thisItem.seriesDataIndices || [];
@@ -630,7 +630,7 @@
                         && lastItem.axisId === thisItem.axisId
                         && lastIndices.length === newIndices.length;
 
-                    each(lastIndices, function (lastIdxItem, j) {
+                    contentNotChanged && each(lastIndices, function (lastIdxItem, j) {
                         var newIdxItem = newIndices[j];
                         contentNotChanged &=
                             lastIdxItem.seriesIndex === newIdxItem.seriesIndex

package/lib/component/visualMap/ContinuousView.js

@@ -355,16 +355,18 @@
             delta = delta || 0;
             var visualMapModel = this.visualMapModel;
             var handleEnds = this._handleEnds;
+            var sizeExtent = [0, visualMapModel.itemSize[1]];
 
             sliderMove(
                 delta,
                 handleEnds,
-                [0, visualMapModel.itemSize[1]],
-                handleIndex === 'all' ? 'rigid' : 'push',
-                handleIndex
+                sizeExtent,
+                handleIndex,
+                // cross is forbiden
+                0
             );
+
             var dataExtent = visualMapModel.getExtent();
-            var sizeExtent = [0, visualMapModel.itemSize[1]];
             // Update data interval.
             this._dataInterval = [
                 linearMap(handleEnds[0], sizeExtent, dataExtent, true),

package/lib/coord/Axis.js

@@ -3,6 +3,7 @@
     var numberUtil = require('../util/number');
     var linearMap = numberUtil.linearMap;
     var zrUtil = require('zrender/lib/core/util');
+    var axisHelper = require('./axisHelper');
 
     function fixExtentWithBands(extent, nTick) {
         var size = extent[1] - extent[0];
@@ -47,6 +48,12 @@
          * @type {boolean}
          */
         this.onBand = false;
+
+        /**
+         * @private
+         * @type {number}
+         */
+        this._labelInterval;
     };
 
     Axis.prototype = {
@@ -79,8 +86,7 @@
          * @return {Array.<number>}
          */
         getExtent: function () {
-            var ret = this._extent.slice();
-            return ret;
+            return this._extent.slice();
         },
 
         /**
@@ -224,6 +230,32 @@
             var size = Math.abs(axisExtent[1] - axisExtent[0]);
 
             return Math.abs(size) / len;
+        },
+
+        /**
+         * 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 = interval === 'auto' ? 0 : interval;
+                }
+                else if (this.isHorizontal){
+                    labelInterval = axisHelper.getAxisLabelInterval(
+                        zrUtil.map(this.scale.getTicks(), this.dataToCoord, this),
+                        axisModel.getFormattedLabels(),
+                        labelModel.getModel('textStyle').getFont(),
+                        this.isHorizontal()
+                    );
+                }
+                this._labelInterval = labelInterval;
+            }
+            return labelInterval;
         }
 
     };

package/lib/coord/axisDefault.js

@@ -142,10 +142,11 @@
         min: 'dataMin',
         max: 'dataMax'
     }, valueAxis);
+
     var logAxis = zrUtil.defaults({
+        scale: true,
         logBase: 10
     }, valueAxis);
-    logAxis.scale = true;
 
     module.exports = {
         categoryAxis: categoryAxis,

package/lib/coord/axisHelper.js

@@ -114,31 +114,12 @@
         }
 
         scale.setExtent(extent[0], extent[1]);
-        scale.niceExtent(splitNumber, fixMin, fixMax);
-
-        // Use minInterval to constraint the calculated interval.
-        // If calculated interval is less than minInterval. increase the interval quantity until
-        // it is larger than minInterval.
-        // For example:
-        //  minInterval is 1, calculated interval is 0.2, so increase it to be 1. In this way we can get
-        //  an integer axis.
-        var minInterval = model.get('minInterval');
-        if (isFinite(minInterval) && !fixMin && !fixMax && scale.type === 'interval') {
-            var interval = scale.getInterval();
-            var intervalScale = Math.max(Math.abs(interval), minInterval) / interval;
-            // while (interval < minInterval) {
-            //     var quantity = numberUtil.quantity(interval);
-            //     interval = quantity * 10;
-            //     scaleQuantity *= 10;
-            // }
-            extent = scale.getExtent();
-            var origin = (extent[1] + extent[0]) / 2;
-            scale.setExtent(
-                intervalScale * (extent[0] - origin) + origin,
-                intervalScale * (extent[1] - origin) + origin
-            );
-            scale.niceExtent(splitNumber);
-        }
+        scale.niceExtent({
+            splitNumber: splitNumber,
+            fixMin: fixMin,
+            fixMax: fixMax,
+            minInterval: scale.type === 'interval' ? model.get('minInterval') : null
+        });
 
         // If some one specified the min, max. And the default calculated interval
         // is not good enough. He can specify the interval. It is often appeared

package/lib/coord/axisModelCommonMixin.js

@@ -8,7 +8,7 @@
             return obj.value;
         }
         else {
-            return obj;
+            return obj + '';
         }
     }
 

package/lib/coord/calendar/Calendar.js

@@ -34,7 +34,7 @@
             return [{name: 'time', type: 'time'}];
         },
 
-        getHandledRangeInfo: function () {
+        getRangeInfo: function () {
             return this._rangeInfo;
         },
 
@@ -160,18 +160,20 @@
          * Convert a time data(time, value) item to (x, y) point.
          *
          * @override
-         * @param  {Array} data  data
-         * @param  {boolean} noClip  out of range
-         * @return {Array}       point
+         * @param  {Array|number} data data
+         * @param  {boolean} [clamp=true] out of range
+         * @return {Array} point
          */
-        dataToPoint: function (data, noClip) {
+        dataToPoint: function (data, clamp) {
+            zrUtil.isArray(data) && (data = data[0]);
+            clamp == null && (clamp = true);
 
-            var dayInfo = this.getDateInfo(data[0]);
+            var dayInfo = this.getDateInfo(data);
             var range = this._rangeInfo;
             var date = dayInfo.formatedDate;
 
             // if not in range return [NaN, NaN]
-            if (!noClip && !(dayInfo.time >= range.start.time && dayInfo.time <= range.end.time)) {
+            if (clamp && !(dayInfo.time >= range.start.time && dayInfo.time <= range.end.time)) {
                 return [NaN, NaN];
             }
 
@@ -211,12 +213,11 @@
          * Convert a time date item to (x, y) four point.
          *
          * @param  {Array} data  date[0] is date
-         * @param  {boolean} noClip  out of range
+         * @param  {boolean} [clamp=true]  out of range
          * @return {Object}       point
          */
-        dataToRect: function (data, noClip) {
-
-            var point = this.dataToPoint(data, noClip);
+        dataToRect: function (data, clamp) {
+            var point = this.dataToPoint(data, clamp);
 
             return {
                 contentShape: {
@@ -270,16 +271,12 @@
         },
 
         /**
-         * @override
-         * @implements
-         * see {module:echarts/CoodinateSystem}
+         * @inheritDoc
          */
         convertToPixel: zrUtil.curry(doConvert, 'dataToPoint'),
 
         /**
-         * @override
-         * @implements
-         * see {module:echarts/CoodinateSystem}
+         * @inheritDoc
          */
         convertFromPixel: zrUtil.curry(doConvert, 'pointToData'),
 

package/lib/coord/calendar/prepareCustom.js

@@ -0,0 +1,31 @@
+
+
+    var zrUtil = require('zrender/lib/core/util');
+
+    function prepareCustom(coordSys) {
+        var rect = coordSys.getRect();
+        var rangeInfo = coordSys.getRangeInfo();
+
+        return {
+            coordSys: {
+                type: 'calendar',
+                x: rect.x,
+                y: rect.y,
+                width: rect.width,
+                height: rect.height,
+                cellWidth: coordSys.getCellWidth(),
+                cellHeight: coordSys.getCellHeight(),
+                rangeInfo: {
+                    start: rangeInfo.start,
+                    end: rangeInfo.end,
+                    weeks: rangeInfo.weeks,
+                    dayCount: rangeInfo.allDay
+                }
+            },
+            api: {
+                coord: zrUtil.bind(coordSys.dataToPoint, coordSys)
+            }
+        };
+    }
+
+    module.exports = prepareCustom;

package/lib/coord/cartesian/Axis2D.js

@@ -2,7 +2,6 @@
 
     var zrUtil = require('zrender/lib/core/util');
     var Axis = require('../Axis');
-    var axisLabelInterval = require('./axisLabelInterval');
 
     /**
      * Extend axis 2d
@@ -81,17 +80,6 @@
             this.grid.getOtherAxis();
         },
 
-        /**
-         * @return {number}
-         */
-        getLabelInterval: function () {
-            var labelInterval = this._labelInterval;
-            if (!labelInterval) {
-                labelInterval = this._labelInterval = axisLabelInterval(this);
-            }
-            return labelInterval;
-        },
-
         /**
          * If label is ignored.
          * Automatically used when axis is category and label can not be all shown

package/lib/coord/cartesian/Cartesian2D.js

@@ -103,6 +103,7 @@
         getOtherAxis: function (axis) {
             return this.getAxis(axis.dim === 'x' ? 'y' : 'x');
         }
+
     };
 
     zrUtil.inherits(Cartesian2D, Cartesian);

package/lib/coord/cartesian/Grid.js

@@ -100,7 +100,9 @@ var factory = exports;
             for (var idx in axes) {
                 if (axes.hasOwnProperty(idx)) {
                     var axis = axes[idx];
-                    if (axis && (axis.type === 'category' || !ifAxisCrossZero(axis))) {
+                    if (axis && (
+                        axis.type === 'category' || axis.type === 'time' || !ifAxisCrossZero(axis)
+                    )) {
                         return true;
                     }
                 }
@@ -555,7 +557,8 @@ var factory = exports;
         ecModel.eachComponent('grid', function (gridModel, idx) {
             var grid = new Grid(gridModel, ecModel, api);
             grid.name = 'grid_' + idx;
-            grid.resize(gridModel, api);
+            // Postpone `resize` to `update`.
+            // grid.resize(gridModel, api);
 
             gridModel.coordinateSystem = grid;
 

package/lib/coord/cartesian/prepareCustom.js

@@ -0,0 +1,36 @@
+
+
+    var zrUtil = require('zrender/lib/core/util');
+
+    function dataToCoordSize(dataSize, dataItem) {
+        // dataItem is necessary in log axis.
+        dataItem = dataItem || [0, 0];
+        return zrUtil.map(['x', 'y'], function (dim, dimIdx) {
+            var axis = this.getAxis(dim);
+            var val = dataItem[dimIdx];
+            var halfSize = dataSize[dimIdx] / 2;
+            return axis.type === 'category'
+                ? axis.getBandWidth()
+                : Math.abs(axis.dataToCoord(val - halfSize) - axis.dataToCoord(val + halfSize));
+        }, this);
+    }
+
+    function prepareCustom(coordSys) {
+        var rect = coordSys.grid.getRect();
+        return {
+            coordSys: {
+                // The name exposed to user is always 'cartesian2d' but not 'grid'.
+                type: 'cartesian2d',
+                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;