echarts 3.5.1 → 3.6.0

package/lib/component/tooltip/TooltipView.js

@@ -4,6 +4,7 @@
     var zrUtil = require('zrender/lib/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/lib/core/env');
@@ -17,6 +18,10 @@
     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 @@
             this._api = api;
 
             /**
+             * Should be cleaned when render.
              * @private
              * @type {Array.<Array.<Object>>}
              */
-            this._lastDataByCoordSys;
+            this._lastDataByCoordSys = null;
 
             /**
              * @private
@@ -150,11 +156,22 @@
             // 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 @@
                     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 @@
                 }
             }
             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 @@
             }
         },
 
+        // 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 @@
             }
             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 @@
             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 @@
                         && 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 @@
         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/lib/component/visualMap/ContinuousView.js

@@ -355,16 +355,18 @@
             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/lib/coord/Axis.js

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

@@ -65,6 +65,8 @@
             // 控制文本标签是否在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 @@
         min: 'dataMin',
         max: 'dataMax'
     }, valueAxis);
+
     var logAxis = zrUtil.defaults({
+        scale: true,
         logBase: 10
     }, valueAxis);
-    logAxis.scale = true;
 
     module.exports = {
         categoryAxis: categoryAxis,

package/lib/coord/axisHelper.js

@@ -35,11 +35,36 @@
             if (!zrUtil.isArray(boundaryGap)) {
                 boundaryGap = [boundaryGap || 0, boundaryGap || 0];
             }
+            if (typeof boundaryGap[0] === 'boolean') {
+                if (__DEV__) {
+                    console.warn('Boolean type for boundaryGap is only '
+                        + 'allowed for ordinal axis. Please use string in '
+                        + 'percentage instead, e.g., "20%". Currently, '
+                        + 'boundaryGap is set to be 0.');
+                }
+                boundaryGap = [0, 0];
+            }
             boundaryGap[0] = numberUtil.parsePercent(boundaryGap[0], 1);
             boundaryGap[1] = numberUtil.parsePercent(boundaryGap[1], 1);
-            span = originalExtent[1] - originalExtent[0];
+            span = (originalExtent[1] - originalExtent[0])
+                || Math.abs(originalExtent[0]);
         }
 
+        // Notice: When min/max is not set (that is, when there are null/undefined,
+        // which is the most common case), these cases should be ensured:
+        // (1) For 'ordinal', show all axis.data.
+        // (2) For others:
+        //      + `boundaryGap` is applied (if min/max set, boundaryGap is
+        //      disabled).
+        //      + If `needCrossZero`, min/max should be zero, otherwise, min/max should
+        //      be the result that originalExtent enlarged by boundaryGap.
+        // (3) If no data, it should be ensured that `scale.setBlank` is set.
+
+        // FIXME
+        // (1) When min/max is 'dataMin' or 'dataMax', should boundaryGap be able to used?
+        // (2) When `needCrossZero` and all data is positive/negative, should it be ensured
+        // that the results processed by boundaryGap are positive/negative?
+
         if (min == null) {
             min = scaleType === 'ordinal'
                 ? (axisDataLen ? 0 : NaN)
@@ -89,31 +114,12 @@
         }
 
         scale.setExtent(extent[0], extent[1]);
-        scale.niceExtent(splitNumber, fixMin, fixMax);
-
-        // Use minInterval to constraint the calculated interval.
-        // If calculated interval is less than minInterval. increase the interval quantity until
-        // it is larger than minInterval.
-        // For example:
-        //  minInterval is 1, calculated interval is 0.2, so increase it to be 1. In this way we can get
-        //  an integer axis.
-        var minInterval = model.get('minInterval');
-        if (isFinite(minInterval) && !fixMin && !fixMax && scale.type === 'interval') {
-            var interval = scale.getInterval();
-            var intervalScale = Math.max(Math.abs(interval), minInterval) / interval;
-            // while (interval < minInterval) {
-            //     var quantity = numberUtil.quantity(interval);
-            //     interval = quantity * 10;
-            //     scaleQuantity *= 10;
-            // }
-            extent = scale.getExtent();
-            var origin = (extent[1] + extent[0]) / 2;
-            scale.setExtent(
-                intervalScale * (extent[0] - origin) + origin,
-                intervalScale * (extent[1] - origin) + origin
-            );
-            scale.niceExtent(splitNumber);
-        }
+        scale.niceExtent({
+            splitNumber: splitNumber,
+            fixMin: fixMin,
+            fixMax: fixMax,
+            minInterval: scale.type === 'interval' ? model.get('minInterval') : null
+        });
 
         // If some one specified the min, max. And the default calculated interval
         // is not good enough. He can specify the interval. It is often appeared

package/lib/coord/axisModelCommonMixin.js

@@ -8,7 +8,7 @@
             return obj.value;
         }
         else {
-            return obj;
+            return obj + '';
         }
     }
 

package/lib/coord/calendar/Calendar.js

@@ -34,7 +34,7 @@
             return [{name: 'time', type: 'time'}];
         },
 
-        getHandledRangeInfo: function () {
+        getRangeInfo: function () {
             return this._rangeInfo;
         },
 
@@ -160,18 +160,20 @@
          * Convert a time data(time, value) item to (x, y) point.
          *
          * @override
-         * @param  {Array} data  data
-         * @param  {boolean} noClip  out of range
-         * @return {Array}       point
+         * @param  {Array|number} data data
+         * @param  {boolean} [clamp=true] out of range
+         * @return {Array} point
          */
