echarts 4.4.0 → 4.6.0

package/lib/chart/graph/GraphSeries.js

@@ -36,6 +36,8 @@ var encodeHTML = _format.encodeHTML;
 
 var createGraphFromNodeEdge = require("../helper/createGraphFromNodeEdge");
 
+var LegendVisualProvider = require("../../visual/LegendVisualProvider");
+
 /*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
@@ -57,12 +59,15 @@ var createGraphFromNodeEdge = require("../helper/createGraphFromNodeEdge");
 var GraphSeries = echarts.extendSeriesModel({
   type: 'series.graph',
   init: function (option) {
-    GraphSeries.superApply(this, 'init', arguments); // Provide data for legend select
+    GraphSeries.superApply(this, 'init', arguments);
+    var self = this;
+
+    function getCategoriesData() {
+      return self._categoriesData;
+    } // Provide data for legend select
 
-    this.legendDataProvider = function () {
-      return this._categoriesData;
-    };
 
+    this.legendVisualProvider = new LegendVisualProvider(getCategoriesData, getCategoriesData);
     this.fillDataTextStyle(option.edges || option.links);
 
     this._updateCategoriesData();
@@ -216,6 +221,8 @@ var GraphSeries = echarts.extendSeriesModel({
       // Node repulsion. Can be an array to represent range.
       repulsion: [0, 50],
       gravity: 0.1,
+      // Initial friction
+      friction: 0.6,
       // Edge length. Can be an array to represent range.
       edgeLength: 30,
       layoutAnimation: true

package/lib/chart/graph/GraphView.js

@@ -122,6 +122,7 @@ var _default = echarts.extendChartView({
     this._firstRender = true;
   },
   render: function (seriesModel, ecModel, api) {
+    var graphView = this;
     var coordSys = seriesModel.coordinateSystem;
     this._model = seriesModel;
     var symbolDraw = this._symbolDraw;
@@ -188,6 +189,8 @@ var _default = echarts.extendChartView({
 
       if (itemModel.get('focusNodeAdjacency')) {
         el.on('mouseover', el[FOCUS_ADJACENCY] = function () {
+          graphView._clearTimer();
+
           api.dispatchAction({
             type: 'focusNodeAdjacency',
             seriesId: seriesModel.id,
@@ -195,10 +198,7 @@ var _default = echarts.extendChartView({
           });
         });
         el.on('mouseout', el[UNFOCUS_ADJACENCY] = function () {
-          api.dispatchAction({
-            type: 'unfocusNodeAdjacency',
-            seriesId: seriesModel.id
-          });
+          graphView._dispatchUnfocus(api);
         });
       }
     }, this);
@@ -209,6 +209,8 @@ var _default = echarts.extendChartView({
 
       if (edge.getModel().get('focusNodeAdjacency')) {
         el.on('mouseover', el[FOCUS_ADJACENCY] = function () {
+          graphView._clearTimer();
+
           api.dispatchAction({
             type: 'focusNodeAdjacency',
             seriesId: seriesModel.id,
@@ -216,10 +218,7 @@ var _default = echarts.extendChartView({
           });
         });
         el.on('mouseout', el[UNFOCUS_ADJACENCY] = function () {
-          api.dispatchAction({
-            type: 'unfocusNodeAdjacency',
-            seriesId: seriesModel.id
-          });
+          graphView._dispatchUnfocus(api);
         });
       }
     });
@@ -264,6 +263,27 @@ var _default = echarts.extendChartView({
   dispose: function () {
     this._controller && this._controller.dispose();
     this._controllerHost = {};
+
+    this._clearTimer();
+  },
+  _dispatchUnfocus: function (api, opt) {
+    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 = this._model.getData();

package/lib/chart/graph/forceHelper.js

@@ -83,10 +83,11 @@ function forceLayout(nodes, edges, opts) {
   // var k2 = k * k;
 
 
-  var friction = 0.6;
+  var initialFriction = opts.friction == null ? 0.6 : opts.friction;
+  var friction = initialFriction;
   return {
     warmUp: function () {
-      friction = 0.5;
+      friction = initialFriction * 0.8;
     },
     setFixed: function (idx) {
       nodes[idx].fixed = true;
@@ -107,6 +108,11 @@ function forceLayout(nodes, edges, opts) {
 
       for (var i = 0; i < edges.length; i++) {
         var e = edges[i];
+
+        if (e.ignoreForceLayout) {
+          continue;
+        }
+
         var n1 = e.n1;
         var n2 = e.n2;
         vec2.sub(v12, n2.p, n1.p);

package/lib/chart/graph/forceLayout.js

@@ -122,18 +122,21 @@ function _default(ecModel) {
           d = (edgeLength[0] + edgeLength[1]) / 2;
         }
 
+        var edgeModel = edge.getModel();
         return {
           n1: nodes[edge.node1.dataIndex],
           n2: nodes[edge.node2.dataIndex],
           d: d,
-          curveness: edge.getModel().get('lineStyle.curveness') || 0
+          curveness: edgeModel.get('lineStyle.curveness') || 0,
+          ignoreForceLayout: edgeModel.get('ignoreForceLayout')
         };
       });
       var coordSys = graphSeries.coordinateSystem;
       var rect = coordSys.getBoundingRect();
       var forceInstance = forceLayout(nodes, edges, {
         rect: rect,
-        gravity: forceModel.get('gravity')
+        gravity: forceModel.get('gravity'),
+        friction: forceModel.get('friction')
       });
       var oldStep = forceInstance.step;
 

package/lib/chart/heatmap/HeatmapView.js

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

package/lib/chart/helper/Symbol.js

@@ -255,6 +255,14 @@ symbolProto._updateCommon = function (data, idx, symbolSize, seriesScope) {
     symbolPath.useStyle({
       strokeNoScale: true
     });
+  } else {
+    symbolPath.setStyle({
+      opacity: null,
+      shadowBlur: null,
+      shadowOffsetX: null,
+      shadowOffsetY: null,
+      shadowColor: null
+    });
   }
 
   var itemStyle = seriesScope && seriesScope.itemStyle;

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

@@ -368,7 +368,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 +381,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 +510,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);

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 = [];

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

@@ -242,7 +242,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
   }, {