echarts 4.0.1 → 4.1.0

package/lib/chart/radar.js

@@ -16,6 +16,24 @@ var dataFilter = require("../processor/dataFilter");
 
 var backwardCompat = require("./radar/backwardCompat");
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
 // Must use radar component
 echarts.registerVisual(dataColor('radar'));
 echarts.registerVisual(visualSymbol('radar', 'circle'));

package/lib/chart/sankey/SankeySeries.js

@@ -6,6 +6,25 @@ var _format = require("../../util/format");
 
 var encodeHTML = _format.encodeHTML;
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
 /**
  * @file Get initial data and define sankey view's series model
  * @author Deqing Li(annong035@gmail.com)
@@ -29,6 +48,11 @@ var SankeySeries = SeriesModel.extend({
       return graph.data;
     }
   },
+  setNodePosition: function (dataIndex, localPosition) {
+    var dataItem = this.option.data[dataIndex];
+    dataItem.localX = localPosition[0];
+    dataItem.localY = localPosition[1];
+  },
 
   /**
    * Return the graphic data structure
@@ -81,6 +105,8 @@ var SankeySeries = SeriesModel.extend({
     nodeWidth: 20,
     // the vertical distance between two nodes
     nodeGap: 8,
+    // control if the node can move or not
+    draggable: true,
     // the number of iterations to change the position of the node
     layoutIterations: 32,
     label: {

package/lib/chart/sankey/SankeyView.js

@@ -2,6 +2,25 @@ var graphic = require("../../util/graphic");
 
 var echarts = require("../../echarts");
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
 /**
  * @file  The file used to draw sankey view
  * @author  Deqing Li(annong035@gmail.com)
@@ -39,7 +58,11 @@ var _default = echarts.extendChartView({
   render: function (seriesModel, ecModel, api) {
     var graph = seriesModel.getGraph();
     var group = this.group;
-    var layoutInfo = seriesModel.layoutInfo;
+    var layoutInfo = seriesModel.layoutInfo; // view width
+
+    var width = layoutInfo.width; // view height
+
+    var height = layoutInfo.height;
     var nodeData = seriesModel.getData();
     var edgeData = seriesModel.getData('edge');
     this._model = seriesModel;
@@ -54,13 +77,19 @@ var _default = echarts.extendChartView({
       var lineStyleModel = edge.getModel('lineStyle');
       var curvature = lineStyleModel.get('curveness');
       var n1Layout = edge.node1.getLayout();
+      var node1Model = edge.node1.getModel();
+      var dragX1 = node1Model.get('localX');
+      var dragY1 = node1Model.get('localY');
       var n2Layout = edge.node2.getLayout();
+      var node2Model = edge.node2.getModel();
+      var dragX2 = node2Model.get('localX');
+      var dragY2 = node2Model.get('localY');
       var edgeLayout = edge.getLayout();
       curve.shape.extent = Math.max(1, edgeLayout.dy);
-      var x1 = n1Layout.x + n1Layout.dx;
-      var y1 = n1Layout.y + edgeLayout.sy + edgeLayout.dy / 2;
-      var x2 = n2Layout.x;
-      var y2 = n2Layout.y + edgeLayout.ty + edgeLayout.dy / 2;
+      var x1 = (dragX1 != null ? dragX1 * width : n1Layout.x) + n1Layout.dx;
+      var y1 = (dragY1 != null ? dragY1 * height : n1Layout.y) + edgeLayout.sy + edgeLayout.dy / 2;
+      var x2 = dragX2 != null ? dragX2 * width : n2Layout.x;
+      var y2 = (dragY2 != null ? dragY2 * height : n2Layout.y) + edgeLayout.ty + edgeLayout.dy / 2;
       var cpx1 = x1 * (1 - curvature) + x2 * curvature;
       var cpy1 = y1;
       var cpx2 = x1 * curvature + x2 * (1 - curvature);
@@ -90,19 +119,21 @@ var _default = echarts.extendChartView({
       graphic.setHoverStyle(curve, edge.getModel('emphasis.lineStyle').getItemStyle());
       group.add(curve);
       edgeData.setItemGraphicEl(edge.dataIndex, curve);
-    }); // generate a rect  for each node
+    }); // generate a rect for each node
 
     graph.eachNode(function (node) {
       var layout = node.getLayout();
       var itemModel = node.getModel();
+      var dragX = itemModel.get('localX');
+      var dragY = itemModel.get('localY');
       var labelModel = itemModel.getModel('label');
       var labelHoverModel = itemModel.getModel('emphasis.label');
       var rect = new graphic.Rect({
         shape: {
-          x: layout.x,
-          y: layout.y,
-          width: node.getLayout().dx,
-          height: node.getLayout().dy
+          x: dragX != null ? dragX * width : layout.x,
+          y: dragY != null ? dragY * height : layout.y,
+          width: layout.dx,
+          height: layout.dy
         },
         style: itemModel.getModel('itemStyle').getItemStyle()
       });
@@ -119,6 +150,27 @@ var _default = echarts.extendChartView({
       nodeData.setItemGraphicEl(node.dataIndex, rect);
       rect.dataType = 'node';
     });
+    var draggable = seriesModel.get('draggable');
+
+    if (draggable) {
+      nodeData.eachItemGraphicEl(function (el, dataIndex) {
+        el.drift = function (dx, dy) {
+          this.shape.x += dx;
+          this.shape.y += dy;
+          this.dirty();
+          api.dispatchAction({
+            type: 'dragNode',
+            seriesId: seriesModel.id,
+            dataIndex: nodeData.getRawIndex(dataIndex),
+            localX: this.shape.x / width,
+            localY: this.shape.y / height
+          });
+        };
+
+        el.draggable = true;
+        el.cursor = 'move';
+      });
+    }
 
     if (!this._data && seriesModel.get('animation')) {
       group.setClipPath(createGridClipShape(group.getBoundingRect(), seriesModel, function () {

package/lib/chart/sankey/sankeyAction.js

@@ -0,0 +1,34 @@
+var echarts = require("../../echarts");
+
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+echarts.registerAction({
+  type: 'dragNode',
+  event: 'dragNode',
+  // here can only use 'update' now, other value is not support in echarts.
+  update: 'update'
+}, function (payload, ecModel) {
+  ecModel.eachComponent({
+    mainType: 'series',
+    subType: 'sankey',
+    query: payload
+  }, function (seriesModel) {
+    seriesModel.setNodePosition(payload.dataIndex, [payload.localX, payload.localY]);
+  });
+});

package/lib/chart/sankey/sankeyLayout.js

@@ -4,9 +4,32 @@ var nest = require("../../util/array/nest");
 
 var zrUtil = require("zrender/lib/core/util");
 
+var _config = require("../../config");
+
+var __DEV__ = _config.__DEV__;
+
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
 /**
  * @file The layout algorithm of sankey view
- * @author  Deqing Li(annong035@gmail.com)
+ * @author Deqing Li(annong035@gmail.com)
  */
 function _default(ecModel, api, payload) {
   ecModel.eachSeriesByType('sankey', function (seriesModel) {
@@ -44,7 +67,7 @@ function getViewRect(seriesModel, api) {
 }
 
 function layoutSankey(nodes, edges, nodeWidth, nodeGap, width, height, iterations) {
-  computeNodeBreadths(nodes, nodeWidth, width);
+  computeNodeBreadths(nodes, edges, nodeWidth, width);
   computeNodeDepths(nodes, edges, height, nodeGap, iterations);
   computeEdgeDepths(nodes);
 }
@@ -66,7 +89,10 @@ function computeNodeValues(nodes) {
   });
 }
 /**
- * Compute the x-position for each node
+ * Compute the x-position for each node.
+ * 
+ * Here we use Kahn algorithm to detect cycle when we traverse
+ * the node to computer the initial x position.
  *
  * @param {module:echarts/data/Graph~Node} nodes  node of sankey view
  * @param  {number} nodeWidth  the dx of the node
@@ -74,33 +100,56 @@ function computeNodeValues(nodes) {
  */
 
 
-function computeNodeBreadths(nodes, nodeWidth, width) {
-  var remainNodes = nodes;
-  var nextNode = null;
+function computeNodeBreadths(nodes, edges, nodeWidth, width) {
+  // Used to mark whether the edge is deleted. if it is deleted,
+  // the value is 0, otherwise it is 1.
+  var remainEdges = []; // Storage each node's indegree.
+
+  var indegreeArr = []; //Used to storage the node with indegree is equal to 0.
+
+  var zeroIndegrees = [];
+  var nextNode = [];
   var x = 0;
   var kx = 0;
 
-  while (remainNodes.length) {
-    nextNode = [];
+  for (var i = 0; i < edges.length; i++) {
+    remainEdges[i] = 1;
+  }
+
+  for (var i = 0; i < nodes.length; i++) {
+    indegreeArr[i] = nodes[i].inEdges.length;
+
+    if (indegreeArr[i] === 0) {
+      zeroIndegrees.push(nodes[i]);
+    }
+  }
 
-    for (var i = 0, len = remainNodes.length; i < len; i++) {
-      var node = remainNodes[i];
+  while (zeroIndegrees.length) {
+    zrUtil.each(zeroIndegrees, function (node) {
       node.setLayout({
         x: x
       }, true);
       node.setLayout({
         dx: nodeWidth
       }, true);
-
-      for (var j = 0, lenj = node.outEdges.length; j < lenj; j++) {
-        nextNode.push(node.outEdges[j].node2);
-      }
-    }
-
-    remainNodes = nextNode;
+      zrUtil.each(node.outEdges, function (edge) {
+        var indexEdge = edges.indexOf(edge);
+        remainEdges[indexEdge] = 0;
+        var targetNode = edge.node2;
+        var nodeIndex = nodes.indexOf(targetNode);
+
+        if (--indegreeArr[nodeIndex] === 0) {
+          nextNode.push(targetNode);
+        }
+      });
+    });
     ++x;
+    zeroIndegrees = nextNode;
+    nextNode = [];
   }
 
+  for (var i = 0; i < remainEdges.length; i++) {}
+
   moveSinksRight(nodes, x);
   kx = (width - nodeWidth) / (x - 1);
   scaleNodeBreadths(nodes, kx);
@@ -247,7 +296,7 @@ function resolveCollisions(nodesByBreadth, nodeGap, height) {
       }
 
       y0 = node.getLayout().y + node.getLayout().dy + nodeGap;
-    } // if the bottommost node goes outside the bounds, push it back up
+    } // If the bottommost node goes outside the bounds, push it back up
 
 
     dy = y0 - nodeGap - height;
@@ -390,7 +439,7 @@ function ascendingDepth(a, b) {
 }
 
 function ascending(a, b) {
-  return a < b ? -1 : a > b ? 1 : a === b ? 0 : NaN;
+  return a - b;
 }
 
 function getEdgeValue(edge) {

package/lib/chart/sankey/sankeyVisual.js

@@ -2,6 +2,25 @@ var VisualMapping = require("../../visual/VisualMapping");
 
 var zrUtil = require("zrender/lib/core/util");
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
 /**
  * @file Visual encoding for sankey view
  * @author  Deqing Li(annong035@gmail.com)
@@ -10,28 +29,39 @@ function _default(ecModel, payload) {
   ecModel.eachSeriesByType('sankey', function (seriesModel) {
     var graph = seriesModel.getGraph();
     var nodes = graph.nodes;
-    nodes.sort(function (a, b) {
-      return a.getLayout().value - b.getLayout().value;
-    });
-    var minValue = nodes[0].getLayout().value;
-    var maxValue = nodes[nodes.length - 1].getLayout().value;
-    zrUtil.each(nodes, function (node) {
-      var mapping = new VisualMapping({
-        type: 'color',
-        mappingMethod: 'linear',
-        dataExtent: [minValue, maxValue],
-        visual: seriesModel.get('color')
+
+    if (nodes.length) {
+      var minValue = Infinity;
+      var maxValue = -Infinity;
+      zrUtil.each(nodes, function (node) {
+        var nodeValue = node.getLayout().value;
+
+        if (nodeValue < minValue) {
+          minValue = nodeValue;
+        }
+
+        if (nodeValue > maxValue) {
+          maxValue = nodeValue;
+        }
       });
-      var mapValueToColor = mapping.mapValueToVisual(node.getLayout().value);
-      node.setVisual('color', mapValueToColor); // If set itemStyle.normal.color
+      zrUtil.each(nodes, function (node) {
+        var mapping = new VisualMapping({
+          type: 'color',
+          mappingMethod: 'linear',
+          dataExtent: [minValue, maxValue],
+          visual: seriesModel.get('color')
+        });
+        var mapValueToColor = mapping.mapValueToVisual(node.getLayout().value);
+        node.setVisual('color', mapValueToColor); // If set itemStyle.normal.color
 
-      var itemModel = node.getModel();
-      var customColor = itemModel.get('itemStyle.color');
+        var itemModel = node.getModel();
+        var customColor = itemModel.get('itemStyle.color');
 
-      if (customColor != null) {
-        node.setVisual('color', customColor);
-      }
-    });
+        if (customColor != null) {
+          node.setVisual('color', customColor);
+        }
+      });
+    }
   });
 }
 

package/lib/chart/sankey.js

@@ -4,9 +4,29 @@ require("./sankey/SankeySeries");
 
 require("./sankey/SankeyView");
 
+require("./sankey/sankeyAction");
+
 var sankeyLayout = require("./sankey/sankeyLayout");
 
 var sankeyVisual = require("./sankey/sankeyVisual");
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
 echarts.registerLayout(sankeyLayout);
 echarts.registerVisual(sankeyVisual);

package/lib/chart/scatter/ScatterSeries.js

@@ -2,6 +2,24 @@ var createListFromArray = require("../helper/createListFromArray");
 
 var SeriesModel = require("../../model/Series");
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
 var _default = SeriesModel.extend({
   type: 'series.scatter',
   dependencies: ['grid', 'polar', 'geo', 'singleAxis', 'calendar'],
@@ -60,9 +78,9 @@ var _default = SeriesModel.extend({
     // },
     itemStyle: {
       opacity: 0.8 // color: 各异
+      // progressive: null
 
-    },
-    progressive: null
+    }
   }
 });
 

package/lib/chart/scatter/ScatterView.js

@@ -6,6 +6,24 @@ var LargeSymbolDraw = require("../helper/LargeSymbolDraw");
 
 var pointsLayout = require("../../layout/points");
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
 echarts.extendChartView({
   type: 'scatter',
   render: function (seriesModel, ecModel, api) {

package/lib/chart/scatter.js

@@ -10,6 +10,24 @@ var layoutPoints = require("../layout/points");
 
 require("../component/gridSimple");
 
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
 // import * as zrUtil from 'zrender/src/core/util';
 // In case developer forget to include grid component
 echarts.registerVisual(visualSymbol('scatter', 'circle'));