echarts 4.5.0 → 4.9.0

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

@@ -83,7 +83,11 @@ DataZoom.defaultOption = {
     back: 'M22,1.4L9.9,13.5l12.3,12.3 M10.3,13.5H54.9v44.6 H10.3v-26'
   },
   // `zoom`, `back`
-  title: zrUtil.clone(dataZoomLang.title)
+  title: zrUtil.clone(dataZoomLang.title),
+  brushStyle: {
+    borderWidth: 0,
+    color: 'rgba(0,0,0,0.2)'
+  }
 };
 var proto = DataZoom.prototype;
 
@@ -243,11 +247,7 @@ function updateZoomBtnStatus(featureModel, ecModel, view, payload, api) {
     return targetInfo.xAxisDeclared && !targetInfo.yAxisDeclared ? 'lineX' : !targetInfo.xAxisDeclared && targetInfo.yAxisDeclared ? 'lineY' : 'rect';
   })).enableBrush(zoomActive ? {
     brushType: 'auto',
-    brushStyle: {
-      // FIXME user customized?
-      lineWidth: 0,
-      fill: 'rgba(0,0,0,0.2)'
-    }
+    brushStyle: featureModel.getModel('brushStyle').getItemStyle()
   } : false);
 }
 

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,21 @@ 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,
+    featureName: 'magicType'
   });
 };
 

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

