echarts 4.4.0 → 4.6.0

package/lib/component/toolbox/feature/MagicType.js

@@ -45,6 +45,7 @@ var featureManager = require("../featureManager");
 * under the License.
 */
 var magicTypeLang = lang.toolbox.magicType;
+var INNER_STACK_KEYWORD = '__ec_magicType_stack__';
 
 function MagicType(model) {
   this.model = model;
@@ -58,9 +59,8 @@ MagicType.defaultOption = {
     /* eslint-disable */
     line: 'M4.1,28.9h7.1l9.3-22l7.4,38l9.7-19.7l3,12.8h14.9M4.1,58h51.4',
     bar: 'M6.7,22.9h10V48h-10V22.9zM24.9,13h10v35h-10V13zM43.2,2h10v46h-10V2zM3.1,58h53.7',
-    stack: 'M8.2,38.4l-8.4,4.1l30.6,15.3L60,42.5l-8.1-4.1l-21.5,11L8.2,38.4z M51.9,30l-8.1,4.2l-13.4,6.9l-13.9-6.9L8.2,30l-8.4,4.2l8.4,4.2l22.2,11l21.5-11l8.1-4.2L51.9,30z M51.9,21.7l-8.1,4.2L35.7,30l-5.3,2.8L24.9,30l-8.4-4.1l-8.3-4.2l-8.4,4.2L8.2,30l8.3,4.2l13.9,6.9l13.4-6.9l8.1-4.2l8.1-4.1L51.9,21.7zM30.4,2.2L-0.2,17.5l8.4,4.1l8.3,4.2l8.4,4.2l5.5,2.7l5.3-2.7l8.1-4.2l8.1-4.2l8.1-4.1L30.4,2.2z',
-    // jshint ignore:line
-    tiled: 'M2.3,2.2h22.8V25H2.3V2.2z M35,2.2h22.8V25H35V2.2zM2.3,35h22.8v22.8H2.3V35z M35,35h22.8v22.8H35V35z'
+    stack: 'M8.2,38.4l-8.4,4.1l30.6,15.3L60,42.5l-8.1-4.1l-21.5,11L8.2,38.4z M51.9,30l-8.1,4.2l-13.4,6.9l-13.9-6.9L8.2,30l-8.4,4.2l8.4,4.2l22.2,11l21.5-11l8.1-4.2L51.9,30z M51.9,21.7l-8.1,4.2L35.7,30l-5.3,2.8L24.9,30l-8.4-4.1l-8.3-4.2l-8.4,4.2L8.2,30l8.3,4.2l13.9,6.9l13.4-6.9l8.1-4.2l8.1-4.1L51.9,21.7zM30.4,2.2L-0.2,17.5l8.4,4.1l8.3,4.2l8.4,4.2l5.5,2.7l5.3-2.7l8.1-4.2l8.1-4.2l8.1-4.1L30.4,2.2z' // jshint ignore:line
+
     /* eslint-enable */
 
   },
@@ -111,23 +111,18 @@ var seriesOptGenreator = {
     }
   },
   'stack': function (seriesType, seriesId, seriesModel, model) {
+    var isStack = seriesModel.get('stack') === INNER_STACK_KEYWORD;
+
     if (seriesType === 'line' || seriesType === 'bar') {
+      model.setIconStatus('stack', isStack ? 'normal' : 'emphasis');
       return zrUtil.merge({
         id: seriesId,
-        stack: '__ec_magicType_stack__'
+        stack: isStack ? '' : INNER_STACK_KEYWORD
       }, model.get('option.stack') || {}, true);
     }
-  },
-  'tiled': function (seriesType, seriesId, seriesModel, model) {
-    if (seriesType === 'line' || seriesType === 'bar') {
-      return zrUtil.merge({
-        id: seriesId,
-        stack: ''
-      }, model.get('option.tiled') || {}, true);
-    }
   }
 };
