echarts 3.5.1 → 3.6.0

package/src/component/dataZoom/InsideZoomView.js

@@ -45,19 +45,27 @@ define(function (require) {
 
                 zrUtil.each(coordInfoList, function (coordInfo) {
                     var coordModel = coordInfo.model;
+                    var dataZoomOption = dataZoomModel.option;
 
                     roams.register(
                         api,
                         {
                             coordId: roams.generateCoordId(coordModel),
                             allCoordIds: allCoordIds,
-                            containsPoint: function (x, y) {
+                            containsPoint: function (e, x, y) {
                                 return coordModel.coordinateSystem.containPoint([x, y]);
                             },
                             dataZoomId: dataZoomModel.id,
                             throttleRate: dataZoomModel.get('throttle', true),
                             panGetRange: bind(this._onPan, this, coordInfo, coordSysName),
-                            zoomGetRange: bind(this._onZoom, this, coordInfo, coordSysName)
+                            zoomGetRange: bind(this._onZoom, this, coordInfo, coordSysName),
+                            zoomLock: dataZoomOption.zoomLock,
+                            disabled: dataZoomOption.disabled,
+                            roamControllerOpt: {
+                                zoomOnMouseWheel: dataZoomOption.zoomOnMouseWheel,
+                                moveOnMouseMove: dataZoomOption.moveOnMouseMove,
+                                preventDefaultMouseMove: dataZoomOption.preventDefaultMouseMove
+                            }
                         }
                     );
                 }, this);
@@ -78,10 +86,6 @@ define(function (require) {
          * @private
          */
         _onPan: function (coordInfo, coordSysName, controller, dx, dy, oldX, oldY, newX, newY) {
-            if (this.dataZoomModel.option.disabled) {
-                return this._range;
-            }
-
             var range = this._range.slice();
 
             // Calculate transform by the first axis.
@@ -98,7 +102,7 @@ define(function (require) {
                 * (range[1] - range[0])
                 * directionInfo.pixel / directionInfo.pixelLength;
 
-            sliderMove(percentDelta, range, [0, 100], 'rigid');
+            sliderMove(percentDelta, range, [0, 100], 'all');
 
             return (this._range = range);
         },
@@ -107,12 +111,6 @@ define(function (require) {
          * @private
          */
         _onZoom: function (coordInfo, coordSysName, controller, scale, mouseX, mouseY) {
-            var option = this.dataZoomModel.option;
-
-            if (option.disabled || option.zoomLock) {
-                return this._range;
-            }
-
             var range = this._range.slice();
 
             // Calculate transform by the first axis.
@@ -131,7 +129,12 @@ define(function (require) {
             scale = Math.max(1 / scale, 0);
             range[0] = (range[0] - percentPoint) * scale + percentPoint;
             range[1] = (range[1] - percentPoint) * scale + percentPoint;
-            return (this._range = fixRange(range));
+
+            // Restrict range.
+            var minMaxSpan = this.dataZoomModel.findRepresentativeAxisProxy().getMinMaxSpan();
+            sliderMove(0, range, [0, 100], 0, minMaxSpan.minSpan, minMaxSpan.maxSpan);
+
+            return (this._range = range);
         }
 
     });
@@ -214,18 +217,5 @@ define(function (require) {
         }
     };
 
-    function fixRange(range) {
-        // Clamp, using !(<= or >=) to handle NaN.
-        // jshint ignore:start
-        var bound = [0, 100];
-        !(range[0] <= bound[1]) && (range[0] = bound[1]);
-        !(range[1] <= bound[1]) && (range[1] = bound[1]);
-        !(range[0] >= bound[0]) && (range[0] = bound[0]);
-        !(range[1] >= bound[0]) && (range[1] = bound[0]);
-        // jshint ignore:end
-
-        return range;
-    }
-
     return InsideZoomView;
 });

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,12 +59,16 @@ 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.setContainsPoint(dataZoomInfo.containsPoint);
+            record.controller.setPointerChecker(dataZoomInfo.containsPoint);
 
             // Update throttle.
             throttle.createOrUpdate(
@@ -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);
         }
     }