@@ -69,7 +69,8 @@ var proto = SaveAsImage.prototype;
 proto.onclick = function (ecModel, api) {
   var model = this.model;
   var title = model.get('name') || ecModel.get('title.0.text') || 'echarts';
-  var type = model.get('type', true) || 'png';
+  var isSvg = api.getZr().painter.getType() === 'svg';
+  var type = isSvg ? 'svg' : model.get('type', true) || 'png';
   var url = api.getConnectedDataURL({
     type: type,
     backgroundColor: model.get('backgroundColor', true) || ecModel.get('backgroundColor') || '#fff',
@@ -84,7 +85,8 @@ proto.onclick = function (ecModel, api) {
     $a.target = '_blank';
     $a.href = url;
     var evt = new MouseEvent('click', {
-      view: window,
+      // some micro front-end framework， window maybe is a Proxy
+      view: document.defaultView,
       bubbles: true,
       cancelable: false
     });

package/lib/component/tooltip/TooltipContent.js

@@ -24,6 +24,8 @@ var zrColor = require("zrender/lib/tool/color");
 
 var eventUtil = require("zrender/lib/core/event");
 
+var domUtil = require("zrender/lib/core/dom");
+
 var env = require("zrender/lib/core/env");
 
 var formatUtil = require("../../util/format");
@@ -76,7 +78,18 @@ function assembleFont(textStyleModel) {
   var color = textStyleModel.getTextColor();
   color && cssText.push('color:' + color);
   cssText.push('font:' + textStyleModel.getFont());
-  fontSize && cssText.push('line-height:' + Math.round(fontSize * 3 / 2) + 'px');
+  var lineHeight = textStyleModel.get('lineHeight');
+
+  if (lineHeight == null) {
+    lineHeight = Math.round(fontSize * 3 / 2);
+  }
+
+  fontSize && cssText.push('line-height:' + lineHeight + 'px');
+  var shadowColor = textStyleModel.get('textShadowColor');
+  var shadowBlur = textStyleModel.get('textShadowBlur') || 0;
+  var shadowOffsetX = textStyleModel.get('textShadowOffsetX') || 0;
+  var shadowOffsetY = textStyleModel.get('textShadowOffsetY') || 0;
+  shadowBlur && cssText.push('text-shadow:' + shadowOffsetX + 'px ' + shadowOffsetY + 'px ' + shadowBlur + 'px ' + shadowColor);
   each(['decoration', 'align'], function (name) {
     var val = textStyleModel.get(name);
     val && cssText.push('text-' + name + ':' + val);
@@ -124,24 +137,70 @@ function assembleCssText(tooltipModel) {
   }
 
   return cssText.join(';') + ';';
+} // If not able to make, do not modify the input `out`.
+
+
+function makeStyleCoord(out, zr, appendToBody, zrX, zrY) {
+  var zrPainter = zr && zr.painter;
+
+  if (appendToBody) {
+    var zrViewportRoot = zrPainter && zrPainter.getViewportRoot();
+
+    if (zrViewportRoot) {
+      // Some APPs might use scale on body, so we support CSS transform here.
+      domUtil.transformLocalCoord(out, zrViewportRoot, document.body, zrX, zrY);
+    }
+  } else {
+    out[0] = zrX;
+    out[1] = zrY; // xy should be based on canvas root. But tooltipContent is
+    // the sibling of canvas root. So padding of ec container
+    // should be considered here.
+
+    var viewportRootOffset = zrPainter && zrPainter.getViewportRootOffset();
+
+    if (viewportRootOffset) {
+      out[0] += viewportRootOffset.offsetLeft;
+      out[1] += viewportRootOffset.offsetTop;
+    }
+  }
+
+  out[2] = out[0] / zr.getWidth(); // The ratio of left to width
+
+  out[3] = out[1] / zr.getHeight(); // The ratio of top to height
 }
 /**
  * @alias module:echarts/component/tooltip/TooltipContent
+ * @param {HTMLElement} container
+ * @param {ExtensionAPI} api
+ * @param {Object} [opt]
+ * @param {boolean} [opt.appendToBody]
+ *        `false`: the DOM element will be inside the container. Default value.
+ *        `true`: the DOM element will be appended to HTML body, which avoid
+ *                some overflow clip but intrude outside of the container.
  * @constructor
  */
 
 
-function TooltipContent(container, api) {
+function TooltipContent(container, api, opt) {
   if (env.wxa) {
     return null;
   }
 
   var el = document.createElement('div');
-  var zr = this._zr = api.getZr();
+  el.domBelongToZr = true;
   this.el = el;
-  this._x = api.getWidth() / 2;
-  this._y = api.getHeight() / 2;
-  container.appendChild(el);
+  var zr = this._zr = api.getZr();
+  var appendToBody = this._appendToBody = opt && opt.appendToBody;
+  this._styleCoord = [0, 0, 0, 0]; // [left, top, left/width, top/height]
+
+  makeStyleCoord(this._styleCoord, zr, appendToBody, api.getWidth() / 2, api.getHeight() / 2);
+
+  if (appendToBody) {
+    document.body.appendChild(el);
+  } else {
+    container.appendChild(el);
+  }
+
   this._container = container;
   this._show = false;
   /**
@@ -175,7 +234,8 @@ function TooltipContent(container, api) {
       // Try trigger zrender event to avoid mouse
       // in and out shape too frequently
       var handler = zr.handler;
-      eventUtil.normalizeEvent(container, e, true);
+      var zrViewportRoot = zr.painter.getViewportRoot();
+      eventUtil.normalizeEvent(zrViewportRoot, e, true);
       handler.dispatch('mousemove', e);
     }
   };
@@ -203,7 +263,7 @@ TooltipContent.prototype = {
   /**
    * Update when tooltip is rendered
    */
-  update: function () {
+  update: function (tooltipModel) {
     // FIXME
     // Move this logic to ec main?
     var container = this._container;
@@ -212,22 +272,41 @@ TooltipContent.prototype = {
 
     if (domStyle.position !== 'absolute' && stl.position !== 'absolute') {
       domStyle.position = 'relative';
-    } // Hide the tooltip
+    }
+
+    var alwaysShowContent = tooltipModel.get('alwaysShowContent');
+    alwaysShowContent && this._moveTooltipIfResized(); // Hide the tooltip
     // PENDING
     // this.hide();
+  },
+
+  /**
+   * when `alwaysShowContent` is true,
+   * we should move the tooltip after chart resized
+   */
+  _moveTooltipIfResized: function () {
+    var ratioX = this._styleCoord[2]; // The ratio of left to width
 
+    var ratioY = this._styleCoord[3]; // The ratio of top to height
+
+    var realX = ratioX * this._zr.getWidth();
+
+    var realY = ratioY * this._zr.getHeight();
+
+    this.moveTo(realX, realY);
   },
   show: function (tooltipModel) {
     clearTimeout(this._hideTimeout);
     var el = this.el;
+    var styleCoord = this._styleCoord;
     el.style.cssText = gCssText + assembleCssText(tooltipModel) // Because of the reason described in:
     // http://stackoverflow.com/questions/21125587/css3-transition-not-working-in-chrome-anymore
     // we should set initial value to `left` and `top`.
-    + ';left:' + this._x + 'px;top:' + this._y + 'px;' + (tooltipModel.get('extraCssText') || '');
-    el.style.display = el.innerHTML ? 'block' : 'none'; // If mouse occsionally move over the tooltip, a mouseout event will be
-    // triggered by canvas, and cuase some unexpectable result like dragging
+    + ';left:' + styleCoord[0] + 'px;top:' + styleCoord[1] + 'px;' + (tooltipModel.get('extraCssText') || '');
+    el.style.display = el.innerHTML ? 'block' : 'none'; // If mouse occasionally move over the tooltip, a mouseout event will be
+    // triggered by canvas, and cause some unexpectable result like dragging
     // stop, "unfocusAdjacency". Here `pointer-events: none` is used to solve
-    // it. Although it is not suppored by IE8~IE10, fortunately it is a rare
+    // it. Although it is not supported by IE8~IE10, fortunately it is a rare
     // scenario.
 
     el.style.pointerEvents = this._enterable ? 'auto' : 'none';
@@ -243,23 +322,12 @@ TooltipContent.prototype = {
     var el = this.el;
     return [el.clientWidth, el.clientHeight];
   },
-  moveTo: function (x, y) {
-    // xy should be based on canvas root. But tooltipContent is
-    // the sibling of canvas root. So padding of ec container
-    // should be considered here.
-    var zr = this._zr;
-    var viewportRootOffset;
-
-    if (zr && zr.painter && (viewportRootOffset = zr.painter.getViewportRootOffset())) {
-      x += viewportRootOffset.offsetLeft;
-      y += viewportRootOffset.offsetTop;
-    }
-
+  moveTo: function (zrX, zrY) {
+    var styleCoord = this._styleCoord;
+    makeStyleCoord(styleCoord, this._zr, this._appendToBody, zrX, zrY);
     var style = this.el.style;
-    style.left = x + 'px';
-    style.top = y + 'px';
-    this._x = x;
-    this._y = y;
+    style.left = styleCoord[0] + 'px';
+    style.top = styleCoord[1] + 'px';
   },
   hide: function () {
     this.el.style.display = 'none';
@@ -268,7 +336,7 @@ TooltipContent.prototype = {
   hideLater: function (time) {
     if (this._show && !(this._inContent && this._enterable)) {
       if (time) {
-        this._hideDelay = time; // Set show false to avoid invoke hideLater mutiple times
+        this._hideDelay = time; // Set show false to avoid invoke hideLater multiple times
 
         this._show = false;
         this._hideTimeout = setTimeout(zrUtil.bind(this.hide, this), time);
@@ -280,6 +348,9 @@ TooltipContent.prototype = {
   isShow: function () {
     return this._show;
   },
+  dispose: function () {
+    this.el.parentNode.removeChild(this.el);
+  },
   getOuterSize: function () {
     var width = this.el.clientWidth;
     var height = this.el.clientHeight; // Consider browser compatibility.

package/lib/component/tooltip/TooltipRichContent.js

@@ -22,6 +22,8 @@ var zrUtil = require("zrender/lib/core/util");
 
 var Text = require("zrender/lib/graphic/Text");
 
+var graphicUtil = require("../../util/graphic");
+
 /*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
@@ -41,13 +43,24 @@ var Text = require("zrender/lib/graphic/Text");
 * under the License.
 */
 // import Group from 'zrender/src/container/Group';
+function makeStyleCoord(out, zr, zrX, zrY) {
+  out[0] = zrX;
+  out[1] = zrY;
+  out[2] = out[0] / zr.getWidth(); // The ratio of left to width
 
+  out[3] = out[1] / zr.getHeight(); // The ratio of top to height
+}
 /**
  * @alias module:echarts/component/tooltip/TooltipRichContent
  * @constructor
  */
+
+
 function TooltipRichContent(api) {
-  this._zr = api.getZr();
+  var zr = this._zr = api.getZr();
+  this._styleCoord = [0, 0, 0, 0]; // [left, top, left/width, top/height]
+
+  makeStyleCoord(this._styleCoord, zr, api.getWidth() / 2, api.getHeight() / 2);
   this._show = false;
   /**
    * @private
@@ -68,7 +81,25 @@ TooltipRichContent.prototype = {
   /**
    * Update when tooltip is rendered
    */
-  update: function () {// noop
+  update: function (tooltipModel) {
+    var alwaysShowContent = tooltipModel.get('alwaysShowContent');
+    alwaysShowContent && this._moveTooltipIfResized();
+  },
+
+  /**
+   * when `alwaysShowContent` is true,
+   * we should move the tooltip after chart resized
+   */
+  _moveTooltipIfResized: function () {
+    var ratioX = this._styleCoord[2]; // The ratio of left to width
+
+    var ratioY = this._styleCoord[3]; // The ratio of top to height
+
+    var realX = ratioX * this._zr.getWidth();
+
+    var realY = ratioY * this._zr.getHeight();
+
+    this.moveTo(realX, realY);
   },
   show: function (tooltipModel) {
     if (this._hideTimeout) {
@@ -123,16 +154,24 @@ TooltipRichContent.prototype = {
       startId = text.indexOf('{marker');
     }
 
+    var textStyleModel = tooltipModel.getModel('textStyle');
+    var fontSize = textStyleModel.get('fontSize');
+    var lineHeight = tooltipModel.get('textLineHeight');
+
+    if (lineHeight == null) {
+      lineHeight = Math.round(fontSize * 3 / 2);
+    }
+
     this.el = new Text({
-      style: {
+      style: graphicUtil.setTextStyle({}, textStyleModel, {
         rich: markers,
         text: content,
-        textLineHeight: 20,
         textBackgroundColor: tooltipModel.get('backgroundColor'),
         textBorderRadius: tooltipModel.get('borderRadius'),
         textFill: tooltipModel.get('textStyle.color'),
-        textPadding: tooltipModel.get('padding')
-      },
+        textPadding: tooltipModel.get('padding'),
+        textLineHeight: lineHeight
+      }),
       z: tooltipModel.get('z')
     });
 
@@ -167,7 +206,9 @@ TooltipRichContent.prototype = {
   },
   moveTo: function (x, y) {
     if (this.el) {
-      this.el.attr('position', [x, y]);
+      var styleCoord = this._styleCoord;
+      makeStyleCoord(styleCoord, this._zr, x, y);
+      this.el.attr('position', [styleCoord[0], styleCoord[1]]);
     }
   },
   hide: function () {
@@ -180,7 +221,7 @@ TooltipRichContent.prototype = {
   hideLater: function (time) {
     if (this._show && !(this._inContent && this._enterable)) {
       if (time) {
-        this._hideDelay = time; // Set show false to avoid invoke hideLater mutiple times
+        this._hideDelay = time; // Set show false to avoid invoke hideLater multiple times
 
         this._show = false;
         this._hideTimeout = setTimeout(zrUtil.bind(this.hide, this), time);
@@ -192,6 +233,13 @@ TooltipRichContent.prototype = {
   isShow: function () {
     return this._show;
   },
+  dispose: function () {
+    clearTimeout(this._hideTimeout);
+
+    if (this.el) {
+      this._zr.remove(this.el);
+    }
+  },
   getOuterSize: function () {
     var size = this.getSize();
     return {

package/lib/component/tooltip/TooltipView.js

@@ -93,7 +93,9 @@ var _default = echarts.extendComponentView({
     var tooltipContent;
 
     if (this._renderMode === 'html') {
-      tooltipContent = new TooltipContent(api.getDom(), api);
+      tooltipContent = new TooltipContent(api.getDom(), api, {
+        appendToBody: tooltipModel.get('appendToBody', true)
+      });
       this._newLine = '<br/>';
     } else {
       tooltipContent = new TooltipRichContent(api);
@@ -141,7 +143,7 @@ var _default = echarts.extendComponentView({
 
     this._alwaysShowContent = tooltipModel.get('alwaysShowContent');
     var tooltipContent = this._tooltipContent;
-    tooltipContent.update();
+    tooltipContent.update(tooltipModel);
     tooltipContent.setEnterable(tooltipModel.get('enterable'));
 
     this._initGlobalListener();
@@ -228,7 +230,6 @@ var _default = echarts.extendComponentView({
         offsetX: payload.x,
         offsetY: payload.y,
         position: payload.position,
-        event: {},
         dataByCoordSys: payload.dataByCoordSys,
         tooltipOption: payload.tooltipOption
       }, dispatchAction);
@@ -246,8 +247,7 @@ var _default = echarts.extendComponentView({
           offsetX: cx,
           offsetY: cy,
           position: payload.position,
-          target: pointInfo.el,
-          event: {}
+          target: pointInfo.el
         }, dispatchAction);
       }
     } else if (payload.x != null && payload.y != null) {
@@ -263,8 +263,7 @@ var _default = echarts.extendComponentView({
         offsetX: payload.x,
         offsetY: payload.y,
         position: payload.position,
-        target: api.getZr().findHover(payload.x, payload.y).target,
-        event: {}
+        target: api.getZr().findHover(payload.x, payload.y).target
       }, dispatchAction);
     }
   },
@@ -348,7 +347,7 @@ var _default = echarts.extendComponentView({
   _showOrMove: function (tooltipModel, cb) {
     // showDelay is used in this case: tooltip.enterable is set
     // as true. User intent to move mouse into tooltip and click
-    // something. `showDelay` makes it easyer to enter the content
+    // something. `showDelay` makes it easier to enter the content
     // but tooltip do not move immediately.
     var delay = tooltipModel.get('showDelay');
     cb = zrUtil.bind(cb, this);
@@ -414,7 +413,7 @@ var _default = echarts.extendComponentView({
           }
         }); // Default tooltip content
         // FIXME
-        // (1) shold be the first data which has name?
+        // (1) should be the first data which has name?
         // (2) themeRiver, firstDataIndex is array, and first line is unnecessary.
 
         var firstLine = valueLabel;
@@ -452,7 +451,7 @@ var _default = echarts.extendComponentView({
     var dataModel = el.dataModel || seriesModel;
     var dataIndex = el.dataIndex;
     var dataType = el.dataType;
-    var data = dataModel.getData();
+    var data = dataModel.getData(dataType);
     var tooltipModel = buildTooltipModel([data.getItemModel(dataIndex), dataModel, seriesModel && (seriesModel.coordinateSystem || {}).model, this._tooltipModel]);
     var tooltipTrigger = tooltipModel.get('trigger');
 
@@ -504,7 +503,7 @@ var _default = echarts.extendComponentView({
     var subTooltipModel = new Model(tooltipOpt, this._tooltipModel, this._ecModel);
     var defaultHtml = subTooltipModel.get('content');
     var asyncTicket = Math.random(); // Do not check whether `trigger` is 'none' here, because `trigger`
-    // only works on cooridinate system. In fact, we have not found case
+    // only works on coordinate system. In fact, we have not found case
     // that requires setting `trigger` nothing on component yet.
 
     this._showOrMove(subTooltipModel, function () {
@@ -658,7 +657,7 @@ var _default = echarts.extendComponentView({
       return;
     }
 
-    this._tooltipContent.hide();
+    this._tooltipContent.dispose();
 
     globalListener.unregister('itemTooltip', api);
   }

package/lib/component/visualMap/PiecewiseModel.js

@@ -417,20 +417,17 @@ var resetMethods = {
 
     thisOption.precision = precision;
     splitStep = +splitStep.toFixed(precision);
-    var index = 0;
 
     if (thisOption.minOpen) {
       pieceList.push({
-        index: index++,
         interval: [-Infinity, dataExtent[0]],
         close: [0, 0]
       });
     }
 
-    for (var curr = dataExtent[0], len = index + splitNumber; index < len; curr += splitStep) {
+    for (var index = 0, curr = dataExtent[0]; index < splitNumber; curr += splitStep, index++) {
       var max = index === splitNumber - 1 ? dataExtent[1] : curr + splitStep;
       pieceList.push({
-        index: index++,
         interval: [curr, max],
         close: [1, 1]
       });
@@ -438,14 +435,14 @@ var resetMethods = {
 
     if (thisOption.maxOpen) {
       pieceList.push({
-        index: index++,
         interval: [dataExtent[1], Infinity],
         close: [0, 0]
       });
     }
 
     reformIntervals(pieceList);
-    zrUtil.each(pieceList, function (piece) {
+    zrUtil.each(pieceList, function (piece, index) {
+      piece.index = index;
       piece.text = this.formatValueText(piece.interval);
     }, this);
   },

package/lib/component/visualMap/VisualMapModel.js

@@ -398,7 +398,7 @@ var VisualMapModel = echarts.extendComponentModel({
       // Originally we use visualMap.color as the default color, but setOption at
       // the second time the default color will be erased. So we change to use
       // constant DEFAULT_COLOR.
-      // If user do not want the defualt color, set inRange: {color: null}.
+      // If user do not want the default color, set inRange: {color: null}.
 
 
       base.inRange = base.inRange || {

package/lib/coord/Axis.js

@@ -111,7 +111,7 @@ Axis.prototype = {
    * @return {boolean}
    */
   containData: function (data) {
-    return this.contain(this.dataToCoord(data));
+    return this.scale.contain(data);
   },
 
   /**
@@ -194,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.
@@ -219,6 +219,34 @@ Axis.prototype = {
     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,

package/lib/coord/View.js

@@ -230,6 +230,15 @@ View.prototype = {
     matrix.invert(this.invTransform, this.transform);
     this.decomposeTransform();
   },
+  getTransformInfo: function () {
+    var roamTransform = this._roamTransformable.transform;
+    var rawTransformable = this._rawTransformable;
+    return {
+      roamTransform: roamTransform ? zrUtil.slice(roamTransform) : matrix.create(),
+      rawScale: zrUtil.slice(rawTransformable.scale),
+      rawPosition: zrUtil.slice(rawTransformable.position)
+    };
+  },
 
   /**
    * @return {module:zrender/core/BoundingRect}