echarts 4.5.0-rc.2 → 4.8.0

package/lib/chart/helper/Line.js

@@ -161,40 +161,93 @@ function updateSymbolAndLabelBeforeLineUpdate() {
     var textPosition;
     var textAlign;
     var textVerticalAlign;
-    var distance = 5 * invScale; // End
-
-    if (label.__position === 'end') {
-      textPosition = [d[0] * distance + toPos[0], d[1] * distance + toPos[1]];
-      textAlign = d[0] > 0.8 ? 'left' : d[0] < -0.8 ? 'right' : 'center';
-      textVerticalAlign = d[1] > 0.8 ? 'top' : d[1] < -0.8 ? 'bottom' : 'middle';
-    } // Middle
-    else if (label.__position === 'middle') {
-        var halfPercent = percent / 2;
-        var tangent = line.tangentAt(halfPercent);
-        var n = [tangent[1], -tangent[0]];
-        var cp = line.pointAt(halfPercent);
-
-        if (n[1] > 0) {
-          n[0] = -n[0];
-          n[1] = -n[1];
-        }
-
-        textPosition = [cp[0] + n[0] * distance, cp[1] + n[1] * distance];
-        textAlign = 'center';
-        textVerticalAlign = 'bottom';
-        var rotation = -Math.atan2(tangent[1], tangent[0]);
+    var textOrigin;
+    var distance = label.__labelDistance;
+    var distanceX = distance[0] * invScale;
+    var distanceY = distance[1] * invScale;
+    var halfPercent = percent / 2;
+    var tangent = line.tangentAt(halfPercent);
+    var n = [tangent[1], -tangent[0]];
+    var cp = line.pointAt(halfPercent);
+
+    if (n[1] > 0) {
+      n[0] = -n[0];
+      n[1] = -n[1];
+    }
+
+    var dir = tangent[0] < 0 ? -1 : 1;
+
+    if (label.__position !== 'start' && label.__position !== 'end') {
+      var rotation = -Math.atan2(tangent[1], tangent[0]);
+
+      if (toPos[0] < fromPos[0]) {
+        rotation = Math.PI + rotation;
+      }
+
+      label.attr('rotation', rotation);
+    }
 
-        if (toPos[0] < fromPos[0]) {
-          rotation = Math.PI + rotation;
-        }
+    var dy;
 
-        label.attr('rotation', rotation);
-      } // Start
-      else {
-          textPosition = [-d[0] * distance + fromPos[0], -d[1] * distance + fromPos[1]];
-          textAlign = d[0] > 0.8 ? 'right' : d[0] < -0.8 ? 'left' : 'center';
-          textVerticalAlign = d[1] > 0.8 ? 'bottom' : d[1] < -0.8 ? 'top' : 'middle';
-        }
+    switch (label.__position) {
+      case 'insideStartTop':
+      case 'insideMiddleTop':
+      case 'insideEndTop':
+      case 'middle':
+        dy = -distanceY;
+        textVerticalAlign = 'bottom';
+        break;
+
+      case 'insideStartBottom':
+      case 'insideMiddleBottom':
+      case 'insideEndBottom':
+        dy = distanceY;
+        textVerticalAlign = 'top';
+        break;
+
+      default:
+        dy = 0;
+        textVerticalAlign = 'middle';
+    }
+
+    switch (label.__position) {
+      case 'end':
+        textPosition = [d[0] * distanceX + toPos[0], d[1] * distanceY + toPos[1]];
+        textAlign = d[0] > 0.8 ? 'left' : d[0] < -0.8 ? 'right' : 'center';
+        textVerticalAlign = d[1] > 0.8 ? 'top' : d[1] < -0.8 ? 'bottom' : 'middle';
+        break;
+
+      case 'start':
+        textPosition = [-d[0] * distanceX + fromPos[0], -d[1] * distanceY + fromPos[1]];
+        textAlign = d[0] > 0.8 ? 'right' : d[0] < -0.8 ? 'left' : 'center';
+        textVerticalAlign = d[1] > 0.8 ? 'bottom' : d[1] < -0.8 ? 'top' : 'middle';
+        break;
+
+      case 'insideStartTop':
+      case 'insideStart':
+      case 'insideStartBottom':
+        textPosition = [distanceX * dir + fromPos[0], fromPos[1] + dy];
+        textAlign = tangent[0] < 0 ? 'right' : 'left';
+        textOrigin = [-distanceX * dir, -dy];
+        break;
+
+      case 'insideMiddleTop':
+      case 'insideMiddle':
+      case 'insideMiddleBottom':
+      case 'middle':
+        textPosition = [cp[0], cp[1] + dy];
+        textAlign = 'center';
+        textOrigin = [0, -dy];
+        break;
+
+      case 'insideEndTop':
+      case 'insideEnd':
+      case 'insideEndBottom':
+        textPosition = [-distanceX * dir + toPos[0], toPos[1] + dy];
+        textAlign = tangent[0] >= 0 ? 'right' : 'left';
+        textOrigin = [distanceX * dir, -dy];
+        break;
+    }
 
     label.attr({
       style: {
@@ -203,7 +256,8 @@ function updateSymbolAndLabelBeforeLineUpdate() {
         textAlign: label.__textAlign || textAlign
       },
       position: textPosition,
-      scale: [invScale, invScale]
+      scale: [invScale, invScale],
+      origin: textOrigin
     });
   }
 }
