echarts 4.7.0 → 4.8.0

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

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/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;

package/lib/data/Tree.js

@@ -281,14 +281,13 @@ TreeNode.prototype = {
 
     var hostTree = this.hostTree;
     var itemModel = hostTree.data.getItemModel(this.dataIndex);
-    var levelModel = this.getLevelModel();
-    var leavesModel;
+    var levelModel = this.getLevelModel(); // FIXME: refactor levelModel to "beforeLink", and remove levelModel here.
 
-    if (!levelModel && (this.children.length === 0 || this.children.length !== 0 && this.isExpand === false)) {
-      leavesModel = this.getLeavesModel();
+    if (levelModel) {
+      return itemModel.getModel(path, levelModel.getModel(path));
+    } else {
+      return itemModel.getModel(path);
     }
-
-    return itemModel.getModel(path, (levelModel || leavesModel || hostTree.hostModel).getModel(path));
   },
 
   /**
@@ -298,13 +297,6 @@ TreeNode.prototype = {
     return (this.hostTree.levelModels || [])[this.depth];
   },
 
-  /**
-   * @return {module:echarts/model/Model}
-   */
-  getLeavesModel: function () {
-    return this.hostTree.leavesModel;
-  },
-
   /**
    * @example
    *  setItemVisual('color', color);
@@ -376,10 +368,9 @@ TreeNode.prototype = {
  * @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, levelOptions) {
   /**
    * @type {module:echarts/data/Tree~TreeNode}
    * @readOnly
@@ -414,7 +405,6 @@ function Tree(hostModel, levelOptions, leavesOption) {
   this.levelModels = zrUtil.map(levelOptions || [], function (levelDefine) {
     return new Model(levelDefine, hostModel, hostModel.ecModel);
   });
-  this.leavesModel = new Model(leavesOption || {}, hostModel, hostModel.ecModel);
 }
 
 Tree.prototype = {
@@ -503,12 +493,11 @@ Tree.prototype = {
  * @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, beforeLink) {
-  var tree = new Tree(hostModel, treeOptions.levels, treeOptions.leaves);
+  var tree = new Tree(hostModel, treeOptions && treeOptions.levels);
   var listData = [];
   var dimMax = 1;
   buildHierarchy(dataRoot);
@@ -538,13 +527,13 @@ Tree.createTree = function (dataRoot, hostModel, treeOptions, beforeLink) {
   });
   var list = new List(dimensionsInfo, hostModel);
   list.initData(listData);
+  beforeLink && beforeLink(list);
   linkList({
     mainData: list,
     struct: tree,
     structAttr: 'tree'
   });
   tree.update();
-  beforeLink && beforeLink(list);
   return tree;
 };
 /**

package/lib/echarts.js

@@ -101,9 +101,9 @@ var each = zrUtil.each;
 var isFunction = zrUtil.isFunction;
 var isObject = zrUtil.isObject;
 var parseClassType = ComponentModel.parseClassType;
-var version = '4.7.0';
+var version = '4.8.0';
 var dependencies = {
-  zrender: '4.3.0'
+  zrender: '4.3.1'
 };
 var TEST_FRAME_REMAIN_TIME = 1;
 var PRIORITY_PROCESSOR_FILTER = 1000;
@@ -498,7 +498,7 @@ echartsProto.getRenderedCanvas = function (opts) {
  */
 
 
-echartsProto.getSvgDataUrl = function () {
+echartsProto.getSvgDataURL = function () {
   if (!env.svgSupported) {
     return;
   }
@@ -509,7 +509,7 @@ echartsProto.getSvgDataUrl = function () {
   zrUtil.each(list, function (el) {
     el.stopAnimation(true);
   });
-  return zr.painter.pathToDataUrl();
+  return zr.painter.toDataURL();
 };
 /**
  * @return {string}
@@ -544,7 +544,7 @@ echartsProto.getDataURL = function (opts) {
       }
     });
   });
-  var url = this._zr.painter.getType() === 'svg' ? this.getSvgDataUrl() : this.getRenderedCanvas(opts).toDataURL('image/' + (opts && opts.type || 'png'));
+  var url = this._zr.painter.getType() === 'svg' ? this.getSvgDataURL() : this.getRenderedCanvas(opts).toDataURL('image/' + (opts && opts.type || 'png'));
   each(excludesComponentViews, function (view) {
     view.group.ignore = false;
   });
@@ -569,6 +569,7 @@ echartsProto.getConnectedDataURL = function (opts) {
     return;
   }
 
+  var isSvg = opts.type === 'svg';
   var groupId = this.group;
   var mathMin = Math.min;
   var mathMax = Math.max;
@@ -583,7 +584,7 @@ echartsProto.getConnectedDataURL = function (opts) {
     var dpr = opts && opts.pixelRatio || 1;
     zrUtil.each(instances, function (chart, id) {
       if (chart.group === groupId) {
-        var canvas = chart.getRenderedCanvas(zrUtil.clone(opts));
+        var canvas = isSvg ? chart.getZr().painter.getSvgDom().innerHTML : chart.getRenderedCanvas(zrUtil.clone(opts));
         var boundingRect = chart.getDom().getBoundingClientRect();
         left = mathMin(boundingRect.left, left);
         top = mathMin(boundingRect.top, top);
@@ -603,36 +604,58 @@ echartsProto.getConnectedDataURL = function (opts) {
     var width = right - left;
     var height = bottom - top;
     var targetCanvas = zrUtil.createCanvas();
-    targetCanvas.width = width;
-    targetCanvas.height = height;
-    var zr = zrender.init(targetCanvas); // Background between the charts
-
-    if (opts.connectedBackgroundColor) {
-      zr.add(new graphic.Rect({
-        shape: {
-          x: 0,
-          y: 0,
-          width: width,
-          height: height
-        },
-        style: {
-          fill: opts.connectedBackgroundColor
-        }
-      }));
-    }
+    var zr = zrender.init(targetCanvas, {
+      renderer: isSvg ? 'svg' : 'canvas'
+    });
+    zr.resize({
+      width: width,
+      height: height
+    });
 
-    each(canvasList, function (item) {
-      var img = new graphic.Image({
-        style: {
-          x: item.left * dpr - left,
-          y: item.top * dpr - top,
-          image: item.dom
-        }
+    if (isSvg) {
+      var content = '';
+      each(canvasList, function (item) {
+        var x = item.left - left;
+        var y = item.top - top;
+        content += '<g transform="translate(' + x + ',' + y + ')">' + item.dom + '</g>';
       });
-      zr.add(img);
-    });
-    zr.refreshImmediately();
-    return targetCanvas.toDataURL('image/' + (opts && opts.type || 'png'));
+      zr.painter.getSvgRoot().innerHTML = content;
+
+      if (opts.connectedBackgroundColor) {
+        zr.painter.setBackgroundColor(opts.connectedBackgroundColor);
+      }
+
+      zr.refreshImmediately();
+      return zr.painter.toDataURL();
+    } else {
+      // Background between the charts
+      if (opts.connectedBackgroundColor) {
+        zr.add(new graphic.Rect({
+          shape: {
+            x: 0,
+            y: 0,
+            width: width,
+            height: height
+          },
+          style: {
+            fill: opts.connectedBackgroundColor
+          }
+        }));
+      }
+
+      each(canvasList, function (item) {
+        var img = new graphic.Image({
+          style: {
+            x: item.left * dpr - left,
+            y: item.top * dpr - top,
+            image: item.dom
+          }
+        });
+        zr.add(img);
+      });
+      zr.refreshImmediately();
+      return targetCanvas.toDataURL('image/' + (opts && opts.type || 'png'));
+    }
   } else {
     return this.getDataURL(opts);
   }

package/lib/langEN.js

@@ -84,6 +84,32 @@ var _default = {
       lang: ['Right Click to Save Image']
     }
   },
+  series: {
+    typeNames: {
+      pie: 'Pie chart',
+      bar: 'Bar chart',
+      line: 'Line chart',
+      scatter: 'Scatter plot',
+      effectScatter: 'Ripple scatter plot',
+      radar: 'Radar chart',
+      tree: 'Tree',
+      treemap: 'Treemap',
+      boxplot: 'Boxplot',
+      candlestick: 'Candlestick',
+      k: 'K line chart',
+      heatmap: 'Heat map',
+      map: 'Map',
+      parallel: 'Parallel coordinate map',
+      lines: 'Line graph',
+      graph: 'Relationship graph',
+      sankey: 'Sankey diagram',
+      funnel: 'Funnel chart',
+      gauge: 'Guage',
+      pictorialBar: 'Pictorial bar',
+      themeRiver: 'Theme River Map',
+      sunburst: 'Sunburst'
+    }
+  },
   aria: {
     general: {
       withTitle: 'This is a chart about "{title}"',

package/lib/loading/default.js

@@ -22,6 +22,8 @@ var zrUtil = require("zrender/lib/core/util");
 
 var graphic = require("../util/graphic");
 
+var textContain = require("zrender/lib/contain/text");
+
 /*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
@@ -54,11 +56,16 @@ function _default(api, opts) {
   opts = opts || {};
   zrUtil.defaults(opts, {
     text: 'loading',
-    color: '#c23531',
     textColor: '#000',
+    fontSize: '12px',
     maskColor: 'rgba(255, 255, 255, 0.8)',
+    showSpinner: true,
+    color: '#c23531',
+    spinnerRadius: 10,
+    lineWidth: 5,
     zlevel: 0
   });
+  var group = new graphic.Group();
   var mask = new graphic.Rect({
     style: {
       fill: opts.maskColor
@@ -66,24 +73,13 @@ function _default(api, opts) {
     zlevel: opts.zlevel,
     z: 10000
   });
-  var arc = new graphic.Arc({
-    shape: {
-      startAngle: -PI / 2,
-      endAngle: -PI / 2 + 0.1,
-      r: 10
-    },
-    style: {
-      stroke: opts.color,
-      lineCap: 'round',
-      lineWidth: 5
-    },
-    zlevel: opts.zlevel,
-    z: 10001
-  });
+  group.add(mask);
+  var font = opts.fontSize + ' sans-serif';
   var labelRect = new graphic.Rect({
     style: {
       fill: 'none',
       text: opts.text,
+      font: font,
       textPosition: 'right',
       textDistance: 10,
       textFill: opts.textColor
@@ -91,25 +87,45 @@ function _default(api, opts) {
     zlevel: opts.zlevel,
     z: 10001
   });
-  arc.animateShape(true).when(1000, {
-    endAngle: PI * 3 / 2
-  }).start('circularInOut');
-  arc.animateShape(true).when(1000, {
-    startAngle: PI * 3 / 2
-  }).delay(300).start('circularInOut');
-  var group = new graphic.Group();
-  group.add(arc);
   group.add(labelRect);
-  group.add(mask); // Inject resize
+
+  if (opts.showSpinner) {
+    var arc = new graphic.Arc({
+      shape: {
+        startAngle: -PI / 2,
+        endAngle: -PI / 2 + 0.1,
+        r: opts.spinnerRadius
+      },
+      style: {
+        stroke: opts.color,
+        lineCap: 'round',
+        lineWidth: opts.lineWidth
+      },
+      zlevel: opts.zlevel,
+      z: 10001
+    });
+    arc.animateShape(true).when(1000, {
+      endAngle: PI * 3 / 2
+    }).start('circularInOut');
+    arc.animateShape(true).when(1000, {
+      startAngle: PI * 3 / 2
+    }).delay(300).start('circularInOut');
+    group.add(arc);
+  } // Inject resize
+
 
   group.resize = function () {
-    var cx = api.getWidth() / 2;
+    var textWidth = textContain.getWidth(opts.text, font);
+    var r = opts.showSpinner ? opts.spinnerRadius : 0; // cx = (containerWidth - arcDiameter - textDistance - textWidth) / 2
+    // textDistance needs to be calculated when both animation and text exist
+
+    var cx = (api.getWidth() - r * 2 - (opts.showSpinner && textWidth ? 10 : 0) - textWidth) / 2 // only show the text
+    - (opts.showSpinner ? 0 : textWidth / 2);
     var cy = api.getHeight() / 2;
-    arc.setShape({
+    opts.showSpinner && arc.setShape({
       cx: cx,
       cy: cy
     });
-    var r = arc.shape.r;
     labelRect.setShape({
       x: cx - r,
       y: cy - r,

package/lib/model/Series.js

@@ -569,7 +569,7 @@ function dataTaskReset(context) {
 
 function dataTaskProgress(param, context) {
   // Avoid repead cloneShallow when data just created in reset.
-  if (param.end > context.outputData.count()) {
+  if (context.outputData && param.end > context.outputData.count()) {
     context.model.getRawData().cloneShallow(context.outputData);
   }
 } // TODO refactor

package/lib/util/format.js

@@ -45,7 +45,7 @@ var numberUtil = require("./number");
 // import Text from 'zrender/src/graphic/Text';
 
 /**
- * 每三位默认加,格式化
+ * add commas after every three numbers
  * @param {string|number} x
  * @return {string}
  */
@@ -261,6 +261,22 @@ function getTextBoundingRect(opt) {
 function getTextRect(text, font, textAlign, textVerticalAlign, textPadding, rich, truncate, textLineHeight) {
   return textContain.getBoundingRect(text, font, textAlign, textVerticalAlign, textPadding, textLineHeight, rich, truncate);
 }
+/**
+ * open new tab
+ * @param {string} link url
+ * @param {string} target blank or self
+ */
+
+
+function windowOpen(link, target) {
+  if (target === '_blank' || target === 'blank') {
+    var blank = window.open();
+    blank.opener = null;
+    blank.location = link;
+  } else {
+    window.open(link, target);
+  }
+}
 
 exports.addCommas = addCommas;
 exports.toCamelCase = toCamelCase;
@@ -273,4 +289,5 @@ exports.formatTime = formatTime;
 exports.capitalFirst = capitalFirst;
 exports.truncateText = truncateText;
 exports.getTextBoundingRect = getTextBoundingRect;
-exports.getTextRect = getTextRect;
+exports.getTextRect = getTextRect;
+exports.windowOpen = windowOpen;

package/lib/util/graphic.js

@@ -727,11 +727,13 @@ function getHighlightDigit(highlightKey) {
  * @param {Object} opt Check `opt` of `setTextStyleCommon` to find other props.
  * @param {string|Function} [opt.defaultText]
  * @param {module:echarts/model/Model} [opt.labelFetcher] Fetch text by
- *      `opt.labelFetcher.getFormattedLabel(opt.labelDataIndex, 'normal'/'emphasis', null, opt.labelDimIndex)`
- * @param {module:echarts/model/Model} [opt.labelDataIndex] Fetch text by
- *      `opt.textFetcher.getFormattedLabel(opt.labelDataIndex, 'normal'/'emphasis', null, opt.labelDimIndex)`
- * @param {module:echarts/model/Model} [opt.labelDimIndex] Fetch text by
- *      `opt.textFetcher.getFormattedLabel(opt.labelDataIndex, 'normal'/'emphasis', null, opt.labelDimIndex)`
+ *      `opt.labelFetcher.getFormattedLabel(opt.labelDataIndex, 'normal'/'emphasis', null, opt.labelDimIndex, opt.labelProp)`
+ * @param {number} [opt.labelDataIndex] Fetch text by
+ *      `opt.textFetcher.getFormattedLabel(opt.labelDataIndex, 'normal'/'emphasis', null, opt.labelDimIndex, opt.labelProp)`
+ * @param {number} [opt.labelDimIndex] Fetch text by
+ *      `opt.textFetcher.getFormattedLabel(opt.labelDataIndex, 'normal'/'emphasis', null, opt.labelDimIndex, opt.labelProp)`
+ * @param {string} [opt.labelProp] Fetch text by
+ *      `opt.textFetcher.getFormattedLabel(opt.labelDataIndex, 'normal'/'emphasis', null, opt.labelDimIndex, opt.labelProp)`
  * @param {Object} [normalSpecified]
  * @param {Object} [emphasisSpecified]
  */
@@ -741,7 +743,8 @@ function setLabelStyle(normalStyle, emphasisStyle, normalModel, emphasisModel, o
   opt = opt || EMPTY_OBJ;
   var labelFetcher = opt.labelFetcher;
   var labelDataIndex = opt.labelDataIndex;
-  var labelDimIndex = opt.labelDimIndex; // This scenario, `label.normal.show = true; label.emphasis.show = false`,
+  var labelDimIndex = opt.labelDimIndex;
+  var labelProp = opt.labelProp; // This scenario, `label.normal.show = true; label.emphasis.show = false`,
   // is not supported util someone requests.
 
   var showNormal = normalModel.getShallow('show');
@@ -753,7 +756,7 @@ function setLabelStyle(normalStyle, emphasisStyle, normalModel, emphasisModel, o
 
   if (showNormal || showEmphasis) {
     if (labelFetcher) {
-      baseText = labelFetcher.getFormattedLabel(labelDataIndex, 'normal', null, labelDimIndex);
+      baseText = labelFetcher.getFormattedLabel(labelDataIndex, 'normal', null, labelDimIndex, labelProp);
     }
 
     if (baseText == null) {
@@ -762,7 +765,7 @@ function setLabelStyle(normalStyle, emphasisStyle, normalModel, emphasisModel, o
   }
 
   var normalStyleText = showNormal ? baseText : null;
-  var emphasisStyleText = showEmphasis ? zrUtil.retrieve2(labelFetcher ? labelFetcher.getFormattedLabel(labelDataIndex, 'emphasis', null, labelDimIndex) : null, baseText) : null; // Optimize: If style.text is null, text will not be drawn.
+  var emphasisStyleText = showEmphasis ? zrUtil.retrieve2(labelFetcher ? labelFetcher.getFormattedLabel(labelDataIndex, 'emphasis', null, labelDimIndex, labelProp) : null, baseText) : null; // Optimize: If style.text is null, text will not be drawn.
 
   if (normalStyleText != null || emphasisStyleText != null) {
     // Always set `textStyle` even if `normalStyle.text` is null, because default