echarts 3.5.1 → 3.6.0

package/src/component/marker/MarkLineView.js

@@ -200,7 +200,7 @@ define(function (require) {
                         ]);
                     });
 
-                    this.markerGroupMap[seriesModel.name].updateLayout();
+                    this.markerGroupMap.get(seriesModel.name).updateLayout();
 
                 }
             }, this);
@@ -212,10 +212,8 @@ define(function (require) {
             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/src/component/marker/MarkPointView.js

@@ -53,7 +53,7 @@ define(function (require) {
                 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 @@ define(function (require) {
             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/src/component/marker/MarkerView.js

@@ -1,5 +1,7 @@
 define(function (require) {
 
+    var zrUtil = require('zrender/core/util');
+
     return require('../../echarts').extendComponentView({
 
         type: 'marker',
@@ -8,18 +10,16 @@ define(function (require) {
             /**
              * 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 @@ define(function (require) {
                 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/src/component/marker/markerHelper.js

@@ -33,7 +33,7 @@ define(function (require) {
         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/src/component/parallel.js

@@ -6,6 +6,7 @@ define(function(require) {
 
     var echarts = require('../echarts');
     var zrUtil = require('zrender/core/util');
+    var throttle = require('../util/throttle');
 
     var CLICK_THRESHOLD = 5; // > 4
 
@@ -14,43 +15,107 @@ define(function(require) {
         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/src/component/polar.js

@@ -1,6 +1,8 @@
 define(function(require) {
     'use strict';
 
+    var zrUtil = require('zrender/core/util');
+
     require('../coord/polar/polarCreator');
     require('./angleAxis');
     require('./radiusAxis');
@@ -8,6 +10,9 @@ define(function(require) {
 
     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/src/component/timeline/SliderTimelineView.js

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

package/src/component/toolbox/feature/Brush.js

@@ -92,8 +92,15 @@ define(function(require) {
         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/src/component/toolbox/feature/DataZoom.js

@@ -5,6 +5,7 @@ define(function(require) {
     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 @@ define(function(require) {
         this.ecModel = ecModel;
         this.api = api;
 
-        updateZoomBtnStatus(featureModel, ecModel, this, payload);
+        updateZoomBtnStatus(featureModel, ecModel, this, payload, api);
         updateBackBtnStatus(featureModel, ecModel);
     };
 
@@ -122,7 +123,19 @@ define(function(require) {
         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 @@ define(function(require) {
         );
     }
 
-    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 @@ define(function(require) {
         );
 
         view._brushController
-            .setPanels(brushTargetManager.makePanelOpts(function (targetInfo) {
+            .setPanels(brushTargetManager.makePanelOpts(api, function (targetInfo) {
                 return (targetInfo.xAxisDeclared && !targetInfo.yAxisDeclared)
                     ? 'lineX'
                     : (!targetInfo.xAxisDeclared && targetInfo.yAxisDeclared)

package/src/component/tooltip/TooltipView.js

@@ -4,6 +4,7 @@ define(function (require) {
     var zrUtil = require('zrender/core/util');
     var formatUtil = require('../../util/format');
     var numberUtil = require('../../util/number');
+    var graphic = require('../../util/graphic');
     var findPointFromSeries = require('../axisPointer/findPointFromSeries');
     var layoutUtil = require('../../util/layout');
     var env = require('zrender/core/env');
@@ -17,6 +18,10 @@ define(function (require) {
     var parsePercent = numberUtil.parsePercent;
 
 
+    var proxyRect = new graphic.Rect({
+        shape: {x: -1, y: -1, width: 2, height: 2}
+    });
+
     require('../../echarts').extendComponentView({
 
         type: 'tooltip',
@@ -56,10 +61,11 @@ define(function (require) {
             this._api = api;
 
             /**
+             * Should be cleaned when render.
              * @private
              * @type {Array.<Array.<Object>>}
              */
-            this._lastDataByCoordSys;
+            this._lastDataByCoordSys = null;
 
             /**
              * @private
@@ -150,11 +156,22 @@ define(function (require) {
             // Reset ticket
             this._ticket = '';
 
-            var seriesIndex = payload.seriesIndex;
+            // When triggered from axisPointer.
             var dataByCoordSys = payload.dataByCoordSys;
 
-            // When triggered from axisPointer.
-            if (dataByCoordSys) {
+            if (payload.tooltip && payload.x != null && payload.y != null) {
+                var el = proxyRect;
+                el.position = [payload.x, payload.y];
+                el.update();
+                el.tooltip = payload.tooltip;
+                // Manually show tooltip while view is not using zrender elements.
+                this._tryShow({
+                    offsetX: payload.x,
+                    offsetY: payload.y,
+                    target: el
+                }, dispatchAction);
+            }
+            else if (dataByCoordSys) {
                 this._tryShow({
                     offsetX: payload.x,
                     offsetY: payload.y,
@@ -164,7 +181,12 @@ define(function (require) {
                     tooltipOption: payload.tooltipOption
                 }, dispatchAction);
             }
-            else if (seriesIndex != null) {
+            else if (payload.seriesIndex != null) {
+
+                if (this._manuallyAxisShowTip(tooltipModel, ecModel, api, payload)) {
+                    return;
+                }
+
                 var pointInfo = findPointFromSeries(payload, ecModel);
                 var cx = pointInfo.point[0];
                 var cy = pointInfo.point[1];
@@ -179,11 +201,19 @@ define(function (require) {
                 }
             }
             else if (payload.x != null && payload.y != null) {
+                // FIXME
+                // should wrap dispatchAction like `axisPointer/globalListener` ?
+                api.dispatchAction({
+                    type: 'updateAxisPointer',
+                    x: payload.x,
+                    y: payload.y
+                });
+
                 this._tryShow({
                     offsetX: payload.x,
                     offsetY: payload.y,
                     position: payload.position,
-                    target: api.getZr().handler.findHover(payload.x, payload.y),
+                    target: api.getZr().findHover(payload.x, payload.y).target,
                     event: {}
                 }, dispatchAction);
             }
@@ -203,6 +233,44 @@ define(function (require) {
             }
         },
 
+        // Be compatible with previous design, that is, when tooltip.type is 'axis' and
+        // dispatchAction 'showTip' with seriesIndex and dataIndex will trigger axis pointer
+        // and tooltip.
+        _manuallyAxisShowTip: function (tooltipModel, ecModel, api, payload) {
+            var seriesIndex = payload.seriesIndex;
+            var dataIndex = payload.dataIndex;
+            var coordSysAxesInfo = ecModel.getComponent('axisPointer').coordSysAxesInfo;
+
+            if (seriesIndex == null || dataIndex == null || coordSysAxesInfo == null) {
+                return;
+            }
+
+            var seriesModel = ecModel.getSeriesByIndex(seriesIndex);
+            if (!seriesModel) {
+                return;
+            }
+
+            var data = seriesModel.getData();
+            var tooltipModel = buildTooltipModel([
+                data.getItemModel(dataIndex),
+                seriesModel,
+                (seriesModel.coordinateSystem || {}).model,
+                tooltipModel
+            ]);
+
+            if (tooltipModel.get('trigger') !== 'axis') {
+                return;
+            }
+
+            api.dispatchAction({
+                type: 'updateAxisPointer',
+                seriesIndex: seriesIndex,
+                dataIndex: dataIndex
+            });
+
+            return true;
+        },
+
         _tryShow: function (e, dispatchAction) {
             var el = e.target;
             var tooltipModel = this._tooltipModel;
@@ -518,7 +586,7 @@ define(function (require) {
             }
             else {
                 var pos = refixTooltipPosition(
-                    x, y, content.el, viewWidth, viewHeight, align ? 0 : 20, vAlign ? 0 : 20
+                    x, y, content.el, viewWidth, viewHeight, align ? null : 20, vAlign ? null : 20
                 );
                 x = pos[0];
                 y = pos[1];
@@ -545,13 +613,13 @@ define(function (require) {
             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 || [];
@@ -562,7 +630,7 @@ define(function (require) {
                         && 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
@@ -633,17 +701,21 @@ define(function (require) {
         var width = el.clientWidth;
         var height = el.clientHeight;
 
-        if (x + width + gapH > viewWidth) {
-            x -= width + gapH;
-        }
-        else {
-            x += gapH;
-        }
-        if (y + height + gapV > viewHeight) {
-            y -= height + gapV;
+        if (gapH != null) {
+            if (x + width + gapH > viewWidth) {
+                x -= width + gapH;
+            }
+            else {
+                x += gapH;
+            }
         }
-        else {
-            y += gapV;
+        if (gapV != null) {
+            if (y + height + gapV > viewHeight) {
+                y -= height + gapV;
+            }
+            else {
+                y += gapV;
+            }
         }
         return [x, y];
     }

package/src/component/visualMap/ContinuousView.js

@@ -355,16 +355,18 @@ define(function(require) {
             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/src/coord/Axis.js

@@ -3,6 +3,7 @@ define(function (require) {
     var numberUtil = require('../util/number');
     var linearMap = numberUtil.linearMap;
     var zrUtil = require('zrender/core/util');
+    var axisHelper = require('./axisHelper');
 
     function fixExtentWithBands(extent, nTick) {
         var size = extent[1] - extent[0];
@@ -47,6 +48,12 @@ define(function (require) {
          * @type {boolean}
          */
         this.onBand = false;
+
+        /**
+         * @private
+         * @type {number}
+         */
+        this._labelInterval;
     };
 
     Axis.prototype = {
@@ -79,8 +86,7 @@ define(function (require) {
          * @return {Array.<number>}
          */
         getExtent: function () {
-            var ret = this._extent.slice();
-            return ret;
+            return this._extent.slice();
         },
 
         /**
@@ -224,6 +230,32 @@ define(function (require) {
             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/src/coord/axisDefault.js

@@ -65,6 +65,8 @@ define(function (require) {
             // 控制文本标签是否在grid里
             inside: false,
             rotate: 0,
+            showMinLabel: null, // true | false | null (auto)
+            showMaxLabel: null, // true | false | null (auto)
             margin: 8,
             // formatter: null,
             // 其余属性默认使用全局文本样式，详见TEXTSTYLE
@@ -140,10 +142,11 @@ define(function (require) {
         min: 'dataMin',
         max: 'dataMax'
     }, valueAxis);
+
     var logAxis = zrUtil.defaults({
+        scale: true,
         logBase: 10
     }, valueAxis);
-    logAxis.scale = true;
 
     return {
         categoryAxis: categoryAxis,