@@ -347,6 +401,13 @@ lineProto._updateCommonStl = function (lineData, idx, seriesScope) {
     label.__verticalAlign = labelStyle.textVerticalAlign; // 'start', 'middle', 'end'
 
     label.__position = labelModel.get('position') || 'middle';
+    var distance = labelModel.get('distance');
+
+    if (!zrUtil.isArray(distance)) {
+      distance = [distance, distance];
+    }
+
+    label.__labelDistance = distance;
   }
 
   if (emphasisText != null) {

package/lib/chart/helper/LineDraw.js

@@ -134,9 +134,13 @@ lineDrawProto.incrementalPrepareUpdate = function (lineData) {
   this.group.removeAll();
 };
 
+function isEffectObject(el) {
+  return el.animators && el.animators.length > 0;
+}
+
 lineDrawProto.incrementalUpdate = function (taskParams, lineData) {
   function updateIncrementalAndHover(el) {
-    if (!el.isGroup) {
+    if (!el.isGroup && !isEffectObject(el)) {
       el.incremental = el.useHoverLayer = true;
     }
   }

package/lib/chart/helper/Symbol.js

@@ -267,7 +267,6 @@ symbolProto._updateCommon = function (data, idx, symbolSize, seriesScope) {
 
   var itemStyle = seriesScope && seriesScope.itemStyle;
   var hoverItemStyle = seriesScope && seriesScope.hoverItemStyle;
-  var symbolRotate = seriesScope && seriesScope.symbolRotate;
   var symbolOffset = seriesScope && seriesScope.symbolOffset;
   var labelModel = seriesScope && seriesScope.labelModel;
   var hoverLabelModel = seriesScope && seriesScope.hoverLabelModel;
@@ -280,7 +279,6 @@ symbolProto._updateCommon = function (data, idx, symbolSize, seriesScope) {
 
     itemStyle = itemModel.getModel(normalStyleAccessPath).getItemStyle(['color']);
     hoverItemStyle = itemModel.getModel(emphasisStyleAccessPath).getItemStyle();
-    symbolRotate = itemModel.getShallow('symbolRotate');
     symbolOffset = itemModel.getShallow('symbolOffset');
     labelModel = itemModel.getModel(normalLabelAccessPath);
     hoverLabelModel = itemModel.getModel(emphasisLabelAccessPath);
@@ -291,6 +289,7 @@ symbolProto._updateCommon = function (data, idx, symbolSize, seriesScope) {
   }
 
   var elStyle = symbolPath.style;
+  var symbolRotate = data.getItemVisual(idx, 'symbolRotate');
   symbolPath.attr('rotation', (symbolRotate || 0) * Math.PI / 180 || 0);
 
   if (symbolOffset) {

package/lib/chart/helper/createClipPathFromCoordSys.js

@@ -54,7 +54,10 @@ function createGridClipPath(cartesian, hasAnimation, seriesModel) {
   x -= lineWidth / 2;
   y -= lineWidth / 2;
   width += lineWidth;
-  height += lineWidth;
+  height += lineWidth; // fix: https://github.com/apache/incubator-echarts/issues/11369
+
+  x = Math.floor(x);
+  width = Math.round(width);
   var clipPath = new graphic.Rect({
     shape: {
       x: x,

package/lib/chart/helper/createListFromArray.js

@@ -40,7 +40,7 @@ var CoordinateSystem = require("../../CoordinateSystem");
 
 var _referHelper = require("../../model/referHelper");
 
-var getCoordSysDefineBySeries = _referHelper.getCoordSysDefineBySeries;
+var getCoordSysInfoBySeries = _referHelper.getCoordSysInfoBySeries;
 
 var Source = require("../../data/Source");
 
@@ -48,6 +48,10 @@ var _dataStackHelper = require("../../data/helper/dataStackHelper");
 
 var enableDataStack = _dataStackHelper.enableDataStack;
 
+var _sourceHelper = require("../../data/helper/sourceHelper");
+
+var makeSeriesEncodeForAxisCoordSys = _sourceHelper.makeSeriesEncodeForAxisCoordSys;
+
 /*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
@@ -72,6 +76,7 @@ var enableDataStack = _dataStackHelper.enableDataStack;
  * @param {module:echarts/model/Series} seriesModel
  * @param {Object} [opt]
  * @param {string} [opt.generateCoord]
+ * @param {boolean} [opt.useEncodeDefaulter]
  */
 function createListFromArray(source, seriesModel, opt) {
   opt = opt || {};
@@ -82,15 +87,15 @@ function createListFromArray(source, seriesModel, opt) {
 
   var coordSysName = seriesModel.get('coordinateSystem');
   var registeredCoordSys = CoordinateSystem.get(coordSysName);
-  var coordSysDefine = getCoordSysDefineBySeries(seriesModel);
+  var coordSysInfo = getCoordSysInfoBySeries(seriesModel);
   var coordSysDimDefs;
 
-  if (coordSysDefine) {
-    coordSysDimDefs = zrUtil.map(coordSysDefine.coordSysDims, function (dim) {
+  if (coordSysInfo) {
+    coordSysDimDefs = zrUtil.map(coordSysInfo.coordSysDims, function (dim) {
       var dimInfo = {
         name: dim
       };
-      var axisModel = coordSysDefine.axisMap.get(dim);
+      var axisModel = coordSysInfo.axisMap.get(dim);
 
       if (axisModel) {
         var axisType = axisModel.get('type');
@@ -108,13 +113,14 @@ function createListFromArray(source, seriesModel, opt) {
 
   var dimInfoList = createDimensions(source, {
     coordDimensions: coordSysDimDefs,
-    generateCoord: opt.generateCoord
+    generateCoord: opt.generateCoord,
+    encodeDefaulter: opt.useEncodeDefaulter ? zrUtil.curry(makeSeriesEncodeForAxisCoordSys, coordSysDimDefs, seriesModel) : null
   });
   var firstCategoryDimIndex;
   var hasNameEncode;
-  coordSysDefine && zrUtil.each(dimInfoList, function (dimInfo, dimIndex) {
+  coordSysInfo && zrUtil.each(dimInfoList, function (dimInfo, dimIndex) {
     var coordDim = dimInfo.coordDim;
-    var categoryAxisModel = coordSysDefine.categoryAxisMap.get(coordDim);
+    var categoryAxisModel = coordSysInfo.categoryAxisMap.get(coordDim);
 
     if (categoryAxisModel) {
       if (firstCategoryDimIndex == null) {

package/lib/chart/helper/createRenderPlanner.js

@@ -50,9 +50,12 @@ function _default() {
     var fields = inner(seriesModel);
     var pipelineContext = seriesModel.pipelineContext;
     var originalLarge = fields.large;
-    var originalProgressive = fields.progressiveRender;
-    var large = fields.large = pipelineContext.large;
-    var progressive = fields.progressiveRender = pipelineContext.progressiveRender;
+    var originalProgressive = fields.progressiveRender; // FIXME: if the planner works on a filtered series, `pipelineContext` does not
+    // exists. See #11611 . Probably we need to modify this structure, see the comment
+    // on `performRawSeries` in `Schedular.js`.
+
+    var large = fields.large = pipelineContext && pipelineContext.large;
+    var progressive = fields.progressiveRender = pipelineContext && pipelineContext.progressiveRender;
     return !!(originalLarge ^ large || originalProgressive ^ progressive) && 'reset';
   };
 }

package/lib/chart/helper/whiskerBoxCommon.js

@@ -26,6 +26,10 @@ var _dimensionHelper = require("../../data/helper/dimensionHelper");
 
 var getDimensionTypeByAxis = _dimensionHelper.getDimensionTypeByAxis;
 
+var _sourceHelper = require("../../data/helper/sourceHelper");
+
+var makeSeriesEncodeForAxisCoordSys = _sourceHelper.makeSeriesEncodeForAxisCoordSys;
+
 /*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
@@ -64,7 +68,7 @@ var seriesModelMixin = {
     var xAxisType = xAxisModel.get('type');
     var yAxisType = yAxisModel.get('type');
     var addOrdinal; // FIXME
-    // 考虑时间轴
+    // Consider time axis.
 
     if (xAxisType === 'category') {
       option.layout = 'horizontal';
@@ -109,22 +113,24 @@ var seriesModelMixin = {
     }
 
     var defaultValueDimensions = this.defaultValueDimensions;
+    var coordDimensions = [{
+      name: baseAxisDim,
+      type: getDimensionTypeByAxis(baseAxisType),
+      ordinalMeta: ordinalMeta,
+      otherDims: {
+        tooltip: false,
+        itemName: 0
+      },
+      dimsDef: ['base']
+    }, {
+      name: otherAxisDim,
+      type: getDimensionTypeByAxis(otherAxisType),
+      dimsDef: defaultValueDimensions.slice()
+    }];
     return createListSimply(this, {
-      coordDimensions: [{
-        name: baseAxisDim,
-        type: getDimensionTypeByAxis(baseAxisType),
-        ordinalMeta: ordinalMeta,
-        otherDims: {
-          tooltip: false,
-          itemName: 0
-        },
-        dimsDef: ['base']
-      }, {
-        name: otherAxisDim,
-        type: getDimensionTypeByAxis(otherAxisType),
-        dimsDef: defaultValueDimensions.slice()
-      }],
-      dimensionsCount: defaultValueDimensions.length + 1
+      coordDimensions: coordDimensions,
+      dimensionsCount: defaultValueDimensions.length + 1,
+      encodeDefaulter: zrUtil.curry(makeSeriesEncodeForAxisCoordSys, coordDimensions, this)
     });
   },
 

package/lib/chart/line/LineSeries.js

@@ -48,7 +48,9 @@ var _default = SeriesModel.extend({
   type: 'series.line',
   dependencies: ['grid', 'polar'],
   getInitialData: function (option, ecModel) {
-    return createListFromArray(this.getSource(), this);
+    return createListFromArray(this.getSource(), this, {
+      useEncodeDefaulter: true
+    });
   },
   defaultOption: {
     zlevel: 0,

package/lib/chart/line/LineView.js

@@ -24,6 +24,10 @@ var __DEV__ = _config.__DEV__;
 
 var zrUtil = require("zrender/lib/core/util");
 
+var _bbox = require("zrender/lib/core/bbox");
+
+var fromPoints = _bbox.fromPoints;
+
 var SymbolDraw = require("../helper/SymbolDraw");
 
 var SymbolClz = require("../helper/Symbol");
@@ -87,6 +91,17 @@ function isPointsSame(points1, points2) {
   return true;
 }
 
+function getBoundingDiff(points1, points2) {
+  var min1 = [];
+  var max1 = [];
+  var min2 = [];
+  var max2 = [];
+  fromPoints(points1, min1, max1);
+  fromPoints(points2, min2, max2); // Get a max value from each corner of two boundings.
+
+  return Math.max(Math.abs(min1[0] - min2[0]), Math.abs(min1[1] - min2[1]), Math.abs(max1[0] - max2[0]), Math.abs(max1[1] - max2[1]));
+}
+
 function getSmooth(smooth) {
   return typeof smooth === 'number' ? smooth : smooth ? 0.5 : 0;
 }
@@ -368,7 +383,7 @@ var _default = ChartView.extend({
     var step = !isCoordSysPolar && seriesModel.get('step');
     var clipShapeForSymbol;
 
-    if (coordSys && coordSys.getArea) {
+    if (coordSys && coordSys.getArea && seriesModel.get('clip', true)) {
       clipShapeForSymbol = coordSys.getArea(); // Avoid float number rounding error for symbol on the edge of axis extent.
       // See #7913 and `test/dataZoom-clip.html`.
 
@@ -381,8 +396,9 @@ var _default = ChartView.extend({
         clipShapeForSymbol.r0 -= 0.5;
         clipShapeForSymbol.r1 += 0.5;
       }
-    } // Initialization animation or coordinate system changed
+    }
 
+    this._clipShapeForSymbol = clipShapeForSymbol; // Initialization animation or coordinate system changed
 
     if (!(polyline && prevCoordSys.type === coordSys.type && step === this._step)) {
       showSymbol && symbolDraw.updateData(data, {
@@ -509,6 +525,11 @@ var _default = ChartView.extend({
         if (!pt) {
           // Null data
           return;
+        } // fix #11360: should't draw symbol outside clipShapeForSymbol
+
+
+        if (this._clipShapeForSymbol && !this._clipShapeForSymbol.contain(pt[0], pt[1])) {
+          return;
         }
 
         symbol = new SymbolClz(data, dataIndex);
@@ -624,6 +645,24 @@ var _default = ChartView.extend({
       stackedOnCurrent = turnPointsIntoStep(diff.stackedOnCurrent, coordSys, step);
       next = turnPointsIntoStep(diff.next, coordSys, step);
       stackedOnNext = turnPointsIntoStep(diff.stackedOnNext, coordSys, step);
+    } // Don't apply animation if diff is large.
+    // For better result and avoid memory explosion problems like
+    // https://github.com/apache/incubator-echarts/issues/12229
+
+
+    if (getBoundingDiff(current, next) > 3000 || polygon && getBoundingDiff(stackedOnCurrent, stackedOnNext) > 3000) {
+      polyline.setShape({
+        points: next
+      });
+
+      if (polygon) {
+        polygon.setShape({
+          points: next,
+          stackedOnPoints: stackedOnNext
+        });
+      }
+
+      return;
     } // `diff.current` is subset of `current` (which should be ensured by
     // turnPointsIntoStep), so points in `__points` can be updated when
     // points in `current` are update during animation.

package/lib/chart/map/MapSeries.js

@@ -37,6 +37,10 @@ var retrieveRawAttr = _dataProvider.retrieveRawAttr;
 
 var geoSourceManager = require("../../coord/geo/geoSourceManager");
 
+var _sourceHelper = require("../../data/helper/sourceHelper");
+
+var makeSeriesEncodeForNameBased = _sourceHelper.makeSeriesEncodeForNameBased;
+
 /*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
@@ -72,7 +76,10 @@ var MapSeries = SeriesModel.extend({
    */
   seriesGroup: [],
   getInitialData: function (option) {
-    var data = createListSimply(this, ['value']);
+    var data = createListSimply(this, {
+      coordDimensions: ['value'],
+      encodeDefaulter: zrUtil.curry(makeSeriesEncodeForNameBased, this)
+    });
     var valueDim = data.mapDimension('value');
     var dataNameMap = zrUtil.createHashMap();
     var selectTargetList = [];
@@ -88,7 +95,7 @@ var MapSeries = SeriesModel.extend({
       });
     }
 
-    var geoSource = geoSourceManager.load(this.getMapType(), this.option.nameMap);
+    var geoSource = geoSourceManager.load(this.getMapType(), this.option.nameMap, this.option.nameProperty);
     zrUtil.each(geoSource.regions, function (region) {
       var name = region.name;
 
@@ -249,7 +256,8 @@ var MapSeries = SeriesModel.extend({
       itemStyle: {
         areaColor: 'rgba(255,215,0,0.8)'
       }
-    }
+    },
+    nameProperty: 'name'
   }
 });
 zrUtil.mixin(MapSeries, dataSelectableMixin);

package/lib/chart/pie/PieSeries.js

@@ -36,6 +36,12 @@ var _dataProvider = require("../../data/helper/dataProvider");
 
 var retrieveRawAttr = _dataProvider.retrieveRawAttr;
 
+var _sourceHelper = require("../../data/helper/sourceHelper");
+
+var makeSeriesEncodeForNameBased = _sourceHelper.makeSeriesEncodeForNameBased;
+
+var LegendVisualProvider = require("../../visual/LegendVisualProvider");
+
 /*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
@@ -61,10 +67,7 @@ var PieSeries = echarts.extendSeriesModel({
     PieSeries.superApply(this, 'init', arguments); // Enable legend selection for each data item
     // Use a function instead of direct access because data reference may changed
 
-    this.legendDataProvider = function () {
-      return this.getRawData();
-    };
-
+    this.legendVisualProvider = new LegendVisualProvider(zrUtil.bind(this.getData, this), zrUtil.bind(this.getRawData, this));
     this.updateSelectedMap(this._createSelectableList());
 
     this._defaultLabelLine(option);
@@ -75,7 +78,10 @@ var PieSeries = echarts.extendSeriesModel({
     this.updateSelectedMap(this._createSelectableList());
   },
   getInitialData: function (option, ecModel) {
-    return createListSimply(this, ['value']);
+    return createListSimply(this, {
+      coordDimensions: ['value'],
+      encodeDefaulter: zrUtil.curry(makeSeriesEncodeForNameBased, this)
+    });
   },
   _createSelectableList: function () {
     var data = this.getRawData();
@@ -144,12 +150,27 @@ var PieSeries = echarts.extendSeriesModel({
     // If still show when all data zero.
     stillShowZeroSum: true,
     // cursor: null,
+    left: 0,
+    top: 0,
+    right: 0,
+    bottom: 0,
+    width: null,
+    height: null,
     label: {
       // If rotate around circle
       rotate: false,
       show: true,
       // 'outer', 'inside', 'center'
-      position: 'outer' // formatter: 标签文本格式器，同Tooltip.formatter，不支持异步回调
+      position: 'outer',
+      // 'none', 'labelLine', 'edge'. Works only when position is 'outer'
+      alignTo: 'none',
+      // Closest distance between label and chart edge.
+      // Works only position is 'outer' and alignTo is 'edge'.
+      margin: '25%',
+      // Works only position is 'outer' and alignTo is not 'edge'.
+      bleedMargin: 10,
+      // Distance between text and label line.
+      distanceToLabelLine: 5 // formatter: 标签文本格式器，同Tooltip.formatter，不支持异步回调
       // 默认使用全局文本样式，详见TEXTSTYLE
       // distance: 当position为inner时有效，为label位置到圆心的距离与圆半径(环状图为内外半径和)的比例系数
 

package/lib/chart/pie/PieView.js

@@ -159,33 +159,40 @@ piePieceProto.updateData = function (data, idx, firstCreate) {
   var cursorStyle = itemModel.getShallow('cursor');
   cursorStyle && sector.attr('cursor', cursorStyle); // Toggle selected
 
-  toggleItemSelected(this, data.getItemLayout(idx), seriesModel.isSelected(null, idx), seriesModel.get('selectedOffset'), seriesModel.get('animation')); // Label and text animation should be applied only for transition type animation when update
+  toggleItemSelected(this, data.getItemLayout(idx), seriesModel.isSelected(data.getName(idx)), seriesModel.get('selectedOffset'), seriesModel.get('animation')); // Label and text animation should be applied only for transition type animation when update
 
   var withAnimation = !firstCreate && animationTypeUpdate === 'transition';
 
   this._updateLabel(data, idx, withAnimation);
 
-  this.highDownOnUpdate = itemModel.get('hoverAnimation') && seriesModel.isAnimationEnabled() ? function (fromState, toState) {
+  this.highDownOnUpdate = !seriesModel.get('silent') ? function (fromState, toState) {
+    var hasAnimation = seriesModel.isAnimationEnabled() && itemModel.get('hoverAnimation');
+
     if (toState === 'emphasis') {
       labelLine.ignore = labelLine.hoverIgnore;
       labelText.ignore = labelText.hoverIgnore; // Sector may has animation of updating data. Force to move to the last frame
       // Or it may stopped on the wrong shape
 
-      sector.stopAnimation(true);
-      sector.animateTo({
-        shape: {
-          r: layout.r + seriesModel.get('hoverOffset')
-        }
-      }, 300, 'elasticOut');
+      if (hasAnimation) {
+        sector.stopAnimation(true);
+        sector.animateTo({
+          shape: {
+            r: layout.r + seriesModel.get('hoverOffset')
+          }
+        }, 300, 'elasticOut');
+      }
     } else {
       labelLine.ignore = labelLine.normalIgnore;
       labelText.ignore = labelText.normalIgnore;
-      sector.stopAnimation(true);
-      sector.animateTo({
-        shape: {
-          r: layout.r
-        }
-      }, 300, 'elasticOut');
+
+      if (hasAnimation) {
+        sector.stopAnimation(true);
+        sector.animateTo({
+          shape: {
+            r: layout.r
+          }
+        }, 300, 'elasticOut');
+      }
     }
   } : null;
   graphic.setHoverStyle(this);
@@ -242,7 +249,7 @@ piePieceProto._updateLabel = function (data, idx, withAnimation) {
   graphic.setLabelStyle(labelText.style, labelText.hoverStyle = {}, labelModel, labelHoverModel, {
     labelFetcher: data.hostModel,
     labelDataIndex: idx,
-    defaultText: data.getName(idx),
+    defaultText: labelLayout.text,
     autoColor: visualColor,
     useInsideStyle: !!labelLayout.inside
   }, {