echarts 3.5.1 → 3.6.0

package/lib/component/helper/sliderMove.js

@@ -2,52 +2,81 @@
 
     /**
      * Calculate slider move result.
+     * Usage:
+     * (1) If both handle0 and handle1 are needed to be moved, set minSpan the same as
+     * maxSpan and the same as `Math.abs(handleEnd[1] - handleEnds[0])`.
+     * (2) If handle0 is forbidden to cross handle1, set minSpan as `0`.
      *
      * @param {number} delta Move length.
-     * @param {Array.<number>} handleEnds handleEnds[0] and be bigger then handleEnds[1].
-     *                                    handleEnds will be modified in this method.
+     * @param {Array.<number>} handleEnds handleEnds[0] can be bigger then handleEnds[1].
+     *              handleEnds will be modified in this method.
      * @param {Array.<number>} extent handleEnds is restricted by extent.
-     *                                extent[0] should less or equals than extent[1].
-     * @param {string} mode 'rigid': Math.abs(handleEnds[0] - handleEnds[1]) remain unchanged,
-     *                      'cross' handleEnds[0] can be bigger then handleEnds[1],
-     *                      'push' handleEnds[0] can not be bigger then handleEnds[1],
-     *                              when they touch, one push other.
-     * @param {number} handleIndex If mode is 'rigid', handleIndex is not required.
-     * @param {Array.<number>} The input handleEnds.
+     *              extent[0] should less or equals than extent[1].
+     * @param {number|string} handleIndex Can be 'all', means that both move the two handleEnds,
+     *              where the input minSpan and maxSpan will not work.
+     * @param {number} [minSpan] The range of dataZoom can not be smaller than that.
+     *              If not set, handle0 and cross handle1. If set as a non-negative
+     *              number (including `0`), handles will push each other when reaching
+     *              the minSpan.
+     * @param {number} [maxSpan] The range of dataZoom can not be larger than that.
+     * @return {Array.<number>} The input handleEnds.
      */