-var radioTypes = [['line', 'bar'], ['stack', 'tiled']];
+var radioTypes = [['line', 'bar'], ['stack']];
 
 proto.onclick = function (ecModel, api, type) {
   var model = this.model;
@@ -192,10 +187,20 @@ proto.onclick = function (ecModel, api, type) {
       seriesIndex: seriesIndex
     }
   }, generateNewSeriesTypes);
+  var newTitle; // Change title of stack
+
+  if (type === 'stack') {
+    var isStack = newOption.series && newOption.series[0] && newOption.series[0].stack === INNER_STACK_KEYWORD;
+    newTitle = isStack ? zrUtil.merge({
+      stack: magicTypeLang.title.tiled
+    }, magicTypeLang.title) : zrUtil.clone(magicTypeLang.title);
+  }
+
   api.dispatchAction({
     type: 'changeMagicType',
     currentType: type,
-    newOption: newOption
+    newOption: newOption,
+    newTitle: newTitle
   });
 };
 

package/lib/coord/Axis.js

@@ -27,6 +27,7 @@ var _number = require("../util/number");
 
 var linearMap = _number.linearMap;
 var getPixelPrecision = _number.getPixelPrecision;
+var round = _number.round;
 
 var _axisTickLabelBuilder = require("./axisTickLabelBuilder");
 
