echarts 4.7.0 → 4.8.0

package/lib/chart/heatmap/HeatmapView.js

@@ -166,8 +166,8 @@ var _default = echarts.extendChartView({
         var point = coordSys.dataToPoint([data.get(dataDims[0], idx), data.get(dataDims[1], idx)]);
         rect = new graphic.Rect({
           shape: {
-            x: Math.floor(point[0] - width / 2),
-            y: Math.floor(point[1] - height / 2),
+            x: Math.floor(Math.round(point[0]) - width / 2),
+            y: Math.floor(Math.round(point[1]) - height / 2),
             width: Math.ceil(width),
             height: Math.ceil(height)
           },

package/lib/chart/helper/EffectSymbol.js

@@ -207,7 +207,8 @@ effectSymbolProto.updateData = function (data, idx) {
     pos[1] = parsePercent(symbolOffset[1], symbolSize[1]);
   }
 
-  rippleGroup.rotation = (itemModel.getShallow('symbolRotate') || 0) * Math.PI / 180 || 0;
+  var symbolRotate = data.getItemVisual(idx, 'symbolRotate');
+  rippleGroup.rotation = (symbolRotate || 0) * Math.PI / 180 || 0;
   var effectCfg = {};
   effectCfg.showEffectOn = seriesModel.get('showEffectOn');
   effectCfg.rippleScale = itemModel.get('rippleEffect.scale');

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/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;
 }
@@ -630,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

@@ -95,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;
 
@@ -256,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/PieView.js

@@ -165,27 +165,34 @@ piePieceProto.updateData = function (data, idx, firstCreate) {
 
   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);

package/lib/chart/sankey/sankeyLayout.js

@@ -457,6 +457,11 @@ function relaxRightToLeft(nodesByBreadth, alpha, orient) {
       if (node.outEdges.length) {
         var y = sum(node.outEdges, weightedTarget, orient) / sum(node.outEdges, getEdgeValue, orient);
 
+        if (isNaN(y)) {
+          var len = node.outEdges.length;
+          y = len ? sum(node.outEdges, centerTarget, orient) / len : 0;
+        }
+
         if (orient === 'vertical') {
           var nodeX = node.getLayout().x + (y - center(node, orient)) * alpha;
           node.setLayout({
@@ -477,10 +482,18 @@ function weightedTarget(edge, orient) {
   return center(edge.node2, orient) * edge.getValue();
 }
 
+function centerTarget(edge, orient) {
+  return center(edge.node2, orient);
+}
+
 function weightedSource(edge, orient) {
   return center(edge.node1, orient) * edge.getValue();
 }
 
+function centerSource(edge, orient) {
+  return center(edge.node1, orient);
+}
+
 function center(node, orient) {
   return orient === 'vertical' ? node.getLayout().x + node.getLayout().dx / 2 : node.getLayout().y + node.getLayout().dy / 2;
 }
@@ -519,6 +532,11 @@ function relaxLeftToRight(nodesByBreadth, alpha, orient) {
       if (node.inEdges.length) {
         var y = sum(node.inEdges, weightedSource, orient) / sum(node.inEdges, getEdgeValue, orient);
 
+        if (isNaN(y)) {
+          var len = node.inEdges.length;
+          y = len ? sum(node.inEdges, centerSource, orient) / len : 0;
+        }
+
         if (orient === 'vertical') {
           var nodeX = node.getLayout().x + (y - center(node, orient)) * alpha;
           node.setLayout({

package/lib/chart/sunburst/SunburstPiece.js

@@ -149,6 +149,7 @@ SunburstPieceProto.updateData = function (firstCreate, node, state, seriesModel,
 
   this._seriesModel = seriesModel || this._seriesModel;
   this._ecModel = ecModel || this._ecModel;
+  graphic.setHoverStyle(this);
 };
 
 SunburstPieceProto.onEmphasis = function (highlightPolicy) {

package/lib/chart/sunburst/SunburstSeries.js

@@ -113,8 +113,7 @@ var _default = SeriesModel.extend({
       align: 'center',
       position: 'inside',
       distance: 5,
-      silent: true,
-      emphasis: {}
+      silent: true
     },
     itemStyle: {
       borderWidth: 1,
@@ -124,13 +123,19 @@ var _default = SeriesModel.extend({
       shadowColor: 'rgba(0, 0, 0, 0.2)',
       shadowOffsetX: 0,
       shadowOffsetY: 0,
-      opacity: 1,
-      emphasis: {},
-      highlight: {
+      opacity: 1
+    },
+    highlight: {
+      itemStyle: {
         opacity: 1
+      }
+    },
+    downplay: {
+      itemStyle: {
+        opacity: 0.5
       },
-      downplay: {
-        opacity: 0.9
+      label: {
+        opacity: 0.6
       }
     },
     // Animation type canbe expansion, scale

package/lib/chart/sunburst/SunburstView.js

@@ -26,6 +26,10 @@ var SunburstPiece = require("./SunburstPiece");
 
 var DataDiffer = require("../../data/DataDiffer");
 
+var _format = require("../../util/format");
+
+var windowOpen = _format.windowOpen;
+
 /*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
@@ -193,7 +197,7 @@ var SunburstView = ChartView.extend({
 
             if (link) {
               var linkTarget = itemModel.get('target', true) || '_blank';
-              window.open(link, linkTarget);
+              windowOpen(link, linkTarget);
             }
           }
 

package/lib/chart/tree/TreeSeries.js

@@ -26,6 +26,8 @@ var _format = require("../../util/format");
 
 var encodeHTML = _format.encodeHTML;
 
+var Model = require("../../model/Model");
+
 /*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
@@ -63,14 +65,12 @@ var _default = SeriesModel.extend({
       children: option.data
     };
     var leaves = option.leaves || {};
-    var treeOption = {};
-    treeOption.leaves = leaves;
-    var tree = Tree.createTree(root, this, treeOption, beforeLink);
+    var leavesModel = new Model(leaves, this, this.ecModel);
+    var tree = Tree.createTree(root, this, {}, beforeLink);
 
     function beforeLink(nodeData) {
       nodeData.wrapMethod('getItemModel', function (model, idx) {
         var node = tree.getNodeByDataIndex(idx);
-        var leavesModel = node.getLeavesModel();
 
         if (!node.children.length || !node.isExpand) {
           model.parentModel = leavesModel;

package/lib/chart/treemap/TreemapSeries.js

@@ -228,12 +228,24 @@ var _default = SeriesModel.extend({
     completeTreeValue(root);
     var levels = option.levels || [];
     levels = option.levels = setDefault(levels, ecModel);
-    var treeOption = {};
-    treeOption.levels = levels; // Make sure always a new tree is created when setOption,
+    var levelModels = zrUtil.map(levels || [], function (levelDefine) {
+      return new Model(levelDefine, this, ecModel);
+    }, this); // Make sure always a new tree is created when setOption,
     // in TreemapView, we check whether oldTree === newTree
     // to choose mappings approach among old shapes and new shapes.
 
-    return Tree.createTree(root, this, treeOption).data;
+    var tree = Tree.createTree(root, this, null, beforeLink);
+
+    function beforeLink(nodeData) {
+      nodeData.wrapMethod('getItemModel', function (model, idx) {
+        var node = tree.getNodeByDataIndex(idx);
+        var levelModel = levelModels[node.depth];
+        levelModel && (model.parentModel = levelModel);
+        return model;
+      });
+    }
+
+    return tree.data;
   },
   optionUpdated: function () {
     this.resetViewRoot();

package/lib/chart/treemap/TreemapView.js

@@ -40,6 +40,10 @@ var animationUtil = require("../../util/animation");
 
 var makeStyleMapper = require("../../model/mixin/makeStyleMapper");
 
+var _format = require("../../util/format");
+
+var windowOpen = _format.windowOpen;
+
 /*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
@@ -529,7 +533,7 @@ var _default = echarts.extendChartView({
           var itemModel = node.hostTree.data.getItemModel(node.dataIndex);
           var link = itemModel.get('link', true);
           var linkTarget = itemModel.get('target', true) || 'blank';
-          link && window.open(link, linkTarget);
+          link && windowOpen(link, linkTarget);
         }
       }
     }, this);
@@ -715,7 +719,7 @@ function renderNode(seriesModel, thisStorage, oldStorage, reRoot, lastsForAnimat
   var nodeModel = thisNode.getModel(); // Background
 
   var bg = giveGraphic('background', Rect, depth, Z_BG);
-  bg && renderBackground(group, bg, isParent && thisLayout.upperHeight); // No children, render content.
+  bg && renderBackground(group, bg, isParent && thisLayout.upperLabelHeight); // No children, render content.
 
   if (isParent) {
     // Because of the implementation about "traverse" in graphic hover style, we
@@ -832,21 +836,20 @@ function renderNode(seriesModel, thisStorage, oldStorage, reRoot, lastsForAnimat
   }
 
   function prepareText(normalStyle, emphasisStyle, visualColor, width, height, upperLabelRect) {
-    var text = zrUtil.retrieve(seriesModel.getFormattedLabel(thisNode.dataIndex, 'normal', null, null, upperLabelRect ? 'upperLabel' : 'label'), nodeModel.get('name'));
-
-    if (!upperLabelRect && thisLayout.isLeafRoot) {
-      var iconChar = seriesModel.get('drillDownIcon', true);
-      text = iconChar ? iconChar + ' ' + text : text;
-    }
-
+    var defaultText = nodeModel.get('name');
     var normalLabelModel = nodeModel.getModel(upperLabelRect ? PATH_UPPERLABEL_NORMAL : PATH_LABEL_NOAMAL);
     var emphasisLabelModel = nodeModel.getModel(upperLabelRect ? PATH_UPPERLABEL_EMPHASIS : PATH_LABEL_EMPHASIS);
     var isShow = normalLabelModel.getShallow('show');
     graphic.setLabelStyle(normalStyle, emphasisStyle, normalLabelModel, emphasisLabelModel, {
-      defaultText: isShow ? text : null,
+      defaultText: isShow ? defaultText : null,
       autoColor: visualColor,
-      isRectText: true
+      isRectText: true,
+      labelFetcher: seriesModel,
+      labelDataIndex: thisNode.dataIndex,
+      labelProp: upperLabelRect ? 'upperLabel' : 'label'
     });
+    addDrillDownIcon(normalStyle, upperLabelRect, thisLayout);
+    addDrillDownIcon(emphasisStyle, upperLabelRect, thisLayout);
     upperLabelRect && (normalStyle.textRect = zrUtil.clone(upperLabelRect));
     normalStyle.truncate = isShow && normalLabelModel.get('ellipsis') ? {
       outerWidth: width,
@@ -855,6 +858,15 @@ function renderNode(seriesModel, thisStorage, oldStorage, reRoot, lastsForAnimat
     } : null;
   }
 
+  function addDrillDownIcon(style, upperLabelRect, thisLayout) {
+    var text = style.text;
+
+    if (!upperLabelRect && thisLayout.isLeafRoot && text != null) {
+      var iconChar = seriesModel.get('drillDownIcon', true);
+      style.text = iconChar ? iconChar + ' ' + text : text;
+    }
+  }
+
   function giveGraphic(storageName, Ctor, depth, z) {
     var element = oldRawIndex != null && oldStorage[storageName][oldRawIndex];
     var lasts = lastsForAnimation[storageName];

package/lib/component/helper/MapDraw.js

@@ -36,6 +36,8 @@ var _component = require("../../util/component");
 
 var getUID = _component.getUID;
 
+var Transformable = require("zrender/lib/mixin/Transformable");
+
 /*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
@@ -206,10 +208,27 @@ MapDraw.prototype = {
 
     var regionsGroup = this._regionsGroup;
     var group = this.group;
-    var transformInfo = geo.getTransformInfo();
-    group.transform = transformInfo.roamTransform;
-    group.decomposeTransform();
-    group.dirty();
+    var transformInfo = geo.getTransformInfo(); // No animation when first draw or in action
+
+    var isFirstDraw = !regionsGroup.childAt(0) || payload;
+    var targetScale;
+
+    if (isFirstDraw) {
+      group.transform = transformInfo.roamTransform;
+      group.decomposeTransform();
+      group.dirty();
+    } else {
+      var target = new Transformable();
+      target.transform = transformInfo.roamTransform;
+      target.decomposeTransform();
+      var props = {
+        scale: target.scale,
+        position: target.position
+      };
+      targetScale = target.scale;
+      graphic.updateProps(group, props, mapOrGeoModel);
+    }
+
     var scale = transformInfo.rawScale;
     var position = transformInfo.rawPosition;
     regionsGroup.removeAll();
@@ -331,6 +350,15 @@ MapDraw.prototype = {
           textAlign: 'center',
           textVerticalAlign: 'middle'
         });
+
+        if (!isFirstDraw) {
+          // Text animation
+          var textScale = [1 / targetScale[0], 1 / targetScale[1]];
+          graphic.updateProps(textEl, {
+            scale: textScale
+          }, mapOrGeoModel);
+        }
+
         regionGroup.add(textEl);
       } // setItemGraphicEl, setHoverStyle after all polygons and labels
       // are added to the rigionGroup

package/lib/component/title.js

@@ -28,6 +28,10 @@ var _layout = require("../util/layout");
 
 var getLayoutRect = _layout.getLayoutRect;
 
+var _format = require("../util/format");
+
+var windowOpen = _format.windowOpen;
+
 /*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
@@ -150,13 +154,13 @@ echarts.extendComponentView({
 
     if (link) {
       textEl.on('click', function () {
-        window.open(link, '_' + titleModel.get('target'));
+        windowOpen(link, '_' + titleModel.get('target'));
       });
     }
 
     if (sublink) {
       subTextEl.on('click', function () {
-        window.open(sublink, '_' + titleModel.get('subtarget'));
+        windowOpen(link, '_' + titleModel.get('subtarget'));
       });
     }
 

package/lib/component/toolbox/ToolboxView.js

@@ -80,7 +80,7 @@ var _default = echarts.extendComponentView({
       var featureModel = new Model(featureOpt, toolboxModel, toolboxModel.ecModel);
       var feature; // FIX#11236, merge feature title from MagicType newOption. TODO: consider seriesIndex ?
 
-      if (payload && payload.newTitle != null) {
+      if (payload && payload.newTitle != null && payload.featureName === featureName) {
         featureOpt.title = payload.newTitle;
       }
 

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

@@ -200,7 +200,8 @@ proto.onclick = function (ecModel, api, type) {
     type: 'changeMagicType',
     currentType: type,
     newOption: newOption,
-    newTitle: newTitle
+    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',

package/lib/component/tooltip/TooltipView.js

@@ -451,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');
 

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);
   },