echarts 4.5.0 → 4.9.0

package/lib/coord/axisDefault.js

@@ -48,7 +48,7 @@ var defaultOption = {
   name: '',
   // 'start' | 'middle' | 'end'
   nameLocation: 'end',
-  // By degree. By defualt auto rotate by nameLocation.
+  // By degree. By default auto rotate by nameLocation.
   nameRotate: null,
   nameTruncate: {
     maxWidth: null,
@@ -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/axisHelper.js

@@ -71,8 +71,6 @@ function getScaleExtent(scale, model) {
   var scaleType = scale.type;
   var min = model.getMin();
   var max = model.getMax();
-  var fixMin = min != null;
-  var fixMax = max != null;
   var originalExtent = scale.getExtent();
   var axisDataLen;
   var boundaryGap;
@@ -109,14 +107,6 @@ function getScaleExtent(scale, model) {
   // that the results processed by boundaryGap are positive/negative?
 
 
-  if (min == null) {
-    min = scaleType === 'ordinal' ? axisDataLen ? 0 : NaN : originalExtent[0] - boundaryGap[0] * span;
-  }
-
-  if (max == null) {
-    max = scaleType === 'ordinal' ? axisDataLen ? axisDataLen - 1 : NaN : originalExtent[1] + boundaryGap[1] * span;
-  }
-
   if (min === 'dataMin') {
     min = originalExtent[0];
   } else if (typeof min === 'function') {
@@ -135,6 +125,17 @@ function getScaleExtent(scale, model) {
     });
   }
 
+  var fixMin = min != null;
+  var fixMax = max != null;
+
+  if (min == null) {
+    min = scaleType === 'ordinal' ? axisDataLen ? 0 : NaN : originalExtent[0] - boundaryGap[0] * span;
+  }
+
+  if (max == null) {
+    max = scaleType === 'ordinal' ? axisDataLen ? axisDataLen - 1 : NaN : originalExtent[1] + boundaryGap[1] * span;
+  }
+
   (min == null || !isFinite(min)) && (min = NaN);
   (max == null || !isFinite(max)) && (max = NaN);
   scale.setBlank(zrUtil.eqNaN(min) || zrUtil.eqNaN(max) || scaleType === 'ordinal' && !scale.getOrdinalMeta().categories.length); // Evaluate if axis needs cross zero
@@ -181,7 +182,13 @@ function getScaleExtent(scale, model) {
     }
   }
 
-  return [min, max];
+  return {
+    extent: [min, max],
+    // "fix" means "fixed", the value should not be
+    // changed in the subsequent steps.
+    fixMin: fixMin,
+    fixMax: fixMax
+  };
 }
 
 function adjustScaleForOverflow(min, max, model, barWidthAndOffset) {
@@ -222,9 +229,8 @@ function adjustScaleForOverflow(min, max, model, barWidthAndOffset) {
 }
 
 function niceScaleExtent(scale, model) {
-  var extent = getScaleExtent(scale, model);
-  var fixMin = model.getMin() != null;
-  var fixMax = model.getMax() != null;
+  var extentInfo = getScaleExtent(scale, model);
+  var extent = extentInfo.extent;
   var splitNumber = model.get('splitNumber');
 
   if (scale.type === 'log') {
@@ -235,8 +241,8 @@ function niceScaleExtent(scale, model) {
   scale.setExtent(extent[0], extent[1]);
   scale.niceExtent({
     splitNumber: splitNumber,
-    fixMin: fixMin,
-    fixMax: fixMax,
+    fixMin: extentInfo.fixMin,
+    fixMax: extentInfo.fixMax,
     minInterval: scaleType === 'interval' || scaleType === 'time' ? model.get('minInterval') : null,
     maxInterval: scaleType === 'interval' || scaleType === 'time' ? model.get('maxInterval') : null
   }); // If some one specified the min, max. And the default calculated interval
@@ -391,8 +397,8 @@ function rotateTextRect(textRect, rotate) {
   var boundingBox = textRect.plain();
   var beforeWidth = boundingBox.width;
   var beforeHeight = boundingBox.height;
-  var afterWidth = beforeWidth * Math.cos(rotateRadians) + beforeHeight * Math.sin(rotateRadians);
-  var afterHeight = beforeWidth * Math.sin(rotateRadians) + beforeHeight * Math.cos(rotateRadians);
+  var afterWidth = beforeWidth * Math.abs(Math.cos(rotateRadians)) + Math.abs(beforeHeight * Math.sin(rotateRadians));
+  var afterHeight = beforeWidth * Math.abs(Math.sin(rotateRadians)) + Math.abs(beforeHeight * Math.cos(rotateRadians));
   var rotatedRect = new BoundingRect(boundingBox.x, boundingBox.y, afterWidth, afterHeight);
   return rotatedRect;
 }

package/lib/coord/calendar/Calendar.js

@@ -336,7 +336,9 @@ Calendar.prototype = {
       range.reverse();
     }
 
-    var allDay = Math.floor(range[1].time / PROXIMATE_ONE_DAY) - Math.floor(range[0].time / PROXIMATE_ONE_DAY) + 1; // Consider case:
+    var allDay = Math.floor(range[1].time / PROXIMATE_ONE_DAY) - Math.floor(range[0].time / PROXIMATE_ONE_DAY) + 1; // Consider case1 (#11677 #10430):
+    // Set the system timezone as "UK", set the range to `['2016-07-01', '2016-12-31']`
+    // Consider case2:
     // Firstly set system timezone as "Time Zone: America/Toronto",
     // ```
     // var first = new Date(1478412000000 - 3600 * 1000 * 2.5);
@@ -350,12 +352,14 @@ Calendar.prototype = {
     var endDateNum = range[1].date.getDate();
     date.setDate(startDateNum + allDay - 1); // The bias can not over a month, so just compare date.
 
-    if (date.getDate() !== endDateNum) {
+    var dateNum = date.getDate();
+
+    if (dateNum !== endDateNum) {
       var sign = date.getTime() - range[1].time > 0 ? 1 : -1;
 
-      while (date.getDate() !== endDateNum && (date.getTime() - range[1].time) * sign > 0) {
+      while ((dateNum = date.getDate()) !== endDateNum && (date.getTime() - range[1].time) * sign > 0) {
         allDay -= sign;
-        date.setDate(startDateNum + allDay - 1);
+        date.setDate(dateNum - sign);
       }
     }
 

package/lib/coord/geo/GeoModel.js

@@ -143,8 +143,9 @@ var GeoModel = ComponentModel.extend({
    * @return {string}
    */
   getFormattedLabel: function (name, status) {
+    status = status || 'normal';
     var regionModel = this.getRegionModel(name);
-    var formatter = regionModel.get('label' + (status === 'normal' ? '.' : status + '.') + 'formatter');
+    var formatter = regionModel.get((status === 'normal' ? '' : status + '.') + 'label.formatter');
     var params = {
       name: name
     };

package/lib/coord/geo/geoJSONLoader.js

@@ -60,9 +60,10 @@ var _default = {
   /**
    * @param {string} mapName
    * @param {Object} mapRecord {specialAreas, geoJSON}
+   * @param {string} nameProperty
    * @return {Object} {regions, boundingRect}
    */
-  load: function (mapName, mapRecord) {
+  load: function (mapName, mapRecord, nameProperty) {
     var parsed = inner(mapRecord).parsed;
 
     if (parsed) {
@@ -74,7 +75,7 @@ var _default = {
     var regions; // https://jsperf.com/try-catch-performance-overhead
 
     try {
-      regions = geoJSON ? parseGeoJson(geoJSON) : [];
+      regions = geoJSON ? parseGeoJson(geoJSON, nameProperty) : [];
     } catch (e) {
       throw new Error('Invalid geoJson format\n' + e.message);
     }

package/lib/coord/geo/geoSourceManager.js

@@ -61,16 +61,17 @@ var _default = {
   /**
    * @param {string} mapName
    * @param {Object} nameMap
+   * @param {string} nameProperty
    * @return {Object} source {regions, regionsMap, nameCoordMap, boundingRect}
    */
-  load: function (mapName, nameMap) {
+  load: function (mapName, nameMap, nameProperty) {
     var regions = [];
     var regionsMap = createHashMap();
     var nameCoordMap = createHashMap();
     var boundingRect;
     var mapRecords = retrieveMap(mapName);
     each(mapRecords, function (record) {
-      var singleSource = loaders[record.type].load(mapName, record);
+      var singleSource = loaders[record.type].load(mapName, record, nameProperty);
       each(singleSource.regions, function (region) {
         var regionName = region.name; // Try use the alias in geoNameMap
 

package/lib/coord/geo/parseGeoJson.js

@@ -108,11 +108,12 @@ function decodePolygon(coordinate, encodeOffsets, encodeScale) {
 /**
  * @alias module:echarts/coord/geo/parseGeoJson
  * @param {Object} geoJson
+ * @param {string} nameProperty
  * @return {module:zrender/container/Group}
  */
 
 
-function _default(geoJson) {
+function _default(geoJson, nameProperty) {
   decode(geoJson);
   return zrUtil.map(zrUtil.filter(geoJson.features, function (featureObj) {
     // Output of mapshaper may have geometry null
@@ -145,7 +146,7 @@ function _default(geoJson) {
       });
     }
 
-    var region = new Region(properties.name, geometries, properties.cp);
+    var region = new Region(properties[nameProperty || 'name'], geometries, properties.cp);
     region.properties = properties;
     return region;
   });

package/lib/coord/radar/Radar.js

@@ -210,7 +210,7 @@ Radar.prototype.update = function (ecModel, api) {
 
 
   zrUtil.each(indicatorAxes, function (indicatorAxis, idx) {
-    var rawExtent = getScaleExtent(indicatorAxis.scale, indicatorAxis.model);
+    var rawExtent = getScaleExtent(indicatorAxis.scale, indicatorAxis.model).extent;
     niceScaleExtent(indicatorAxis.scale, indicatorAxis.model);
     var axisModel = indicatorAxis.model;
     var scale = indicatorAxis.scale;
@@ -247,12 +247,12 @@ Radar.prototype.update = function (ecModel, api) {
 
       if (nicedSplitNumber > splitNumber) {
         interval = increaseInterval(interval);
-      } // PENDING
+      } // TODO
 
 
-      var center = Math.round((rawExtent[0] + rawExtent[1]) / 2 / interval) * interval;
-      var halfSplitNumber = Math.round(splitNumber / 2);
-      scale.setExtent(numberUtil.round(center - halfSplitNumber * interval), numberUtil.round(center + (splitNumber - halfSplitNumber) * interval));
+      var max = Math.ceil(rawExtent[1] / interval) * interval;
+      var min = numberUtil.round(max - interval * splitNumber);
+      scale.setExtent(min, max);
       scale.setInterval(interval);
     }
   });

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/Graph.js

@@ -191,12 +191,7 @@ graphProto.addEdge = function (n1, n2, dataIndex) {
     return;
   }
 
-  var key = n1.id + '-' + n2.id; // PENDING
-
-  if (edgesMap[key]) {
-    return;
-  }
-
+  var key = n1.id + '-' + n2.id;
   var edge = new Edge(n1, n2, dataIndex);
   edge.hostGraph = this;
 

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;
@@ -419,7 +419,7 @@ listProto.mapDimension = function (coordDim, idx) {
  * Initialize from data
  * @param {Array.<Object|number|Array>} data source or data or data provider.
  * @param {Array.<string>} [nameLIst] The name of a datum is used on data diff and
- *        defualt label/tooltip.
+ *        default label/tooltip.
  *        A name can be specified in encode.itemName,
  *        or dataItem.name (only for series option data),
  *        or provided in nameList from outside.
@@ -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

@@ -20,8 +20,6 @@
 
 var zrUtil = require("zrender/lib/core/util");
 
-var Model = require("../model/Model");
-
 var linkList = require("./helper/linkList");
 
 var List = require("./List");
@@ -281,28 +279,7 @@ TreeNode.prototype = {
 
     var hostTree = this.hostTree;
     var itemModel = hostTree.data.getItemModel(this.dataIndex);
-    var levelModel = this.getLevelModel();
-    var leavesModel;
-
-    if (!levelModel && (this.children.length === 0 || this.children.length !== 0 && this.isExpand === false)) {
-      leavesModel = this.getLeavesModel();
-    }
-
-    return itemModel.getModel(path, (levelModel || leavesModel || hostTree.hostModel).getModel(path));
-  },
-
-  /**
-   * @return {module:echarts/model/Model}
-   */
-  getLevelModel: function () {
-    return (this.hostTree.levelModels || [])[this.depth];
-  },
-
-  /**
-   * @return {module:echarts/model/Model}
-   */
-  getLeavesModel: function () {
-    return this.hostTree.leavesModel;
+    return itemModel.getModel(path);
   },
 
   /**
@@ -375,11 +352,9 @@ TreeNode.prototype = {
  * @constructor
  * @alias module:echarts/data/Tree
  * @param {module:echarts/model/Model} hostModel
- * @param {Array.<Object>} levelOptions
- * @param {Object} leavesOption
  */
 
-function Tree(hostModel, levelOptions, leavesOption) {
+function Tree(hostModel) {
   /**
    * @type {module:echarts/data/Tree~TreeNode}
    * @readOnly
@@ -405,16 +380,6 @@ function Tree(hostModel, levelOptions, leavesOption) {
    */
 
   this.hostModel = hostModel;
-  /**
-   * @private
-   * @readOnly
-   * @type {Array.<module:echarts/model/Model}
-   */
-
-  this.levelModels = zrUtil.map(levelOptions || [], function (levelDefine) {
-    return new Model(levelDefine, hostModel, hostModel.ecModel);
-  });
-  this.leavesModel = new Model(leavesOption || {}, hostModel, hostModel.ecModel);
 }
 
 Tree.prototype = {
@@ -501,14 +466,11 @@ Tree.prototype = {
  * @static
  * @param {Object} dataRoot Root node.
  * @param {module:echarts/model/Model} hostModel
- * @param {Object} treeOptions
- * @param {Array.<Object>} treeOptions.levels
- * @param {Array.<Object>} treeOptions.leaves
  * @return module:echarts/data/Tree
  */
 
-Tree.createTree = function (dataRoot, hostModel, treeOptions) {
-  var tree = new Tree(hostModel, treeOptions.levels, treeOptions.leaves);
+Tree.createTree = function (dataRoot, hostModel, beforeLink) {
+  var tree = new Tree(hostModel);
   var listData = [];
   var dimMax = 1;
   buildHierarchy(dataRoot);
@@ -538,6 +500,7 @@ Tree.createTree = function (dataRoot, hostModel, treeOptions) {
   });
   var list = new List(dimensionsInfo, hostModel);
   list.initData(listData);
+  beforeLink && beforeLink(list);
   linkList({
     mainData: list,
     struct: tree,