@@ -110,7 +111,7 @@ Axis.prototype = {
    * @return {boolean}
    */
   containData: function (data) {
-    return this.contain(this.dataToCoord(data));
+    return this.scale.contain(data);
   },
 
   /**
@@ -193,7 +194,7 @@ Axis.prototype = {
    * `axis.getTicksCoords` considers `onBand`, which is used by
    * `boundaryGap:true` of category axis and splitLine and splitArea.
    * @param {Object} [opt]
-   * @param {number} [opt.tickModel=axis.model.getModel('axisTick')]
+   * @param {Model} [opt.tickModel=axis.model.getModel('axisTick')]
    * @param {boolean} [opt.clamp] If `true`, the first and the last
    *        tick must be at the axis end points. Otherwise, clip ticks
    *        that outside the axis extent.
@@ -214,10 +215,38 @@ Axis.prototype = {
       };
     }, this);
     var alignWithLabel = tickModel.get('alignWithLabel');
-    fixOnBandTicksCoords(this, ticksCoords, result.tickCategoryInterval, alignWithLabel, opt.clamp);
+    fixOnBandTicksCoords(this, ticksCoords, alignWithLabel, opt.clamp);
     return ticksCoords;
   },
 
+  /**
+   * @return {Array.<Array.<Object>>} [{ coord: ..., tickValue: ...}]
+   */
+  getMinorTicksCoords: function () {
+    if (this.scale.type === 'ordinal') {
+      // Category axis doesn't support minor ticks
+      return [];
+    }
+
+    var minorTickModel = this.model.getModel('minorTick');
+    var splitNumber = minorTickModel.get('splitNumber'); // Protection.
+
+    if (!(splitNumber > 0 && splitNumber < 100)) {
+      splitNumber = 5;
+    }
+
+    var minorTicks = this.scale.getMinorTicks(splitNumber);
+    var minorTicksCoords = map(minorTicks, function (minorTicksGroup) {
+      return map(minorTicksGroup, function (minorTick) {
+        return {
+          coord: this.dataToCoord(minorTick),
+          tickValue: minorTick
+        };
+      }, this);
+    }, this);
+    return minorTicksCoords;
+  },
+
   /**
    * @return {Array.<Object>} [{
    *     formattedLabel: string,
@@ -301,7 +330,7 @@ function fixExtentWithBands(extent, nTick) {
 // case).
 
 
-function fixOnBandTicksCoords(axis, ticksCoords, tickCategoryInterval, alignWithLabel, clamp) {
+function fixOnBandTicksCoords(axis, ticksCoords, alignWithLabel, clamp) {
   var ticksLen = ticksCoords.length;
 
   if (!axis.onBand || alignWithLabel || !ticksLen) {
@@ -310,6 +339,7 @@ function fixOnBandTicksCoords(axis, ticksCoords, tickCategoryInterval, alignWith
 
   var axisExtent = axis.getExtent();
   var last;
+  var diffSize;
 
   if (ticksLen === 1) {
     ticksCoords[0].coord = axisExtent[0];
@@ -317,22 +347,20 @@ function fixOnBandTicksCoords(axis, ticksCoords, tickCategoryInterval, alignWith
       coord: axisExtent[0]
     };
   } else {
-    var shift = ticksCoords[1].coord - ticksCoords[0].coord;
+    var crossLen = ticksCoords[ticksLen - 1].tickValue - ticksCoords[0].tickValue;
+    var shift = (ticksCoords[ticksLen - 1].coord - ticksCoords[0].coord) / crossLen;
     each(ticksCoords, function (ticksItem) {
       ticksItem.coord -= shift / 2;
-      var tickCategoryInterval = tickCategoryInterval || 0; // Avoid split a single data item when odd interval.
-
-      if (tickCategoryInterval % 2 > 0) {
-        ticksItem.coord -= shift / ((tickCategoryInterval + 1) * 2);
-      }
     });
+    var dataExtent = axis.scale.getExtent();
+    diffSize = 1 + dataExtent[1] - ticksCoords[ticksLen - 1].tickValue;
     last = {
-      coord: ticksCoords[ticksLen - 1].coord + shift
+      coord: ticksCoords[ticksLen - 1].coord + shift * diffSize
     };
     ticksCoords.push(last);
   }
 
-  var inverse = axisExtent[0] > axisExtent[1];
+  var inverse = axisExtent[0] > axisExtent[1]; // Handling clamp.
 
   if (littleThan(ticksCoords[0].coord, axisExtent[0])) {
     clamp ? ticksCoords[0].coord = axisExtent[0] : ticksCoords.shift();
@@ -355,6 +383,10 @@ function fixOnBandTicksCoords(axis, ticksCoords, tickCategoryInterval, alignWith
   }
 
   function littleThan(a, b) {
+    // Avoid rounding error cause calculated tick coord different with extent.
+    // It may cause an extra unecessary tick added.
+    a = round(a);
+    b = round(b);
     return inverse ? a > b : a < b;
   }
 }

package/lib/coord/axisDefault.js

@@ -170,13 +170,32 @@ axisDefault.valueAxis = zrUtil.merge({
   // + `true`: the extent do not consider value 0.
   // scale: false,
   // AxisTick and axisLabel and splitLine are caculated based on splitNumber.
-  splitNumber: 5 // Interval specifies the span of the ticks is mandatorily.
+  splitNumber: 5,
+  // Interval specifies the span of the ticks is mandatorily.
   // interval: null
   // Specify min interval when auto calculate tick interval.
   // minInterval: null
   // Specify max interval when auto calculate tick interval.
   // maxInterval: null
-
+  minorTick: {
+    // Minor tick, not available for cateogry axis.
+    show: false,
+    // Split number of minor ticks. The value should be in range of (0, 100)
+    splitNumber: 5,
+    // Lenght of minor tick
+    length: 3,
+    // Same inside with axisTick
+    // Line style
+    lineStyle: {// Default to be same with axisTick
+    }
+  },
+  minorSplitLine: {
+    show: false,
+    lineStyle: {
+      color: '#eee',
+      width: 1
+    }
+  }
 }, defaultOption);
 axisDefault.timeAxis = zrUtil.defaults({
   scale: true,

package/lib/coord/axisTickLabelBuilder.js

@@ -258,20 +258,28 @@ function calculateCategoryInterval(axis) {
   isNaN(dh) && (dh = Infinity);
   var interval = Math.max(0, Math.floor(Math.min(dw, dh)));
   var cache = inner(axis.model);
+  var axisExtent = axis.getExtent();
   var lastAutoInterval = cache.lastAutoInterval;
   var lastTickCount = cache.lastTickCount; // Use cache to keep interval stable while moving zoom window,
   // otherwise the calculated interval might jitter when the zoom
   // window size is close to the interval-changing size.
+  // For example, if all of the axis labels are `a, b, c, d, e, f, g`.
+  // The jitter will cause that sometimes the displayed labels are
+  // `a, d, g` (interval: 2) sometimes `a, c, e`(interval: 1).
 
   if (lastAutoInterval != null && lastTickCount != null && Math.abs(lastAutoInterval - interval) <= 1 && Math.abs(lastTickCount - tickCount) <= 1 // Always choose the bigger one, otherwise the critical
   // point is not the same when zooming in or zooming out.
-  && lastAutoInterval > interval) {
+  && lastAutoInterval > interval // If the axis change is caused by chart resize, the cache should not
+  // be used. Otherwise some hiden labels might not be shown again.
+  && cache.axisExtend0 === axisExtent[0] && cache.axisExtend1 === axisExtent[1]) {
     interval = lastAutoInterval;
   } // Only update cache if cache not used, otherwise the
   // changing of interval is too insensitive.
   else {
       cache.lastTickCount = tickCount;
       cache.lastAutoInterval = interval;
+      cache.axisExtend0 = axisExtent[0];
+      cache.axisExtend1 = axisExtent[1];
     }
 
   return interval;

package/lib/coord/cartesian/Cartesian2D.js

@@ -42,21 +42,6 @@ var Cartesian = require("./Cartesian");
 * specific language governing permissions and limitations
 * under the License.
 */
-// A helper function to calculate extent of axis.
-function getAxisExtentWithGap(axis) {
-  var extent = axis.getGlobalExtent();
-
-  if (axis.onBand) {
-    // Remove extra 1px to avoid line miter in clipped edge
-    var halfBandWidth = axis.getBandWidth() / 2 - 1;
-    var dir = extent[1] > extent[0] ? 1 : -1;
-    extent[0] += dir * halfBandWidth;
-    extent[1] -= dir * halfBandWidth;
-  }
-
-  return extent;
-}
-
 function Cartesian2D(name) {
   Cartesian.call(this, name);
 }

package/lib/coord/geo/geoJSONLoader.js

@@ -79,6 +79,7 @@ var _default = {
       throw new Error('Invalid geoJson format\n' + e.message);
     }
 
+    fixNanhai(mapName, regions);
     each(regions, function (region) {
       var regionName = region.name;
       fixTextCoord(mapName, region);
@@ -92,7 +93,6 @@ var _default = {
         region.transformTo(specialArea.left, specialArea.top, specialArea.width, specialArea.height);
       }
     });
-    fixNanhai(mapName, regions);
     return inner(mapRecord).parsed = {
       regions: regions,
       boundingRect: getBoundingRect(regions)

package/lib/coord/polar/polarCreator.js

@@ -76,8 +76,17 @@ function resizePolar(polar, polarModel, api) {
   polar.cy = parsePercent(center[1], height);
   var radiusAxis = polar.getRadiusAxis();
   var size = Math.min(width, height) / 2;
-  var radius = parsePercent(polarModel.get('radius'), size);
-  radiusAxis.inverse ? radiusAxis.setExtent(radius, 0) : radiusAxis.setExtent(0, radius);
+  var radius = polarModel.get('radius');
+
+  if (radius == null) {
+    radius = [0, '100%'];
+  } else if (!zrUtil.isArray(radius)) {
+    // r0 = 0
+    radius = [0, radius];
+  }
+
+  radius = [parsePercent(radius[0], size), parsePercent(radius[1], size)];
+  radiusAxis.inverse ? radiusAxis.setExtent(radius[1], radius[0]) : radiusAxis.setExtent(radius[0], radius[1]);
 }
 /**
  * Update polar

package/lib/coord/radar/Radar.js

@@ -33,6 +33,8 @@ var niceScaleExtent = _axisHelper.niceScaleExtent;
 
 var CoordinateSystem = require("../../CoordinateSystem");
 
+var LogScale = require("../../scale/Log");
+
 /*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
@@ -62,7 +64,7 @@ function Radar(radarModel, ecModel, api) {
   this.dimensions = [];
   this._indicatorAxes = zrUtil.map(radarModel.getIndicatorModels(), function (indicatorModel, idx) {
     var dim = 'indicator_' + idx;
-    var indicatorAxis = new IndicatorAxis(dim, new IntervalScale());
+    var indicatorAxis = new IndicatorAxis(dim, indicatorModel.get('axisType') === 'log' ? new LogScale() : new IntervalScale());
     indicatorAxis.name = indicatorModel.get('name'); // Inject model and axis
 
     indicatorAxis.model = indicatorModel;

package/lib/coord/radar/RadarModel.js

@@ -62,6 +62,7 @@ var RadarModel = echarts.extendComponentModel({
     var scale = this.get('scale');
     var axisLine = this.get('axisLine');
     var axisTick = this.get('axisTick');
+    var axisType = this.get('axisType');
     var axisLabel = this.get('axisLabel');
     var nameTextStyle = this.get('name');
     var showName = this.get('name.show');
@@ -91,8 +92,9 @@ var RadarModel = echarts.extendComponentModel({
         scale: scale,
         axisLine: axisLine,
         axisTick: axisTick,
+        axisType: axisType,
         axisLabel: axisLabel,
-        // Competitable with 2 and use text
+        // Compatible with 2 and use text
         name: indicatorOpt.text,
         nameLocation: 'end',
         nameGap: nameGap,
@@ -147,6 +149,7 @@ var RadarModel = echarts.extendComponentModel({
     }, valueAxisDefault.axisLine),
     axisLabel: defaultsShow(valueAxisDefault.axisLabel, false),
     axisTick: defaultsShow(valueAxisDefault.axisTick, false),
+    axisType: 'interval',
     splitLine: defaultsShow(valueAxisDefault.splitLine, true),
     splitArea: defaultsShow(valueAxisDefault.splitArea, true),
     // {text, min, max}

package/lib/data/DataDiffer.js

@@ -91,9 +91,7 @@ DataDiffer.prototype = {
     var newDataKeyArr = [];
     var i;
     initIndexMap(oldArr, oldDataIndexMap, oldDataKeyArr, '_oldKeyGetter', this);
-    initIndexMap(newArr, newDataIndexMap, newDataKeyArr, '_newKeyGetter', this); // Travel by inverted order to make sure order consistency
-    // when duplicate keys exists (consider newDataIndex.pop() below).
-    // For performance consideration, these code below do not look neat.
+    initIndexMap(newArr, newDataIndexMap, newDataKeyArr, '_newKeyGetter', this);
 
     for (i = 0; i < oldArr.length; i++) {
       var key = oldDataKeyArr[i];
@@ -106,7 +104,7 @@ DataDiffer.prototype = {
 
         if (len) {
           len === 1 && (newDataIndexMap[key] = null);
-          idx = idx.unshift();
+          idx = idx.shift();
         } else {
           newDataIndexMap[key] = null;
         }

package/lib/data/DataDimensionInfo.js

@@ -0,0 +1,157 @@
+
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
+var zrUtil = require("zrender/lib/core/util");
+
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
+/**
+ * @class
+ * @param {Object|DataDimensionInfo} [opt] All of the fields will be shallow copied.
+ */
+function DataDimensionInfo(opt) {
+  if (opt != null) {
+    zrUtil.extend(this, opt);
+  }
+  /**
+   * Dimension name.
+   * Mandatory.
+   * @type {string}
+   */
+  // this.name;
+
+  /**
+   * The origin name in dimsDef, see source helper.
+   * If displayName given, the tooltip will displayed vertically.
+   * Optional.
+   * @type {string}
+   */
+  // this.displayName;
+
+  /**
+   * Which coordSys dimension this dimension mapped to.
+   * A `coordDim` can be a "coordSysDim" that the coordSys required
+   * (for example, an item in `coordSysDims` of `model/referHelper#CoordSysInfo`),
+   * or an generated "extra coord name" if does not mapped to any "coordSysDim"
+   * (That is determined by whether `isExtraCoord` is `true`).
+   * Mandatory.
+   * @type {string}
+   */
+  // this.coordDim;
+
+  /**
+   * The index of this dimension in `series.encode[coordDim]`.
+   * Mandatory.
+   * @type {number}
+   */
+  // this.coordDimIndex;
+
+  /**
+   * Dimension type. The enumerable values are the key of
+   * `dataCtors` of `data/List`.
+   * Optional.
+   * @type {string}
+   */
+  // this.type;
+
+  /**
+   * This index of this dimension info in `data/List#_dimensionInfos`.
+   * Mandatory after added to `data/List`.
+   * @type {number}
+   */
+  // this.index;
+
+  /**
+   * The format of `otherDims` is:
+   * ```js
+   * {
+   *     tooltip: number optional,
+   *     label: number optional,
+   *     itemName: number optional,
+   *     seriesName: number optional,
+   * }
+   * ```
+   *
+   * A `series.encode` can specified these fields:
+   * ```js
+   * encode: {
+   *     // "3, 1, 5" is the index of data dimension.
+   *     tooltip: [3, 1, 5],
+   *     label: [0, 3],
+   *     ...
+   * }
+   * ```
+   * `otherDims` is the parse result of the `series.encode` above, like:
+   * ```js
+   * // Suppose the index of this data dimension is `3`.
+   * this.otherDims = {
+   *     // `3` is at the index `0` of the `encode.tooltip`
+   *     tooltip: 0,
+   *     // `3` is at the index `1` of the `encode.tooltip`
+   *     label: 1
+   * };
+   * ```
+   *
+   * This prop should never be `null`/`undefined` after initialized.
+   * @type {Object}
+   */
+
+
+  this.otherDims = {};
+  /**
+   * Be `true` if this dimension is not mapped to any "coordSysDim" that the
+   * "coordSys" required.
+   * Mandatory.
+   * @type {boolean}
+   */
+  // this.isExtraCoord;
+
+  /**
+   * @type {module:data/OrdinalMeta}
+   */
+  // this.ordinalMeta;
+
+  /**
+   * Whether to create inverted indices.
+   * @type {boolean}
+   */
+  // this.createInvertedIndices;
+}
+
+;
+var _default = DataDimensionInfo;
+module.exports = _default;

package/lib/data/List.js

@@ -39,6 +39,8 @@ var _dimensionHelper = require("./helper/dimensionHelper");
 
 var summarizeDimensions = _dimensionHelper.summarizeDimensions;
 
+var DataDimensionInfo = require("./DataDimensionInfo");
+
 /*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
@@ -114,13 +116,9 @@ function transferProperties(target, source) {
  * @constructor
  * @alias module:echarts/data/List
  *
- * @param {Array.<string|Object>} dimensions
+ * @param {Array.<string|Object|module:data/DataDimensionInfo>} dimensions
  *      For example, ['someDimName', {name: 'someDimName', type: 'someDimType'}, ...].
  *      Dimensions should be concrete names like x, y, z, lng, lat, angle, radius
- *      Spetial fields: {
- *          ordinalMeta: <module:echarts/data/OrdinalMeta>
- *          createInvertedIndices: <boolean>
- *      }
  * @param {module:echarts/model/Model} hostModel
  */
 
@@ -136,9 +134,11 @@ var List = function (dimensions, hostModel) {
     var dimensionInfo = dimensions[i];
 
     if (zrUtil.isString(dimensionInfo)) {
-      dimensionInfo = {
+      dimensionInfo = new DataDimensionInfo({
         name: dimensionInfo
-      };
+      });
+    } else if (!(dimensionInfo instanceof DataDimensionInfo)) {
+      dimensionInfo = new DataDimensionInfo(dimensionInfo);
     }
 
     var dimensionName = dimensionInfo.name;
@@ -1143,12 +1143,12 @@ listProto.indexOfName = function (name) {
 
 
 listProto.indexOfRawIndex = function (rawIndex) {
-  if (!this._indices) {
-    return rawIndex;
-  }
-
   if (rawIndex >= this._rawCount || rawIndex < 0) {
     return -1;
+  }
+
+  if (!this._indices) {
+    return rawIndex;
   } // Indices are ascending
 
 
@@ -1182,7 +1182,8 @@ listProto.indexOfRawIndex = function (rawIndex) {
  * @param {string} dim
  * @param {number} value
  * @param {number} [maxDistance=Infinity]
- * @return {Array.<number>} Considere multiple points has the same value.
+ * @return {Array.<number>} If and only if multiple indices has
+ *        the same value, they are put to the result.
  */
 
 
@@ -1199,29 +1200,34 @@ listProto.indicesOfNearest = function (dim, value, maxDistance) {
     maxDistance = Infinity;
   }
 
-  var minDist = Number.MAX_VALUE;
+  var minDist = Infinity;
   var minDiff = -1;
+  var nearestIndicesLen = 0; // Check the test case of `test/ut/spec/data/List.js`.
 
   for (var i = 0, len = this.count(); i < len; i++) {
-    var diff = value - this.get(dim, i
-    /*, stack */
-    );
+    var diff = value - this.get(dim, i);
     var dist = Math.abs(diff);
 
-    if (diff <= maxDistance && dist <= minDist) {
-      // For the case of two data are same on xAxis, which has sequence data.
-      // Show the nearest index
-      // https://github.com/ecomfe/echarts/issues/2869
-      if (dist < minDist || diff >= 0 && minDiff < 0) {
+    if (dist <= maxDistance) {
+      // When the `value` is at the middle of `this.get(dim, i)` and `this.get(dim, i+1)`,
+      // we'd better not push both of them to `nearestIndices`, otherwise it is easy to
+      // get more than one item in `nearestIndices` (more specifically, in `tooltip`).
+      // So we chose the one that `diff >= 0` in this csae.
+      // But if `this.get(dim, i)` and `this.get(dim, j)` get the same value, both of them
+      // should be push to `nearestIndices`.
+      if (dist < minDist || dist === minDist && diff >= 0 && minDiff < 0) {
         minDist = dist;
         minDiff = diff;
-        nearestIndices.length = 0;
+        nearestIndicesLen = 0;
       }
 
-      nearestIndices.push(i);
+      if (diff === minDiff) {
+        nearestIndices[nearestIndicesLen++] = i;
+      }
     }
   }
 
+  nearestIndices.length = nearestIndicesLen;
   return nearestIndices;
 };
 /**

package/lib/data/Tree.js

@@ -507,7 +507,7 @@ Tree.prototype = {
  * @return module:echarts/data/Tree
  */
 
-Tree.createTree = function (dataRoot, hostModel, treeOptions) {
+Tree.createTree = function (dataRoot, hostModel, treeOptions, beforeLink) {
   var tree = new Tree(hostModel, treeOptions.levels, treeOptions.leaves);
   var listData = [];
   var dimMax = 1;
@@ -544,6 +544,7 @@ Tree.createTree = function (dataRoot, hostModel, treeOptions) {
     structAttr: 'tree'
   });
   tree.update();
+  beforeLink && beforeLink(list);
   return tree;
 };
 /**