echarts 3.5.4 → 3.6.0

package/src/component/axisPointer/axisTrigger.js

@@ -17,20 +17,26 @@ define(function(require) {
      * @param {string} [currTrigger] 'click' | 'mousemove' | 'leave'
      * @param {Array.<number>} [point] x and y, which are mandatory, specify a point to
      *              tigger axisPointer and tooltip.
-     * @param {Object} [finder] {xAxisId: ...[], yAxisName: ...[], angleAxisIndex: ...[]}
+     * @param {Object} [finder] {
+     *                  seriesIndex, dataIndex,
+     *                  axesInfo: [{
+     *                      axisDim: 'x'|'y'|'angle'|..., axisIndex: ..., value: ...
+     *                  }, ...]
+     *              }
      *              These properties, which are optional, restrict target axes.
      * @param {Function} dispatchAction
      * @param {module:echarts/ExtensionAPI} api
      * @param {Object} [tooltipOption]
-     * @param {string} [highDownKey]
      * @return {Object} content of event obj for echarts.connect.
      */
     function axisTrigger(
         coordSysAxesInfo, currTrigger, point, finder, dispatchAction,
-        ecModel, api, tooltipOption, highDownKey
+        ecModel, api, tooltipOption
     ) {
         finder = finder || {};
-        if (!point || point[0] == null || point[1] == null) {
+        if (illegalPoint(point)) {
+            // Used in the default behavior of `connection`: use the sample seriesIndex
+            // and dataIndex. And also used in the tooltipView trigger.
             point = findPointFromSeries({
                 seriesIndex: finder.seriesIndex,
                 // Do not use dataIndexInside from other ec instance.
@@ -38,6 +44,13 @@ define(function(require) {
                 dataIndex: finder.dataIndex
             }, ecModel).point;
         }
+        var isIllegalPoint = illegalPoint(point);
+
+        // Axis and value can be specified when calling dispatchAction({type: 'updateAxisPointer'}).
+        // Notice: In this case, it is difficult to get the `point` (which is necessary to show
+        // tooltip, so if point is not given, we just use the point found by sample seriesIndex
+        // and dataIndex.
+        var inputAxesInfo = finder.axesInfo;
 
         var axesInfo = coordSysAxesInfo.axesInfo;
         var shouldHide = currTrigger === 'leave' || illegalPoint(point);
@@ -45,21 +58,26 @@ define(function(require) {
 
         var showValueMap = {};
         var dataByCoordSys = {list: [], map: {}};
-        var highlightBatch = [];
         var updaters = {
             showPointer: curry(showPointer, showValueMap),
-            showTooltip: curry(showTooltip, dataByCoordSys),
-            highlight: curry(highlight, highlightBatch)
+            showTooltip: curry(showTooltip, dataByCoordSys)
         };
 
         // Process for triggered axes.
         each(coordSysAxesInfo.coordSysMap, function (coordSys, coordSysKey) {
-            var coordSysContainsPoint = coordSys.containPoint(point);
+            // If a point given, it must be contained by the coordinate system.
+            var coordSysContainsPoint = isIllegalPoint || coordSys.containPoint(point);
 
             each(coordSysAxesInfo.coordSysAxesInfo[coordSysKey], function (axisInfo, key) {
                 var axis = axisInfo.axis;
-                if (!shouldHide && coordSysContainsPoint && !notTargetAxis(finder, axis)) {
-                    processOnAxis(axisInfo, axis.pointToData(point), updaters, false, outputFinder);
+                var inputAxisInfo = findInputAxisInfo(inputAxesInfo, axisInfo);
+                // If no inputAxesInfo, no axis is restricted.
+                if (!shouldHide && coordSysContainsPoint && (!inputAxesInfo || inputAxisInfo)) {
+                    var val = inputAxisInfo && inputAxisInfo.value;
+                    if (val == null && !isIllegalPoint) {
+                        val = axis.pointToData(point);
+                    }
+                    val != null && processOnAxis(axisInfo, val, updaters, false, outputFinder);
                 }
             });
         });
@@ -88,9 +106,9 @@ define(function(require) {
             processOnAxis(axesInfo[tarKey], val, updaters, true, outputFinder);
         });
 
-        updateModelActually(showValueMap, axesInfo);
+        updateModelActually(showValueMap, axesInfo, outputFinder);
         dispatchTooltipActually(dataByCoordSys, point, tooltipOption, dispatchAction);
-        dispatchHighDownActually(highlightBatch, dispatchAction, api, highDownKey);
+        dispatchHighDownActually(axesInfo, dispatchAction, api);
 
         return outputFinder;
     }
@@ -126,8 +144,7 @@ define(function(require) {
             }
         }
 
-        updaters.highlight('highlight', payloadBatch);
-        updaters.showPointer(axisInfo, newValue, payloadBatch);
+        updaters.showPointer(axisInfo, newValue, payloadBatch, outputFinder);
         // Tooltip should always be snapToValue, otherwise there will be
         // incorrect "axis value ~ series value" mapping displayed in tooltip.
         updaters.showTooltip(axisInfo, payloadInfo, snapToValue);
@@ -243,11 +260,8 @@ define(function(require) {
         });
     }
 
-    function highlight(highlightBatch, actionType, batch) {
-        highlightBatch.push.apply(highlightBatch, batch);
-    }
-
-    function updateModelActually(showValueMap, axesInfo) {
+    function updateModelActually(showValueMap, axesInfo, outputFinder) {
+        var outputAxesInfo = outputFinder.axesInfo = [];
         // Basic logic: If no 'show' required, 'hide' this axisPointer.
         each(axesInfo, function (axisInfo, key) {
             var option = axisInfo.axisPointerModel.option;
@@ -256,7 +270,7 @@ define(function(require) {
             if (valItem) {
                 !axisInfo.useHandle && (option.status = 'show');
                 option.value = valItem.value;
-                // For label formatter param.
+                // For label formatter param and highlight.
                 option.seriesDataIndices = (valItem.payloadBatch || []).slice();
             }
             // When always show (e.g., handle used), remain
@@ -266,6 +280,13 @@ define(function(require) {
                 // click legend to toggle axis blank.
                 !axisInfo.useHandle && (option.status = 'hide');
             }
+
+            // If status is 'hide', should be no info in payload.
+            option.status === 'show' && outputAxesInfo.push({
+                axisDim: axisInfo.axis.dim,
+                axisIndex: axisInfo.axis.model.componentIndex,
+                value: option.value
+            });
         });
     }
 
@@ -295,28 +316,24 @@ define(function(require) {
         });
     }
 
-    function dispatchHighDownActually(highlightBatch, dispatchAction, api, highDownKey) {
-        // Basic logic: If nothing highlighted, should downplay all highlighted items.
-        // This case will occur when mouse leave coordSys.
-
+    function dispatchHighDownActually(axesInfo, dispatchAction, api) {
         // FIXME
-        // (1) highlight status shoule be managemented in series.getData()?
-        // (2) If axisPointer A triggerOn 'handle' and axisPointer B triggerOn
-        // 'mousemove', items highlighted by A will be downplayed by B.
-        // It will not be fixed until someone requires this scenario.
-
-        // Consider items area hightlighted by 'handle', and globalListener may
-        // downplay all items (including just highlighted ones) when mousemove.
-        // So we use a highDownKey to separate them as a temporary solution.
+        // highlight status modification shoule be a stage of main process?
+        // (Consider confilct (e.g., legend and axisPointer) and setOption)
+
         var zr = api.getZr();
-        highDownKey = 'lastHighlights' + (highDownKey || '');
+        var highDownKey = 'axisPointerLastHighlights';
         var lastHighlights = get(zr)[highDownKey] || {};
         var newHighlights = get(zr)[highDownKey] = {};
 
+        // Update highlight/downplay status according to axisPointer model.
         // Build hash map and remove duplicate incidentally.
-        zrUtil.each(highlightBatch, function (batchItem) {
-            var key = batchItem.seriesIndex + ' | ' + batchItem.dataIndex;
-            newHighlights[key] = batchItem;
+        each(axesInfo, function (axisInfo, key) {
+            var option = axisInfo.axisPointerModel.option;
+            option.status === 'show' && each(option.seriesDataIndices, function (batchItem) {
+                var key = batchItem.seriesIndex + ' | ' + batchItem.dataIndex;
+                newHighlights[key] = batchItem;
+            });
         });
 
         // Diff.
@@ -337,21 +354,15 @@ define(function(require) {
         });
     }
 
-    function notTargetAxis(finder, axis) {
-        var isTarget = 1;
-        // If none of xxxAxisId and xxxAxisName and xxxAxisIndex exists in finder,
-        // no axis is not target axis.
-        each(finder, function (value, propName) {
-            isTarget &= !(/^.+(AxisId|AxisName|AxisIndex)$/.test(propName));
-        });
-        !isTarget && each(
-            [['AxisId', 'id'], ['AxisIndex', 'componentIndex'], ['AxisName', 'name']],
-            function (prop) {
-                var vals = modelUtil.normalizeToArray(finder[axis.dim + prop[0]]);
-                isTarget |= zrUtil.indexOf(vals, axis.model[prop[1]]) >= 0;
+    function findInputAxisInfo(inputAxesInfo, axisInfo) {
+        for (var i = 0; i < (inputAxesInfo || []).length; i++) {
+            var inputAxisInfo = inputAxesInfo[i];
+            if (axisInfo.axis.dim === inputAxisInfo.axisDim
+                && axisInfo.axis.model.componentIndex === inputAxisInfo.axisIndex
+            ) {
+                return inputAxisInfo;
             }
-        );
-        return !isTarget;
+        }
     }
 
     function makeMapperParam(axisInfo) {
@@ -365,7 +376,7 @@ define(function(require) {
     }
 
     function illegalPoint(point) {
-        return point[0] == null || isNaN(point[0]) || point[1] == null || isNaN(point[1]);
+        return !point || point[0] == null || isNaN(point[0]) || point[1] == null || isNaN(point[1]);
     }
 
     return axisTrigger;

package/src/component/axisPointer.js

@@ -52,8 +52,7 @@ define(function (require) {
             payload.dispatchAction || zrUtil.bind(api.dispatchAction, api),
             ecModel,
             api,
-            payload.tooltipOption,
-            payload.highDownKey
+            payload.tooltipOption
         );
 
         return outputFinder;

package/src/component/calendar/CalendarView.js

@@ -64,7 +64,7 @@ define(function (require) {
             var coordSys = calendarModel.coordinateSystem;
 
             // range info
-            var rangeData = coordSys.getHandledRangeInfo();
+            var rangeData = coordSys.getRangeInfo();
             var orient = coordSys.getOrient();
 
             this._renderDayRect(calendarModel, rangeData, group);
@@ -91,7 +91,7 @@ define(function (require) {
                 i = coordSys.getNextNDay(i, 1).time
             ) {
 
-                var point = coordSys.dataToRect([i], true).tl;
+                var point = coordSys.dataToRect([i], false).tl;
 
                 // every rect
                 var rect = new graphic.Rect({
@@ -146,7 +146,7 @@ define(function (require) {
             function addPoints(date) {
 
                 self._firstDayOfMonth.push(coordSys.getDateInfo(date));
-                self._firstDayPoints.push(coordSys.dataToRect([date], true).tl);
+                self._firstDayPoints.push(coordSys.dataToRect([date], false).tl);
 
                 var points = self._getLinePointsOfOneWeek(calendarModel, date, orient);
 
@@ -202,7 +202,7 @@ define(function (require) {
             for (var i = 0; i < 7; i++) {
 
                 var tmpD = coordSys.getNextNDay(date.time, i);
-                var point = coordSys.dataToRect([tmpD.time], true);
+                var point = coordSys.dataToRect([tmpD.time], false);
 
                 points[2 * tmpD.day] = point.tl;
                 points[2 * tmpD.day + 1] = point[orient === 'horizontal' ? 'bl' : 'tr'];
@@ -480,7 +480,7 @@ define(function (require) {
             for (var i = 0; i < 7; i++) {
 
                 var tmpD = coordSys.getNextNDay(start, i);
-                var point = coordSys.dataToRect([tmpD.time], true).center;
+                var point = coordSys.dataToRect([tmpD.time], false).center;
                 var day = i;
                 day = Math.abs((i + firstDayOfWeek) % 7);
                 var weekText = new graphic.Text({

package/src/component/dataZoom/AxisProxy.js

@@ -49,6 +49,13 @@ define(function(require) {
          */
         this._dataExtent;
 
+        /**
+         * {minSpan, maxSpan, minValueSpan, maxValueSpan}
+         * @private
+         * @type {Object}
+         */
+        this._minMaxSpan;
+
         /**
          * @readOnly
          * @type {module: echarts/model/Global}
@@ -147,6 +154,10 @@ define(function(require) {
             return foundOtherAxisModel;
         },
 
+        getMinMaxSpan: function () {
+            return zrUtil.clone(this._minMaxSpan);
+        },
+
         /**
          * Only calculate by given range and this._dataExtent, do not change anything.
          *
@@ -241,6 +252,8 @@ define(function(require) {
             this._valueWindow = dataWindow.valueWindow;
             this._percentWindow = dataWindow.percentWindow;
 
+            setMinMaxSpan(this);
+
             // Update axis setting then.
             setAxisModel(this);
         },
@@ -270,6 +283,10 @@ define(function(require) {
             var filterMode = dataZoomModel.get('filterMode');
             var valueWindow = this._valueWindow;
 
+            if (filterMode === 'none') {
+                return;
+            }
+
             // FIXME
             // Toolbox may has dataZoom injected. And if there are stacked bar chart
             // with NaN data, NaN will be filtered and stack will be wrong.
@@ -289,19 +306,43 @@ define(function(require) {
             // Process series data
             each(seriesModels, function (seriesModel) {
                 var seriesData = seriesModel.getData();
-
-                seriesData && each(seriesModel.coordDimToDataDim(axisDim), function (dim) {
-                    if (filterMode === 'empty') {
-                        seriesModel.setData(
-                            seriesData.map(dim, function (value) {
-                                return !isInWindow(value) ? NaN : value;
-                            })
-                        );
-                    }
-                    else {
-                        seriesData.filterSelf(dim, isInWindow);
-                    }
-                });
+                var dataDims = seriesModel.coordDimToDataDim(axisDim);
+
+                if (filterMode === 'weakFilter') {
+                    seriesData && seriesData.filterSelf(function (dataIndex) {
+                        var leftOut;
+                        var rightOut;
+                        var hasValue;
+                        for (var i = 0; i < dataDims.length; i++) {
+                            var value = seriesData.get(dataDims[i], dataIndex);
+                            var thisHasValue = !isNaN(value);
+                            var thisLeftOut = value < valueWindow[0];
+                            var thisRightOut = value > valueWindow[1];
+                            if (thisHasValue && !thisLeftOut && !thisRightOut) {
+                                return true;
+                            }
+                            thisHasValue && (hasValue = true);
+                            thisLeftOut && (leftOut = true);
+                            thisRightOut && (rightOut = true);
+                        }
+                        // If both left out and right out, do not filter.
+                        return hasValue && leftOut && rightOut;
+                    });
+                }
+                else {
+                    seriesData && each(dataDims, function (dim) {
+                        if (filterMode === 'empty') {
+                            seriesModel.setData(
+                                seriesData.map(dim, function (value) {
+                                    return !isInWindow(value) ? NaN : value;
+                                })
+                            );
+                        }
+                        else {
+                            seriesData.filterSelf(dim, isInWindow);
+                        }
+                    });
+                }
             });
 
             function isInWindow(value) {
@@ -400,6 +441,28 @@ define(function(require) {
         );
     }
 
+    function setMinMaxSpan(axisProxy) {
+        var minMaxSpan = axisProxy._minMaxSpan = {};
+        var dataZoomModel = axisProxy._dataZoomModel;
+
+        each(['min', 'max'], function (minMax) {
+            minMaxSpan[minMax + 'Span'] = dataZoomModel.get(minMax + 'Span');
+
+            // minValueSpan and maxValueSpan has higher priority than minSpan and maxSpan
+            var valueSpan = dataZoomModel.get(minMax + 'ValueSpan');
+            if (valueSpan != null) {
+                minMaxSpan[minMax + 'ValueSpan'] = valueSpan;
+
+                valueSpan = axisProxy.getAxisModel().axis.scale.parse(valueSpan);
+                if (valueSpan != null) {
+                    minMaxSpan[minMax + 'Span'] = numberUtil.linearMap(
+                        valueSpan, axisProxy._dataExtent, [0, 100], true
+                    );
+                }
+            }
+        });
+    }
+
     return AxisProxy;
 
 });

package/src/component/dataZoom/DataZoomModel.js

@@ -30,12 +30,18 @@ define(function(require) {
             xAxisIndex: null,       // Default the first horizontal category axis.
             yAxisIndex: null,       // Default the first vertical category axis.
 
-            filterMode: 'filter',   // Possible values: 'filter' or 'empty'.
-                                    // 'filter': data items which are out of window will be removed.
-                                    //           This option is applicable when filtering outliers.
+            filterMode: 'filter',   // Possible values: 'filter' or 'empty' or 'weakFilter'.
+                                    // 'filter': data items which are out of window will be removed. This option is
+                                    //          applicable when filtering outliers. For each data item, it will be
+                                    //          filtered if one of the relevant dimensions is out of the window.
+                                    // 'weakFilter': data items which are out of window will be removed. This option
+                                    //          is applicable when filtering outliers. For each data item, it will be
+                                    //          filtered only if all  of the relevant dimensions are out of the same
+                                    //          side of the window.
                                     // 'empty': data items which are out of window will be set to empty.
                                     //          This option is applicable when user should not neglect
                                     //          that there are some data items out of window.
+                                    // 'none': Do not filter.
                                     // Taking line chart as an example, line will be broken in
                                     // the filtered points when filterModel is set to 'empty', but
                                     // be connected when set to 'filter'.
@@ -47,7 +53,11 @@ define(function(require) {
             start: 0,               // Start percent. 0 ~ 100
             end: 100,               // End percent. 0 ~ 100
             startValue: null,       // Start value. If startValue specified, start is ignored.
-            endValue: null          // End value. If endValue specified, end is ignored.
+            endValue: null,         // End value. If endValue specified, end is ignored.
+            minSpan: null,          // 0 ~ 100
+            maxSpan: null,          // 0 ~ 100
+            minValueSpan: null,     // The range of dataZoom can not be smaller than that.
+            maxValueSpan: null      // The range of dataZoom can not be larger than that.
         },
 
         /**
@@ -469,9 +479,15 @@ define(function(require) {
 
         /**
          * @public
+         * @param {module:echarts/model/Model} [axisModel] If axisModel given, find axisProxy
+         *      corresponding to the axisModel
          * @return {module:echarts/component/dataZoom/AxisProxy}
          */
-        findRepresentativeAxisProxy: function () {
+        findRepresentativeAxisProxy: function (axisModel) {
+            if (axisModel) {
+                return axisModel.__dzAxisProxy;
+            }
+
             // Find the first hosted axisProxy
             var axisProxies = this._axisProxies;
             for (var key in axisProxies) {

package/src/component/dataZoom/InsideZoomModel.js

@@ -12,7 +12,10 @@ define(function(require) {
          */
         defaultOption: {
             disabled: false,   // Whether disable this inside zoom.
-            zoomLock: false  // Whether disable zoom but only pan.
+            zoomLock: false,   // Whether disable zoom but only pan.
+            zoomOnMouseWheel: true, // Can be: true / false / 'shift' / 'ctrl' / 'alt'.
+            moveOnMouseMove: true,   // Can be: true / false / 'shift' / 'ctrl' / 'alt'.
+            preventDefaultMouseMove: true
         }
     });
 });

package/src/component/dataZoom/InsideZoomView.js

@@ -45,6 +45,7 @@ define(function (require) {
 
                 zrUtil.each(coordInfoList, function (coordInfo) {
                     var coordModel = coordInfo.model;
+                    var dataZoomOption = dataZoomModel.option;
 
                     roams.register(
                         api,
@@ -57,7 +58,14 @@ define(function (require) {
                             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;
 });