echarts 4.5.0-rc.2 → 4.8.0

package/lib/chart/pie/labelLayout.js

@@ -20,6 +20,10 @@
 
 var textContain = require("zrender/lib/contain/text");
 
+var _number = require("../../util/number");
+
+var parsePercent = _number.parsePercent;
+
 /*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
@@ -41,13 +45,17 @@ var textContain = require("zrender/lib/contain/text");
 // FIXME emphasis label position is not same with normal label position
 var RADIAN = Math.PI / 180;
 
-function adjustSingleSide(list, cx, cy, r, dir, viewWidth, viewHeight) {
+function adjustSingleSide(list, cx, cy, r, dir, viewWidth, viewHeight, viewLeft, viewTop, farthestX) {
   list.sort(function (a, b) {
     return a.y - b.y;
   });
 
   function shiftDown(start, end, delta, dir) {
     for (var j = start; j < end; j++) {
+      if (list[j].y + delta > viewTop + viewHeight) {
+        break;
+      }
+
       list[j].y += delta;
 
       if (j > start && j + 1 < end && list[j + 1].y > list[j].y + list[j].height) {
@@ -61,6 +69,10 @@ function adjustSingleSide(list, cx, cy, r, dir, viewWidth, viewHeight) {
 
   function shiftUp(end, delta) {
     for (var j = end; j >= 0; j--) {
+      if (list[j].y - delta < viewTop) {
+        break;
+      }
+
       list[j].y -= delta;
 
       if (j > 0 && list[j].y > list[j - 1].y + list[j - 1].height) {
@@ -78,6 +90,10 @@ function adjustSingleSide(list, cx, cy, r, dir, viewWidth, viewHeight) {
     : 0; // up
 
     for (var i = 0, l = list.length; i < l; i++) {
+      if (list[i].labelAlignTo !== 'none') {
+        continue;
+      }
+
       var deltaY = Math.abs(list[i].y - cy);
       var length = list[i].len;
       var length2 = list[i].len2;
@@ -105,6 +121,12 @@ function adjustSingleSide(list, cx, cy, r, dir, viewWidth, viewHeight) {
   var downList = [];
 
   for (var i = 0; i < len; i++) {
+    if (list[i].position === 'outer' && list[i].labelAlignTo === 'labelLine') {
+      var dx = list[i].x - farthestX;
+      list[i].linePoints[1][0] += dx;
+      list[i].x = farthestX;
+    }
+
     delta = list[i].y - lastY;
 
     if (delta < 0) {
@@ -130,9 +152,11 @@ function adjustSingleSide(list, cx, cy, r, dir, viewWidth, viewHeight) {
   changeX(downList, true, cx, cy, r, dir);
 }
 
-function avoidOverlap(labelLayoutList, cx, cy, r, viewWidth, viewHeight) {
+function avoidOverlap(labelLayoutList, cx, cy, r, viewWidth, viewHeight, viewLeft, viewTop) {
   var leftList = [];
   var rightList = [];
+  var leftmostX = Number.MAX_VALUE;
+  var rightmostX = -Number.MAX_VALUE;
 
   for (var i = 0; i < labelLayoutList.length; i++) {
     if (isPositionCenter(labelLayoutList[i])) {
@@ -140,33 +164,72 @@ function avoidOverlap(labelLayoutList, cx, cy, r, viewWidth, viewHeight) {
     }
 
     if (labelLayoutList[i].x < cx) {
+      leftmostX = Math.min(leftmostX, labelLayoutList[i].x);
       leftList.push(labelLayoutList[i]);
     } else {
+      rightmostX = Math.max(rightmostX, labelLayoutList[i].x);
       rightList.push(labelLayoutList[i]);
     }
   }
 
-  adjustSingleSide(rightList, cx, cy, r, 1, viewWidth, viewHeight);
-  adjustSingleSide(leftList, cx, cy, r, -1, viewWidth, viewHeight);
+  adjustSingleSide(rightList, cx, cy, r, 1, viewWidth, viewHeight, viewLeft, viewTop, rightmostX);
+  adjustSingleSide(leftList, cx, cy, r, -1, viewWidth, viewHeight, viewLeft, viewTop, leftmostX);
 
   for (var i = 0; i < labelLayoutList.length; i++) {
-    if (isPositionCenter(labelLayoutList[i])) {
+    var layout = labelLayoutList[i];
+
+    if (isPositionCenter(layout)) {
       continue;
     }
 
-    var linePoints = labelLayoutList[i].linePoints;
+    var linePoints = layout.linePoints;
 
     if (linePoints) {
+      var isAlignToEdge = layout.labelAlignTo === 'edge';
+      var realTextWidth = layout.textRect.width;
+      var targetTextWidth;
+
+      if (isAlignToEdge) {
+        if (layout.x < cx) {
+          targetTextWidth = linePoints[2][0] - layout.labelDistance - viewLeft - layout.labelMargin;
+        } else {
+          targetTextWidth = viewLeft + viewWidth - layout.labelMargin - linePoints[2][0] - layout.labelDistance;
+        }
+      } else {
+        if (layout.x < cx) {
+          targetTextWidth = layout.x - viewLeft - layout.bleedMargin;
+        } else {
+          targetTextWidth = viewLeft + viewWidth - layout.x - layout.bleedMargin;
+        }
+      }
+
+      if (targetTextWidth < layout.textRect.width) {
+        layout.text = textContain.truncateText(layout.text, targetTextWidth, layout.font);
+
+        if (layout.labelAlignTo === 'edge') {
+          realTextWidth = textContain.getWidth(layout.text, layout.font);
+        }
+      }
+
       var dist = linePoints[1][0] - linePoints[2][0];
 
-      if (labelLayoutList[i].x < cx) {
-        linePoints[2][0] = labelLayoutList[i].x + 3;
+      if (isAlignToEdge) {
+        if (layout.x < cx) {
+          linePoints[2][0] = viewLeft + layout.labelMargin + realTextWidth + layout.labelDistance;
+        } else {
+          linePoints[2][0] = viewLeft + viewWidth - layout.labelMargin - realTextWidth - layout.labelDistance;
+        }
       } else {
-        linePoints[2][0] = labelLayoutList[i].x - 3;
+        if (layout.x < cx) {
+          linePoints[2][0] = layout.x + layout.labelDistance;
+        } else {
+          linePoints[2][0] = layout.x - layout.labelDistance;
+        }
+
+        linePoints[1][0] = linePoints[2][0] + dist;
       }
 
-      linePoints[1][1] = linePoints[2][1] = labelLayoutList[i].y;
-      linePoints[1][0] = linePoints[2][0] + dist;
+      linePoints[1][1] = linePoints[2][1] = layout.y;
     }
   }
 }
@@ -176,7 +239,7 @@ function isPositionCenter(layout) {
   return layout.position === 'center';
 }
 
-function _default(seriesModel, r, viewWidth, viewHeight, sum) {
+function _default(seriesModel, r, viewWidth, viewHeight, viewLeft, viewTop) {
   var data = seriesModel.getData();
   var labelLayoutList = [];
   var cx;
@@ -189,9 +252,16 @@ function _default(seriesModel, r, viewWidth, viewHeight, sum) {
     var labelModel = itemModel.getModel('label'); // Use position in normal or emphasis
 
     var labelPosition = labelModel.get('position') || itemModel.get('emphasis.label.position');
+    var labelDistance = labelModel.get('distanceToLabelLine');
+    var labelAlignTo = labelModel.get('alignTo');
+    var labelMargin = parsePercent(labelModel.get('margin'), viewWidth);
+    var bleedMargin = labelModel.get('bleedMargin');
+    var font = labelModel.getFont();
     var labelLineModel = itemModel.getModel('labelLine');
     var labelLineLen = labelLineModel.get('length');
+    labelLineLen = parsePercent(labelLineLen, viewWidth);
     var labelLineLen2 = labelLineModel.get('length2');
+    labelLineLen2 = parsePercent(labelLineLen2, viewWidth);
 
     if (layout.angle < minShowLabelRadian) {
       return;
@@ -206,6 +276,8 @@ function _default(seriesModel, r, viewWidth, viewHeight, sum) {
     var textAlign;
     cx = layout.cx;
     cy = layout.cy;
+    var text = seriesModel.getFormattedLabel(idx, 'normal') || data.getName(idx);
+    var textRect = textContain.getBoundingRect(text, font, textAlign, 'top');
     var isLabelInside = labelPosition === 'inside' || labelPosition === 'inner';
 
     if (labelPosition === 'center') {
@@ -224,15 +296,21 @@ function _default(seriesModel, r, viewWidth, viewHeight, sum) {
         var y2 = y1 + dy * (labelLineLen + r - layout.r);
         var x3 = x2 + (dx < 0 ? -1 : 1) * labelLineLen2;
         var y3 = y2;
-        textX = x3 + (dx < 0 ? -5 : 5);
+
+        if (labelAlignTo === 'edge') {
+          // Adjust textX because text align of edge is opposite
+          textX = dx < 0 ? viewLeft + labelMargin : viewLeft + viewWidth - labelMargin;
+        } else {
+          textX = x3 + (dx < 0 ? -labelDistance : labelDistance);
+        }
+
         textY = y3;
         linePoints = [[x1, y1], [x2, y2], [x3, y3]];
       }
 
-      textAlign = isLabelInside ? 'center' : dx > 0 ? 'left' : 'right';
+      textAlign = isLabelInside ? 'center' : labelAlignTo === 'edge' ? dx > 0 ? 'right' : 'left' : dx > 0 ? 'left' : 'right';
     }
 
-    var font = labelModel.getFont();
     var labelRotate;
     var rotate = labelModel.get('rotate');
 
@@ -242,8 +320,6 @@ function _default(seriesModel, r, viewWidth, viewHeight, sum) {
       labelRotate = rotate ? dx < 0 ? -midAngle + Math.PI : -midAngle : 0;
     }
 
-    var text = seriesModel.getFormattedLabel(idx, 'normal') || data.getName(idx);
-    var textRect = textContain.getBoundingRect(text, font, textAlign, 'top');
     hasLabelRotate = !!labelRotate;
     layout.label = {
       x: textX,
@@ -256,7 +332,14 @@ function _default(seriesModel, r, viewWidth, viewHeight, sum) {
       textAlign: textAlign,
       verticalAlign: 'middle',
       rotation: labelRotate,
-      inside: isLabelInside
+      inside: isLabelInside,
+      labelDistance: labelDistance,
+      labelAlignTo: labelAlignTo,
+      labelMargin: labelMargin,
+      bleedMargin: bleedMargin,
+      textRect: textRect,
+      text: text,
+      font: font
     }; // Not layout the inside label
 
     if (!isLabelInside) {
@@ -265,7 +348,7 @@ function _default(seriesModel, r, viewWidth, viewHeight, sum) {
   });
 
   if (!hasLabelRotate && seriesModel.get('avoidLabelOverlap')) {
-    avoidOverlap(labelLayoutList, cx, cy, r, viewWidth, viewHeight);
+    avoidOverlap(labelLayoutList, cx, cy, r, viewWidth, viewHeight, viewLeft, viewTop);
   }
 }
 

package/lib/chart/pie/pieLayout.js

@@ -23,6 +23,8 @@ var _number = require("../../util/number");
 var parsePercent = _number.parsePercent;
 var linearMap = _number.linearMap;
 
+var layout = require("../../util/layout");
+
 var labelLayout = require("./labelLayout");
 
 var zrUtil = require("zrender/lib/core/util");
@@ -48,10 +50,18 @@ var zrUtil = require("zrender/lib/core/util");
 var PI2 = Math.PI * 2;
 var RADIAN = Math.PI / 180;
 
+function getViewRect(seriesModel, api) {
+  return layout.getLayoutRect(seriesModel.getBoxLayoutParams(), {
+    width: api.getWidth(),
+    height: api.getHeight()
+  });
+}
+
 function _default(seriesType, ecModel, api, payload) {
   ecModel.eachSeriesByType(seriesType, function (seriesModel) {
     var data = seriesModel.getData();
     var valueDim = data.mapDimension('value');
+    var viewRect = getViewRect(seriesModel, api);
     var center = seriesModel.get('center');
     var radius = seriesModel.get('radius');
 
@@ -63,11 +73,11 @@ function _default(seriesType, ecModel, api, payload) {
       center = [center, center];
     }
 
-    var width = api.getWidth();
-    var height = api.getHeight();
+    var width = parsePercent(viewRect.width, api.getWidth());
+    var height = parsePercent(viewRect.height, api.getHeight());
     var size = Math.min(width, height);
-    var cx = parsePercent(center[0], width);
-    var cy = parsePercent(center[1], height);
+    var cx = parsePercent(center[0], width) + viewRect.x;
+    var cy = parsePercent(center[1], height) + viewRect.y;
     var r0 = parsePercent(radius[0], size / 2);
     var r = parsePercent(radius[1], size / 2);
     var startAngle = -seriesModel.get('startAngle') * RADIAN;
@@ -102,7 +112,8 @@ function _default(seriesType, ecModel, api, payload) {
           cx: cx,
           cy: cy,
           r0: r0,
-          r: roseType ? NaN : r
+          r: roseType ? NaN : r,
+          viewRect: viewRect
         });
         return;
       } // FIXME 兼容 2.0 但是 roseType 是 area 的时候才是这样？
@@ -130,7 +141,8 @@ function _default(seriesType, ecModel, api, payload) {
         cx: cx,
         cy: cy,
         r0: r0,
-        r: roseType ? linearMap(value, extent, [r0, r]) : r
+        r: roseType ? linearMap(value, extent, [r0, r]) : r,
+        viewRect: viewRect
       });
       currentAngle = endAngle;
     }); // Some sector is constrained by minAngle
@@ -164,7 +176,7 @@ function _default(seriesType, ecModel, api, payload) {
       }
     }
 
-    labelLayout(seriesModel, r, width, height);
+    labelLayout(seriesModel, r, viewRect.width, viewRect.height, viewRect.x, viewRect.y);
   });
 }
 

package/lib/chart/radar/RadarSeries.js

@@ -28,6 +28,8 @@ var _format = require("../../util/format");
 
 var encodeHTML = _format.encodeHTML;
 
+var LegendVisualProvider = require("../../visual/LegendVisualProvider");
+
 /*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
@@ -54,9 +56,7 @@ var RadarSeries = SeriesModel.extend({
     RadarSeries.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));
   },
   getInitialData: function (option, ecModel) {
     return createListSimply(this, {
@@ -74,6 +74,26 @@ var RadarSeries = SeriesModel.extend({
       return encodeHTML(axis.name + ' : ' + val);
     }).join('<br />');
   },
+
+  /**
+   * @implement
+   */
+  getTooltipPosition: function (dataIndex) {
+    if (dataIndex != null) {
+      var data = this.getData();
+      var coordSys = this.coordinateSystem;
+      var values = data.getValues(zrUtil.map(coordSys.dimensions, function (dim) {
+        return data.mapDimension(dim);
+      }), dataIndex, true);
+
+      for (var i = 0, len = values.length; i < len; i++) {
+        if (!isNaN(values[i])) {
+          var indicatorAxes = coordSys.getIndicatorAxes();
+          return coordSys.coordToPoint(indicatorAxes[i].dataToCoord(values[i]), i);
+        }
+      }
+    }
+  },
   defaultOption: {
     zlevel: 0,
     z: 2,

package/lib/chart/sankey/SankeySeries.js

@@ -160,6 +160,18 @@ var SankeySeries = SeriesModel.extend({
       option.focusNodeAdjacency = 'allEdges';
     }
   },
+  // Override Series.getDataParams()
+  getDataParams: function (dataIndex, dataType) {
+    var params = SankeySeries.superCall(this, 'getDataParams', dataIndex, dataType);
+
+    if (params.value == null && dataType === 'node') {
+      var node = this.getGraph().getNodeByIndex(dataIndex);
+      var nodeValue = node.getLayout().value;
+      params.value = nodeValue;
+    }
+
+    return params;
+  },
   defaultOption: {
     zlevel: 0,
     z: 2,
@@ -205,7 +217,7 @@ var SankeySeries = SeriesModel.extend({
         show: true
       },
       lineStyle: {
-        opacity: 0.6
+        opacity: 0.5
       }
     },
     animationEasing: 'linear',

package/lib/chart/sankey/SankeyView.js

@@ -43,7 +43,9 @@ var zrUtil = require("zrender/lib/core/util");
 * under the License.
 */
 var nodeOpacityPath = ['itemStyle', 'opacity'];
+var hoverNodeOpacityPath = ['emphasis', 'itemStyle', 'opacity'];
 var lineOpacityPath = ['lineStyle', 'opacity'];
+var hoverLineOpacityPath = ['emphasis', 'lineStyle', 'opacity'];
 
 function getItemOpacity(item, opacityPath) {
   return item.getVisual('opacity') || item.getModel().get(opacityPath);
@@ -69,12 +71,13 @@ function fadeOutItem(item, opacityPath, opacityRatio) {
 function fadeInItem(item, opacityPath) {
   var opacity = getItemOpacity(item, opacityPath);
   var el = item.getGraphicEl();
-  el.highlight && el.highlight();
   el.traverse(function (child) {
     if (child.type !== 'group') {
       child.setStyle('opacity', opacity);
     }
-  });
+  }); // Support emphasis here.
+
+  el.highlight && el.highlight();
 }
 
 var SankeyShape = graphic.extendShape({
@@ -104,6 +107,12 @@ var SankeyShape = graphic.extendShape({
     }
 
     ctx.closePath();
+  },
+  highlight: function () {
+    this.trigger('emphasis');
+  },
+  downplay: function () {
+    this.trigger('normal');
   }
 });
 
@@ -266,9 +275,22 @@ var _default = echarts.extendChartView({
         el.cursor = 'move';
       }
 
+      el.highlight = function () {
+        this.trigger('emphasis');
+      };
+
+      el.downplay = function () {
+        this.trigger('normal');
+      };
+
+      el.focusNodeAdjHandler && el.off('mouseover', el.focusNodeAdjHandler);
+      el.unfocusNodeAdjHandler && el.off('mouseout', el.unfocusNodeAdjHandler);
+
       if (itemModel.get('focusNodeAdjacency')) {
-        el.off('mouseover').on('mouseover', function () {
+        el.on('mouseover', el.focusNodeAdjHandler = function () {
           if (!sankeyView._focusAdjacencyDisabled) {
+            sankeyView._clearTimer();
+
             api.dispatchAction({
               type: 'focusNodeAdjacency',
               seriesId: seriesModel.id,
@@ -276,22 +298,23 @@ var _default = echarts.extendChartView({
             });
           }
         });
-        el.off('mouseout').on('mouseout', function () {
+        el.on('mouseout', el.unfocusNodeAdjHandler = function () {
           if (!sankeyView._focusAdjacencyDisabled) {
-            api.dispatchAction({
-              type: 'unfocusNodeAdjacency',
-              seriesId: seriesModel.id
-            });
+            sankeyView._dispatchUnfocus(api);
           }
         });
       }
     });
     edgeData.eachItemGraphicEl(function (el, dataIndex) {
       var edgeModel = edgeData.getItemModel(dataIndex);
+      el.focusNodeAdjHandler && el.off('mouseover', el.focusNodeAdjHandler);
+      el.unfocusNodeAdjHandler && el.off('mouseout', el.unfocusNodeAdjHandler);
 
       if (edgeModel.get('focusNodeAdjacency')) {
-        el.off('mouseover').on('mouseover', function () {
+        el.on('mouseover', el.focusNodeAdjHandler = function () {
           if (!sankeyView._focusAdjacencyDisabled) {
+            sankeyView._clearTimer();
+
             api.dispatchAction({
               type: 'focusNodeAdjacency',
               seriesId: seriesModel.id,
@@ -299,12 +322,9 @@ var _default = echarts.extendChartView({
             });
           }
         });
-        el.off('mouseout').on('mouseout', function () {
+        el.on('mouseout', el.unfocusNodeAdjHandler = function () {
           if (!sankeyView._focusAdjacencyDisabled) {
-            api.dispatchAction({
-              type: 'unfocusNodeAdjacency',
-              seriesId: seriesModel.id
-            });
+            sankeyView._dispatchUnfocus(api);
           }
         });
       }
@@ -318,10 +338,30 @@ var _default = echarts.extendChartView({
 
     this._data = seriesModel.getData();
   },
-  dispose: function () {},
-  focusNodeAdjacency: function (seriesModel, ecModel, api, payload) {
-    var data = this._model.getData();
+  dispose: function () {
+    this._clearTimer();
+  },
+  _dispatchUnfocus: function (api) {
+    var self = this;
 
+    this._clearTimer();
+
+    this._unfocusDelayTimer = setTimeout(function () {
+      self._unfocusDelayTimer = null;
+      api.dispatchAction({
+        type: 'unfocusNodeAdjacency',
+        seriesId: self._model.id
+      });
+    }, 500);
+  },
+  _clearTimer: function () {
+    if (this._unfocusDelayTimer) {
+      clearTimeout(this._unfocusDelayTimer);
+      this._unfocusDelayTimer = null;
+    }
+  },
+  focusNodeAdjacency: function (seriesModel, ecModel, api, payload) {
+    var data = seriesModel.getData();
     var graph = data.graph;
     var dataIndex = payload.dataIndex;
     var itemModel = data.getItemModel(dataIndex);
@@ -341,7 +381,7 @@ var _default = echarts.extendChartView({
     });
 
     if (node) {
-      fadeInItem(node, nodeOpacityPath);
+      fadeInItem(node, hoverNodeOpacityPath);
       var focusNodeAdj = itemModel.get('focusNodeAdjacency');
 
       if (focusNodeAdj === 'outEdges') {
@@ -350,8 +390,8 @@ var _default = echarts.extendChartView({
             return;
           }
 
-          fadeInItem(edge, lineOpacityPath);
-          fadeInItem(edge.node2, nodeOpacityPath);
+          fadeInItem(edge, hoverLineOpacityPath);
+          fadeInItem(edge.node2, hoverNodeOpacityPath);
         });
       } else if (focusNodeAdj === 'inEdges') {
         zrUtil.each(node.inEdges, function (edge) {
@@ -359,8 +399,8 @@ var _default = echarts.extendChartView({
             return;
           }
 
-          fadeInItem(edge, lineOpacityPath);
-          fadeInItem(edge.node1, nodeOpacityPath);
+          fadeInItem(edge, hoverLineOpacityPath);
+          fadeInItem(edge.node1, hoverNodeOpacityPath);
         });
       } else if (focusNodeAdj === 'allEdges') {
         zrUtil.each(node.edges, function (edge) {
@@ -368,22 +408,21 @@ var _default = echarts.extendChartView({
             return;
           }
 
-          fadeInItem(edge, lineOpacityPath);
-          fadeInItem(edge.node1, nodeOpacityPath);
-          fadeInItem(edge.node2, nodeOpacityPath);
+          fadeInItem(edge, hoverLineOpacityPath);
+          edge.node1 !== node && fadeInItem(edge.node1, hoverNodeOpacityPath);
+          edge.node2 !== node && fadeInItem(edge.node2, hoverNodeOpacityPath);
         });
       }
     }
 
     if (edge) {
-      fadeInItem(edge, lineOpacityPath);
-      fadeInItem(edge.node1, nodeOpacityPath);
-      fadeInItem(edge.node2, nodeOpacityPath);
+      fadeInItem(edge, hoverLineOpacityPath);
+      fadeInItem(edge.node1, hoverNodeOpacityPath);
+      fadeInItem(edge.node2, hoverNodeOpacityPath);
     }
   },
   unfocusNodeAdjacency: function (seriesModel, ecModel, api, payload) {
-    var graph = this._model.getGraph();
-
+    var graph = seriesModel.getGraph();
     graph.eachNode(function (node) {
       fadeOutItem(node, nodeOpacityPath);
     });
@@ -405,8 +444,7 @@ function createGridClipShape(rect, seriesModel, cb) {
   });
   graphic.initProps(rectEl, {
     shape: {
-      width: rect.width + 20,
-      height: rect.height + 20
+      width: rect.width + 20
     }
   }, seriesModel, cb);
   return rectEl;

package/lib/chart/sankey/sankeyLayout.js

@@ -97,7 +97,8 @@ function computeNodeValues(nodes) {
   zrUtil.each(nodes, function (node) {
     var value1 = sum(node.outEdges, getEdgeValue);
     var value2 = sum(node.inEdges, getEdgeValue);
-    var value = Math.max(value1, value2);
+    var nodeRawValue = node.getValue() || 0;
+    var value = Math.max(value1, value2, nodeRawValue);
     node.setLayout({
       value: value
     }, true);
@@ -456,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({
@@ -476,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;
 }
@@ -488,13 +502,13 @@ function getEdgeValue(edge) {
   return edge.getValue();
 }
 
-function sum(array, f, orient) {
+function sum(array, cb, orient) {
   var sum = 0;
   var len = array.length;
   var i = -1;
 
   while (++i < len) {
-    var value = +f.call(array, array[i], orient);
+    var value = +cb.call(array, array[i], orient);
 
     if (!isNaN(value)) {
       sum += value;
@@ -518,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/scatter/ScatterSeries.js

@@ -44,7 +44,9 @@ var _default = SeriesModel.extend({
   type: 'series.scatter',
   dependencies: ['grid', 'polar', 'geo', 'singleAxis', 'calendar'],
   getInitialData: function (option, ecModel) {
-    return createListFromArray(this.getSource(), this);
+    return createListFromArray(this.getSource(), this, {
+      useEncodeDefaulter: true
+    });
   },
   brushSelector: 'point',
   getProgressive: function () {