echarts 3.5.4 → 3.6.0

package/src/component/dataZoom/SliderZoomView.js

@@ -248,11 +248,12 @@ define(function (require) {
             return [0, this._size[0]];
         },
 
-        _renderBackground : function () {
+        _renderBackground: function () {
             var dataZoomModel = this.dataZoomModel;
             var size = this._size;
+            var barGroup = this._displayables.barGroup;
 
-            this._displayables.barGroup.add(new Rect({
+            barGroup.add(new Rect({
                 silent: true,
                 shape: {
                     x: 0, y: 0, width: size[0], height: size[1]
@@ -262,6 +263,18 @@ define(function (require) {
                 },
                 z2: -40
             }));
+
+            // Click panel, over shadow, below handles.
+            barGroup.add(new Rect({
+                shape: {
+                    x: 0, y: 0, width: size[0], height: size[1]
+                },
+                style: {
+                    fill: 'transparent'
+                },
+                z2: 0,
+                onclick: zrUtil.bind(this._onClickPanelClick, this)
+            }));
         },
 
         _renderDataShadow: function () {
@@ -450,7 +463,7 @@ define(function (require) {
 
             var iconStr = dataZoomModel.get('handleIcon');
             each([0, 1], function (handleIndex) {
-                var path = graphic.makePath(iconStr, {
+                var iconOpt = {
                     style: {
                         strokeNoScale: true
                     },
@@ -465,12 +478,21 @@ define(function (require) {
                     ondragend: bind(this._onDragEnd, this),
                     onmouseover: bind(this._showDataInfo, this, true),
                     onmouseout: bind(this._showDataInfo, this, false)
-                }, {
-                    x: -0.5,
-                    y: 0,
-                    width: 1,
-                    height: 1
-                }, 'center');
+                };
+                var iconStyle = {x: -1, y: 0, width: 2, height: 2};
+
+                var path = iconStr.indexOf('image://') === 0
+                    ? (
+                        iconStyle.image = iconStr.slice(8),
+                        iconOpt.style = iconStyle,
+                        new graphic.Image(iconOpt)
+                    )
+                    : graphic.makePath(
+                        iconStr.replace('path://', ''),
+                        iconOpt,
+                        iconStyle,
+                        'center'
+                    );
 
                 var bRect = path.getBoundingRect();
                 this._handleHeight = numberUtil.parsePercent(dataZoomModel.get('handleSize'), this._size[1]);
@@ -520,25 +542,29 @@ define(function (require) {
         /**
          * @private
          * @param {(number|string)} handleIndex 0 or 1 or 'all'
-         * @param {number} dx
-         * @param {number} dy
+         * @param {number} delta
          */
         _updateInterval: function (handleIndex, delta) {
+            var dataZoomModel = this.dataZoomModel;
             var handleEnds = this._handleEnds;
             var viewExtend = this._getViewExtent();
+            var minMaxSpan = dataZoomModel.findRepresentativeAxisProxy().getMinMaxSpan();
+            var percentExtent = [0, 100];
 
             sliderMove(
                 delta,
                 handleEnds,
                 viewExtend,
-                (handleIndex === 'all' || this.dataZoomModel.get('zoomLock'))
-                    ? 'rigid' : 'cross',
-                handleIndex
+                dataZoomModel.get('zoomLock') ? 'all' : handleIndex,
+                minMaxSpan.minSpan != null
+                    ? linearMap(minMaxSpan.minSpan, percentExtent, viewExtend, true) : null,
+                minMaxSpan.maxSpan != null
+                    ? linearMap(minMaxSpan.maxSpan, percentExtent, viewExtend, true) : null
             );
 
             this._range = asc([
-                linearMap(handleEnds[0], viewExtend, [0, 100], true),
-                linearMap(handleEnds[1], viewExtend, [0, 100], true)
+                linearMap(handleEnds[0], viewExtend, percentExtent, true),
+                linearMap(handleEnds[1], viewExtend, percentExtent, true)
             ]);
         },
 
@@ -556,7 +582,7 @@ define(function (require) {
                 var handle = displaybles.handles[handleIndex];
                 var handleHeight = this._handleHeight;
                 handle.attr({
-                    scale: [handleHeight, handleHeight],
+                    scale: [handleHeight / 2, handleHeight / 2],
                     position: [handleEnds[handleIndex], size[1] / 2 - handleHeight / 2]
                 });
             }, this);
@@ -682,7 +708,8 @@ define(function (require) {
             this._dragging = true;
 
             // Transform dx, dy to bar coordination.
-            var vertex = this._applyBarTransform([dx, dy], true);
+            var barTransform = this._displayables.barGroup.getLocalTransform();
+            var vertex = graphic.applyTransform([dx, dy], barTransform, true);
 
             this._updateInterval(handleIndex, vertex[0]);
 
@@ -701,6 +728,24 @@ define(function (require) {
             this._dispatchZoomAction();
         },
 
+        _onClickPanelClick: function (e) {
+            var size = this._size;
+            var localPoint = this._displayables.barGroup.transformCoordToLocal(e.offsetX, e.offsetY);
+
+            if (localPoint[0] < 0 || localPoint[0] > size[0]
+                || localPoint[1] < 0 || localPoint[1] > size[1]
+            ) {
+                return;
+            }
+
+            var handleEnds = this._handleEnds;
+            var center = (handleEnds[0] + handleEnds[1]) / 2;
+
+            this._updateInterval('all', localPoint[0] - center);
+            this._updateView();
+            this._dispatchZoomAction();
+        },
+
         /**
          * This action will be throttled.
          * @private
@@ -717,14 +762,6 @@ define(function (require) {
             });
         },
 
-        /**
-         * @private
-         */
-        _applyBarTransform: function (vertex, inverse) {
-            var barTransform = this._displayables.barGroup.getLocalTransform();
-            return graphic.applyTransform(vertex, barTransform, inverse);
-        },
-
         /**
          * @private
          */

package/src/component/dataZoom/roams.js

@@ -29,6 +29,8 @@ define(function(require) {
          * @param {number} dataZoomInfo.throttleRate
          * @param {Function} dataZoomInfo.panGetRange
          * @param {Function} dataZoomInfo.zoomGetRange
+         * @param {boolean} [dataZoomInfo.zoomLock]
+         * @param {boolean} [dataZoomInfo.disabled]
          */
         register: function (api, dataZoomInfo) {
             var store = giveStore(api);
@@ -57,9 +59,13 @@ define(function(require) {
                     dataZoomInfos: {},
                     count: 0
                 };
-                record.controller = createController(api, dataZoomInfo, record);
+                record.controller = createController(api, record);
                 record.dispatchAction = zrUtil.curry(dispatchAction, api);
             }
+            record.controller.enable(
+                dataZoomInfo.disabled ? false : dataZoomInfo.zoomLock ? 'move' : true,
+                dataZoomInfo.roamControllerOpt
+            );
 
             // Consider resize, area should be always updated.
             record.controller.setPointerChecker(dataZoomInfo.containsPoint);
@@ -130,9 +136,8 @@ define(function(require) {
         return zr[ATTR] || (zr[ATTR] = {});
     }
 
-    function createController(api, dataZoomInfo, newRecord) {
+    function createController(api, newRecord) {
         var controller = new RoamController(api.getZr());
-        controller.enable();
         controller.on('pan', curry(onPan, newRecord));
         controller.on('zoom', curry(onZoom, newRecord));
 

package/src/component/graphic.js

@@ -214,9 +214,9 @@ define(function (require) {
 
             /**
              * @private
-             * @type {Object}
+             * @type {module:zrender/core/util.HashMap}
              */
-            this._elMap = {};
+            this._elMap = zrUtil.createHashMap();
 
             /**
              * @private
@@ -270,9 +270,9 @@ define(function (require) {
             zrUtil.each(elOptionsToUpdate, function (elOption) {
                 var $action = elOption.$action;
                 var id = elOption.id;
-                var existEl = elMap[id];
+                var existEl = elMap.get(id);
                 var parentId = elOption.parentId;
-                var targetElParent = parentId != null ? elMap[parentId] : rootGroup;
+                var targetElParent = parentId != null ? elMap.get(parentId) : rootGroup;
 
                 // In top/bottom mode, textVertical should not be used. And textBaseline
                 // should not be 'alphabetic', which cause inaccurately locating.
@@ -305,9 +305,10 @@ define(function (require) {
                     removeEl(existEl, elMap);
                 }
 
-                if (elMap[id]) {
-                    elMap[id].__ecGraphicWidth = elOption.width;
-                    elMap[id].__ecGraphicHeight = elOption.height;
+                var el = elMap.get(id);
+                if (el) {
+                    el.__ecGraphicWidth = elOption.width;
+                    el.__ecGraphicHeight = elOption.height;
                 }
             });
         },
@@ -327,7 +328,7 @@ define(function (require) {
             // Bottom-up tranvese all elements (consider ec resize) to locate elements.
             for (var i = elOptions.length - 1; i >= 0; i--) {
                 var elOption = elOptions[i];
-                var el = elMap[elOption.id];
+                var el = elMap.get(elOption.id);
 
                 if (!el) {
                     continue;
@@ -358,10 +359,10 @@ define(function (require) {
          */
         _clear: function () {
             var elMap = this._elMap;
-            zrUtil.each(elMap, function (el) {
+            elMap.each(function (el) {
                 removeEl(el, elMap);
             });
-            this._elMap = {};
+            this._elMap = zrUtil.createHashMap();
         },
 
         /**
@@ -387,7 +388,7 @@ define(function (require) {
 
         var el = new Clz(elOption);
         targetElParent.add(el);
-        elMap[id] = el;
+        elMap.set(id, el);
         el.__ecGraphicId = id;
     }
 
@@ -397,7 +398,7 @@ define(function (require) {
             existEl.type === 'group' && existEl.traverse(function (el) {
                 removeEl(el, elMap);
             });
-            delete elMap[existEl.__ecGraphicId];
+            elMap.removeKey(existEl.__ecGraphicId);
             existElParent.remove(existEl);
         }
     }

package/src/component/helper/BrushTargetManager.js

@@ -244,7 +244,7 @@ define(function(require) {
             var yAxisModels = foundCpts.yAxisModels;
             var gridModels = foundCpts.gridModels;
             // Remove duplicated.
-            var gridModelMap = {};
+            var gridModelMap = zrUtil.createHashMap();
             var xAxesHas = {};
             var yAxesHas = {};
 
@@ -254,21 +254,21 @@ define(function(require) {
 
             each(xAxisModels, function (axisModel) {
                 var gridModel = axisModel.axis.grid.model;
-                gridModelMap[gridModel.id] = gridModel;
+                gridModelMap.set(gridModel.id, gridModel);
                 xAxesHas[gridModel.id] = true;
             });
             each(yAxisModels, function (axisModel) {
                 var gridModel = axisModel.axis.grid.model;
-                gridModelMap[gridModel.id] = gridModel;
+                gridModelMap.set(gridModel.id, gridModel);
                 yAxesHas[gridModel.id] = true;
             });
             each(gridModels, function (gridModel) {
-                gridModelMap[gridModel.id] = gridModel;
+                gridModelMap.set(gridModel.id, gridModel);
                 xAxesHas[gridModel.id] = true;
                 yAxesHas[gridModel.id] = true;
             });
 
-            each(gridModelMap, function (gridModel) {
+            gridModelMap.each(function (gridModel) {
                 var grid = gridModel.coordinateSystem;
                 var cartesians = [];
 

package/src/component/helper/MapDraw.js

@@ -156,7 +156,7 @@ define(function (require) {
             var hoverItemStyleAccessPath = ['itemStyle', 'emphasis'];
             var labelAccessPath = ['label', 'normal'];
             var hoverLabelAccessPath = ['label', 'emphasis'];
-            var nameMap = {};
+            var nameMap = zrUtil.createHashMap();
 
             zrUtil.each(geo.regions, function (region) {
 
@@ -165,8 +165,8 @@ define(function (require) {
                 // colonies). And it is not appropriate to merge them in geo, which
                 // will make them share the same label and bring trouble in label
                 // location calculation.
-                var regionGroup = nameMap[region.name]
-                    || (nameMap[region.name] = new graphic.Group());
+                var regionGroup = nameMap.get(region.name)
+                    || nameMap.set(region.name, new graphic.Group());
 
                 var compoundPath = new graphic.CompoundPath({
                     shape: {

package/src/component/helper/RoamController.js

@@ -27,6 +27,11 @@ define(function (require) {
          */
         this._zr = zr;
 
+        /**
+         * @type {Object}
+         */
+        this._opt = {};
+
         // Avoid two roamController bind the same handler
         var bind = zrUtil.bind;
         var mousedownHandler = bind(mousedown, this);
@@ -54,11 +59,22 @@ define(function (require) {
          * @param  {boolean|string} [controlType=true] Specify the control type,
          *                          which can be null/undefined or true/false
          *                          or 'pan/move' or 'zoom'/'scale'
+         * @param {Object} [opt]
+         * @param {Object} [opt.zoomOnMouseWheel=true]
+         * @param {Object} [opt.moveOnMouseMove=true]
+         * @param {Object} [opt.preventDefaultMouseMove=true] When pan.
          */
-        this.enable = function (controlType) {
+        this.enable = function (controlType, opt) {
+
             // Disable previous first
             this.disable();
 
+            this._opt = zrUtil.defaults(zrUtil.clone(opt) || {}, {
+                zoomOnMouseWheel: true,
+                moveOnMouseMove: true,
+                preventDefaultMouseMove: true
+            });
+
             if (controlType == null) {
                 controlType = true;
             }
@@ -114,33 +130,33 @@ define(function (require) {
     }
 
     function mousemove(e) {
-        if (!this._dragging) {
+        if (!checkKeyBinding(this, 'moveOnMouseMove', e) || !this._dragging) {
             return;
         }
 
-        eventTool.stop(e.event);
+        if (e.gestureEvent === 'pinch') {
+            return;
+        }
 
-        if (e.gestureEvent !== 'pinch') {
+        if (interactionMutex.isTaken(this._zr, 'globalPan')) {
+            return;
+        }
 
-            if (interactionMutex.isTaken(this._zr, 'globalPan')) {
-                return;
-            }
+        var x = e.offsetX;
+        var y = e.offsetY;
 
-            var x = e.offsetX;
-            var y = e.offsetY;
+        var oldX = this._x;
+        var oldY = this._y;
 
-            var oldX = this._x;
-            var oldY = this._y;
+        var dx = x - oldX;
+        var dy = y - oldY;
 
-            var dx = x - oldX;
-            var dy = y - oldY;
+        this._x = x;
+        this._y = y;
 
-            this._x = x;
-            this._y = y;
+        this._opt.preventDefaultMouseMove && eventTool.stop(e.event);
 
-            eventTool.stop(e.event);
-            this.trigger('pan', dx, dy, oldX, oldY, x, y);
-        }
+        this.trigger('pan', dx, dy, oldX, oldY, x, y);
     }
 
     function mouseup(e) {
@@ -149,9 +165,10 @@ define(function (require) {
 
     function mousewheel(e) {
         // wheelDelta maybe -0 in chrome mac.
-        if (e.wheelDelta === 0) {
+        if (!checkKeyBinding(this, 'zoomOnMouseWheel', e) || e.wheelDelta === 0) {
             return;
         }
+
         // Convenience:
         // Mac and VM Windows on Mac: scroll up: zoom out.
         // Windows: scroll up: zoom in.
@@ -170,7 +187,7 @@ define(function (require) {
     function zoom(e, zoomDelta, zoomX, zoomY) {
         if (this.pointerChecker && this.pointerChecker(e, zoomX, zoomY)) {
             // When mouse is out of roamController rect,
-            // default befavoius should be be disabled, otherwise
+            // default befavoius should not be be disabled, otherwise
             // page sliding is disabled, contrary to expectation.
             eventTool.stop(e.event);
 
@@ -178,5 +195,11 @@ define(function (require) {
         }
     }
 
+    function checkKeyBinding(roamController, prop, e) {
+        var setting = roamController._opt[prop];
+        return setting
+            && (!zrUtil.isString(setting) || e.event[setting + 'Key']);
+    }
+
     return RoamController;
 });

package/src/component/helper/brushHelper.js

@@ -1,26 +1,15 @@
 define(function (require) {
 
-    var zrUtil = require('zrender/core/util');
     var cursorHelper = require('./cursorHelper');
     var BoundingRect = require('zrender/core/BoundingRect');
-
-    var mathMax = Math.max;
-    var mathMin = Math.min;
+    var graphicUtil = require('../../util/graphic');
 
     var helper = {};
 
     helper.makeRectPanelClipPath = function (rect) {
         rect = normalizeRect(rect);
         return function (localPoints, transform) {
-            return zrUtil.map(localPoints, function (localPoint) {
-                var x = localPoint[0];
-                x = mathMax(x, rect.x);
-                x = mathMin(x, rect.x + rect.width);
-                var y = localPoint[1];
-                y = mathMax(y, rect.y);
-                y = mathMin(y, rect.y + rect.height);
-                return [x, y];
-            });
+            return graphicUtil.clipPointsByRect(localPoints, rect);
         };
     };
 

package/src/component/helper/selectableMixin.js

@@ -13,9 +13,9 @@ define(function (require) {
 
         updateSelectedMap: function (targetList) {
             this._selectTargetMap = zrUtil.reduce(targetList || [], function (targetMap, target) {
-                targetMap[target.name] = target;
+                targetMap.set(target.name, target);
                 return targetMap;
-            }, {});
+            }, zrUtil.createHashMap());
         },
         /**
          * @param {string} name
@@ -23,10 +23,10 @@ define(function (require) {
         // PENGING If selectedMode is null ?
         select: function (name) {
             var targetMap = this._selectTargetMap;
-            var target = targetMap[name];
+            var target = targetMap.get(name);
             var selectedMode = this.get('selectedMode');
             if (selectedMode === 'single') {
-                zrUtil.each(targetMap, function (target) {
+                targetMap.each(function (target) {
                     target.selected = false;
                 });
             }
@@ -37,7 +37,7 @@ define(function (require) {
          * @param {string} name
          */
         unSelect: function (name) {
-            var target = this._selectTargetMap[name];
+            var target = this._selectTargetMap.get(name);
             // var selectedMode = this.get('selectedMode');
             // selectedMode !== 'single' && target && (target.selected = false);
             target && (target.selected = false);
@@ -47,7 +47,7 @@ define(function (require) {
          * @param {string} name
          */
         toggleSelected: function (name) {
-            var target = this._selectTargetMap[name];
+            var target = this._selectTargetMap.get(name);
             if (target != null) {
                 this[target.selected ? 'unSelect' : 'select'](name);
                 return target.selected;
@@ -58,7 +58,7 @@ define(function (require) {
          * @param {string} name
          */
         isSelected: function (name) {
-            var target = this._selectTargetMap[name];
+            var target = this._selectTargetMap.get(name);
             return target && target.selected;
         }
     };

package/src/component/helper/sliderMove.js

@@ -2,53 +2,82 @@ define(function (require) {
 
     /**
      * 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.
+     *              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.
      */
-    return function (delta, handleEnds, extent, mode, handleIndex) {
-        if (!delta) {
-            return handleEnds;
+    return 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));
+    }
 });