-    module.exports = function (delta, handleEnds, extent, mode, handleIndex) {
-        if (!delta) {
-            return handleEnds;
+    module.exports = function (delta, handleEnds, extent, handleIndex, minSpan, maxSpan) {
+        // Normalize firstly.
+        handleEnds[0] = restrict(handleEnds[0], extent);
+        handleEnds[1] = restrict(handleEnds[1], extent);
+
+        delta = delta || 0;
+
+        var extentSpan = extent[1] - extent[0];
+
+        // Notice maxSpan and minSpan can be null/undefined.
+        if (minSpan != null) {
+            minSpan = restrict(minSpan, [0, extentSpan]);
         }
+        if (maxSpan != null) {
+            maxSpan = Math.max(maxSpan, minSpan != null ? minSpan : 0);
+        }
+        if (handleIndex === 'all') {
+            minSpan = maxSpan = Math.abs(handleEnds[1] - handleEnds[0]);
+            handleIndex = 0;
+        }
+
+        var originalDistSign = getSpanSign(handleEnds, handleIndex);
 
-        if (mode === 'rigid') {
-            delta = getRealDelta(delta, handleEnds, extent);
-            handleEnds[0] += delta;
-            handleEnds[1] += delta;
+        handleEnds[handleIndex] += delta;
+
+        // Restrict in extent.
+        var extentMinSpan = minSpan || 0;
+        var realExtent = extent.slice();
+        originalDistSign.sign < 0 ? (realExtent[0] += extentMinSpan) : (realExtent[1] -= extentMinSpan);
+        handleEnds[handleIndex] = restrict(handleEnds[handleIndex], realExtent);
+
+        // Expand span.
+        var currDistSign = getSpanSign(handleEnds, handleIndex);
+        if (minSpan != null && (
+            currDistSign.sign !== originalDistSign.sign || currDistSign.span < minSpan
+        )) {
+            // If minSpan exists, 'cross' is forbinden.
+            handleEnds[1 - handleIndex] = handleEnds[handleIndex] + originalDistSign.sign * minSpan;
         }
-        else {
-            delta = getRealDelta(delta, handleEnds[handleIndex], extent);
-            handleEnds[handleIndex] += delta;
 
-            if (mode === 'push' && handleEnds[0] > handleEnds[1]) {
-                handleEnds[1 - handleIndex] = handleEnds[handleIndex];
-            }
+        // Shrink span.
+        var currDistSign = getSpanSign(handleEnds, handleIndex);
+        if (maxSpan != null && currDistSign.span > maxSpan) {
+            handleEnds[1 - handleIndex] = handleEnds[handleIndex] + currDistSign.sign * maxSpan;
         }
 
         return handleEnds;
-
-        function getRealDelta(delta, handleEnds, extent) {
-            var handleMinMax = !handleEnds.length
-                ? [handleEnds, handleEnds]
-                : handleEnds.slice();
-            handleEnds[0] > handleEnds[1] && handleMinMax.reverse();
-
-            if (delta < 0 && handleMinMax[0] + delta < extent[0]) {
-                delta = extent[0] - handleMinMax[0];
-            }
-            if (delta > 0 && handleMinMax[1] + delta > extent[1]) {
-                delta = extent[1] - handleMinMax[1];
-            }
-            return delta;
-        }
     };
+
+    function getSpanSign(handleEnds, handleIndex) {
+        var dist = handleEnds[handleIndex] - handleEnds[1 - handleIndex];
+        // If `handleEnds[0] === handleEnds[1]`, always believe that handleEnd[0]
+        // is at left of handleEnds[1] for non-cross case.
+        return {span: Math.abs(dist), sign: dist > 0 ? -1 : dist < 0 ? 1 : handleIndex ? -1 : 1};
+    }
+
+    function restrict(value, extend) {
+        return Math.min(extend[1], Math.max(extend[0], value));
+    }

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/marker/markerHelper.js

@@ -33,7 +33,7 @@
         var coordArr = [];
         var value = numCalculate(data, targetDataDim, mlType);
 
-        var dataIndex = data.indexOfNearest(targetDataDim, value, true)[0];
+        var dataIndex = data.indicesOfNearest(targetDataDim, value, true)[0];
         coordArr[otherCoordIndex] = data.get(otherDataDim, dataIndex, true);
         coordArr[targetCoordIndex] = data.get(targetDataDim, dataIndex, true);
 

package/lib/component/parallel.js

@@ -6,6 +6,7 @@
 
     var echarts = require('../echarts');
     var zrUtil = require('zrender/lib/core/util');
+    var throttle = require('../util/throttle');
 
     var CLICK_THRESHOLD = 5; // > 4
 
@@ -14,43 +15,107 @@
         type: 'parallel',
 
         render: function (parallelModel, ecModel, api) {
-            var zr = api.getZr();
-
-            if (!this.__onMouseDown) {
-                // FIXME
-                // click: mousemove check. otherwise confilct with drag brush.
-                var mousedownPoint;
-                zr.on('mousedown', this.__onMouseDown = function (e) {
-                    mousedownPoint = [e.offsetX, e.offsetY];
-                });
-                zr.on('mouseup', this.__onMouseUp = function (e) {
-                    var point = [e.offsetX, e.offsetY];
-                    var dist = Math.pow(mousedownPoint[0] - point[0], 2)
-                        + Math.pow(mousedownPoint[1] - point[1], 2);
-
-                    if (!parallelModel.get('axisExpandable') || dist > CLICK_THRESHOLD) {
-                        return;
-                    }
+            this._model = parallelModel;
+            this._api = api;
 
-                    var coordSys = parallelModel.coordinateSystem;
-                    var closestDim = coordSys.findClosestAxisDim(point);
-                    if (closestDim) {
-                        var axisIndex = zrUtil.indexOf(coordSys.dimensions, closestDim);
-                        api.dispatchAction({
-                            type: 'parallelAxisExpand',
-                            axisExpandCenter: axisIndex
-                        });
-                    }
-                });
+            if (!this._handlers) {
+                this._handlers = {};
+                zrUtil.each(handlers, function (handler, eventName) {
+                    api.getZr().on(eventName, this._handlers[eventName] = zrUtil.bind(handler, this));
+                }, this);
             }
+
+            throttle.createOrUpdate(
+                this,
+                '_throttledDispatchExpand',
+                parallelModel.get('axisExpandRate'),
+                'fixRate'
+            );
         },
 
         dispose: function (ecModel, api) {
-            api.getZr().off(this.__onMouseDown);
-            api.getZr().off(this.__onMouseUp);
+            zrUtil.each(this._handlers, function (handler, eventName) {
+                api.getZr().off(eventName, handler);
+            });
+            this._handlers = null;
+        },
+
+        /**
+         * @param {Object} [opt] If null, cancle the last action triggering for debounce.
+         */
+        _throttledDispatchExpand: function (opt) {
+            this._dispatchExpand(opt);
+        },
+
+        _dispatchExpand: function (opt) {
+            opt && this._api.dispatchAction(
+                zrUtil.extend({type: 'parallelAxisExpand'}, opt)
+            );
         }
+
     });
 
+    var handlers = {
+
+        mousedown: function (e) {
+            if (checkTrigger(this, 'click')) {
+                this._mouseDownPoint = [e.offsetX, e.offsetY];
+            }
+        },
+
+        mouseup: function (e) {
+            var mouseDownPoint = this._mouseDownPoint;
+
+            if (checkTrigger(this, 'click') && mouseDownPoint) {
+                var point = [e.offsetX, e.offsetY];
+                var dist = Math.pow(mouseDownPoint[0] - point[0], 2)
+                    + Math.pow(mouseDownPoint[1] - point[1], 2);
+
+                if (dist > CLICK_THRESHOLD) {
+                    return;
+                }
+
+                var result = this._model.coordinateSystem.getSlidedAxisExpandWindow(
+                    [e.offsetX, e.offsetY]
+                );
+
+                result.behavior !== 'none' && this._dispatchExpand({
+                    axisExpandWindow: result.axisExpandWindow
+                });
+            }
+
+            this._mouseDownPoint = null;
+        },
+
+        mousemove: function (e) {
+            // Should do nothing when brushing.
+            if (this._mouseDownPoint || !checkTrigger(this, 'mousemove')) {
+                return;
+            }
+            var model = this._model;
+            var result = model.coordinateSystem.getSlidedAxisExpandWindow(
+                [e.offsetX, e.offsetY]
+            );
+
+            var behavior = result.behavior;
+            behavior === 'jump' && this._throttledDispatchExpand.debounceNextCall(model.get('axisExpandDebounce'));
+            this._throttledDispatchExpand(
+                behavior === 'none'
+                    ? null // Cancle the last trigger, in case that mouse slide out of the area quickly.
+                    : {
+                        axisExpandWindow: result.axisExpandWindow,
+                        // Jumping uses animation, and sliding suppresses animation.
+                        animation: behavior === 'jump'  ? null : false
+                    }
+            );
+        }
+    };
+
+    function checkTrigger(view, triggerOn) {
+        var model = view._model;
+        return model.get('axisExpandable') && model.get('axisExpandTriggerOn') === triggerOn;
+    }
+
     echarts.registerPreprocessor(
         require('../coord/parallel/parallelPreprocessor')
     );

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/Brush.js

@@ -92,8 +92,15 @@
         var brushMode = this._brushMode;
 
         if (type === 'clear') {
+            // Trigger parallel action firstly
+            api.dispatchAction({
+                type: 'axisAreaSelect',
+                intervals: []
+            });
+
             api.dispatchAction({
                 type: 'brush',
+                command: 'clear',
                 // Clear all areas of all brush components.
                 areas: []
             });

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;
 
@@ -51,7 +52,7 @@
         this.ecModel = ecModel;
         this.api = api;
 
-        updateZoomBtnStatus(featureModel, ecModel, this, payload);
+        updateZoomBtnStatus(featureModel, ecModel, this, payload, api);
         updateBackBtnStatus(featureModel, ecModel);
     };
 
@@ -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],
@@ -176,7 +189,7 @@
         );
     }
 
-    function updateZoomBtnStatus(featureModel, ecModel, view, payload) {
+    function updateZoomBtnStatus(featureModel, ecModel, view, payload, api) {
         var zoomActive = view._isZoomActive;
 
         if (payload && payload.type === 'takeGlobalCursor') {
@@ -193,7 +206,7 @@
         );
 
         view._brushController
-            .setPanels(brushTargetManager.makePanelOpts(function (targetInfo) {
+            .setPanels(brushTargetManager.makePanelOpts(api, function (targetInfo) {
                 return (targetInfo.xAxisDeclared && !targetInfo.yAxisDeclared)
                     ? 'lineX'
                     : (!targetInfo.xAxisDeclared && targetInfo.yAxisDeclared)