-        dataToPoint: function (data, noClip) {
+        dataToPoint: function (data, clamp) {
+            zrUtil.isArray(data) && (data = data[0]);
+            clamp == null && (clamp = true);
 
-            var dayInfo = this.getDateInfo(data[0]);
+            var dayInfo = this.getDateInfo(data);
             var range = this._rangeInfo;
             var date = dayInfo.formatedDate;
 
             // if not in range return [NaN, NaN]
-            if (!noClip && !(dayInfo.time >= range.start.time && dayInfo.time <= range.end.time)) {
+            if (clamp && !(dayInfo.time >= range.start.time && dayInfo.time <= range.end.time)) {
                 return [NaN, NaN];
             }
 
@@ -211,12 +213,11 @@
          * Convert a time date item to (x, y) four point.
          *
          * @param  {Array} data  date[0] is date
-         * @param  {boolean} noClip  out of range
+         * @param  {boolean} [clamp=true]  out of range
          * @return {Object}       point
          */
-        dataToRect: function (data, noClip) {
-
-            var point = this.dataToPoint(data, noClip);
+        dataToRect: function (data, clamp) {
+            var point = this.dataToPoint(data, clamp);
 
             return {
                 contentShape: {
@@ -270,16 +271,12 @@
         },
 
         /**
-         * @override
-         * @implements
-         * see {module:echarts/CoodinateSystem}
+         * @inheritDoc
          */
         convertToPixel: zrUtil.curry(doConvert, 'dataToPoint'),
 
         /**
-         * @override
-         * @implements
-         * see {module:echarts/CoodinateSystem}
+         * @inheritDoc
          */
         convertFromPixel: zrUtil.curry(doConvert, 'pointToData'),
 

package/lib/coord/calendar/prepareCustom.js

@@ -0,0 +1,31 @@
+
+
+    var zrUtil = require('zrender/lib/core/util');
+
+    function prepareCustom(coordSys) {
+        var rect = coordSys.getRect();
+        var rangeInfo = coordSys.getRangeInfo();
+
+        return {
+            coordSys: {
+                type: 'calendar',
+                x: rect.x,
+                y: rect.y,
+                width: rect.width,
+                height: rect.height,
+                cellWidth: coordSys.getCellWidth(),
+                cellHeight: coordSys.getCellHeight(),
+                rangeInfo: {
+                    start: rangeInfo.start,
+                    end: rangeInfo.end,
+                    weeks: rangeInfo.weeks,
+                    dayCount: rangeInfo.allDay
+                }
+            },
+            api: {
+                coord: zrUtil.bind(coordSys.dataToPoint, coordSys)
+            }
+        };
+    }
+
+    module.exports = prepareCustom;

package/lib/coord/cartesian/Axis2D.js

@@ -2,7 +2,6 @@
 
     var zrUtil = require('zrender/lib/core/util');
     var Axis = require('../Axis');
-    var axisLabelInterval = require('./axisLabelInterval');
 
     /**
      * Extend axis 2d
@@ -81,17 +80,6 @@
             this.grid.getOtherAxis();
         },
 
-        /**
-         * @return {number}
-         */
-        getLabelInterval: function () {
-            var labelInterval = this._labelInterval;
-            if (!labelInterval) {
-                labelInterval = this._labelInterval = axisLabelInterval(this);
-            }
-            return labelInterval;
-        },
-
         /**
          * If label is ignored.
          * Automatically used when axis is category and label can not be all shown

package/lib/coord/cartesian/Cartesian2D.js

@@ -103,6 +103,7 @@
         getOtherAxis: function (axis) {
             return this.getAxis(axis.dim === 'x' ? 'y' : 'x');
         }
+
     };
 
     zrUtil.inherits(Cartesian2D, Cartesian);

package/lib/coord/cartesian/Grid.js

@@ -100,7 +100,9 @@ var factory = exports;
             for (var idx in axes) {
                 if (axes.hasOwnProperty(idx)) {
                     var axis = axes[idx];
-                    if (axis && (axis.type === 'category' || !ifAxisCrossZero(axis))) {
+                    if (axis && (
+                        axis.type === 'category' || axis.type === 'time' || !ifAxisCrossZero(axis)
+                    )) {
                         return true;
                     }
                 }
@@ -555,7 +557,8 @@ var factory = exports;
         ecModel.eachComponent('grid', function (gridModel, idx) {
             var grid = new Grid(gridModel, ecModel, api);
             grid.name = 'grid_' + idx;
-            grid.resize(gridModel, api);
+            // Postpone `resize` to `update`.
+            // grid.resize(gridModel, api);
 
             gridModel.coordinateSystem = grid;
 

package/lib/coord/cartesian/prepareCustom.js

@@ -0,0 +1,36 @@
+
+
+    var zrUtil = require('zrender/lib/core/util');
+
+    function dataToCoordSize(dataSize, dataItem) {
+        // dataItem is necessary in log axis.
+        dataItem = dataItem || [0, 0];
+        return zrUtil.map(['x', 'y'], function (dim, dimIdx) {
+            var axis = this.getAxis(dim);
+            var val = dataItem[dimIdx];
+            var halfSize = dataSize[dimIdx] / 2;
+            return axis.type === 'category'
+                ? axis.getBandWidth()
+                : Math.abs(axis.dataToCoord(val - halfSize) - axis.dataToCoord(val + halfSize));
+        }, this);
+    }
+
+    function prepareCustom(coordSys) {
+        var rect = coordSys.grid.getRect();
+        return {
+            coordSys: {
+                // The name exposed to user is always 'cartesian2d' but not 'grid'.
+                type: 'cartesian2d',
+                x: rect.x,
+                y: rect.y,
+                width: rect.width,
+                height: rect.height
+            },
+            api: {
+                coord: zrUtil.bind(coordSys.dataToPoint, coordSys),
+                size: zrUtil.bind(dataToCoordSize, coordSys)
+            }
+        };
+    }
+
+    module.exports = prepareCustom;

package/lib/coord/geo/Geo.js

@@ -36,7 +36,7 @@
          */
         this.map = map;
 
-        this._nameCoordMap = {};
+        this._nameCoordMap = zrUtil.createHashMap();
 
         this.loadGeoJson(geoJson, specialAreas, nameMap);
     }
@@ -85,14 +85,14 @@
             specialAreas = specialAreas || {};
             nameMap = nameMap || {};
             var regions = this.regions;
-            var regionsMap = {};
+            var regionsMap = zrUtil.createHashMap();
             for (var i = 0; i < regions.length; i++) {
                 var regionName = regions[i].name;
                 // Try use the alias in nameMap
-                regionName = nameMap[regionName] || regionName;
+                regionName = nameMap.hasOwnProperty(regionName) ? nameMap[regionName] : regionName;
                 regions[i].name = regionName;
 
-                regionsMap[regionName] = regions[i];
+                regionsMap.set(regionName, regions[i]);
                 // Add geoJson
                 this.addGeoCoord(regionName, regions[i].center);
 
@@ -144,7 +144,7 @@
          * @return {module:echarts/coord/geo/Region}
          */
         getRegion: function (name) {
-            return this._regionsMap[name];
+            return this._regionsMap.get(name);
         },
 
         getRegionByCoord: function (coord) {
@@ -162,7 +162,7 @@
          * @param {Array.<number>} geoCoord
          */
         addGeoCoord: function (name, geoCoord) {
-            this._nameCoordMap[name] = geoCoord;
+            this._nameCoordMap.set(name, geoCoord);
         },
 
         /**
@@ -171,7 +171,7 @@
          * @return {Array.<number>}
          */
         getGeoCoord: function (name) {
-            return this._nameCoordMap[name];
+            return this._nameCoordMap.get(name);
         },
 
         // Overwrite
@@ -208,7 +208,6 @@
             }, this);
         },
 
-        // Overwrite
         /**
          * @param {string|Array.<number>} data
          * @return {Array.<number>}
@@ -224,16 +223,12 @@
         },
 
         /**
-         * @override
-         * @implements
-         * see {module:echarts/CoodinateSystem}
+         * @inheritDoc
          */
         convertToPixel: zrUtil.curry(doConvert, 'dataToPoint'),
 
         /**
-         * @override
-         * @implements
-         * see {module:echarts/CoodinateSystem}
+         * @inheritDoc
          */
         convertFromPixel: zrUtil.curry(doConvert, 'pointToData')