[incubator-echarts] branch master updated: tweak(graph): tweak apache#12590.

[wa...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wangzx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git


The following commit(s) were added to refs/heads/master by this push:
     new ba82a40  tweak(graph): tweak apache#12590.
     new 4ffd864  Merge pull request #12891 from plainheart/tweak-12590
ba82a40 is described below

commit ba82a40326813fac5ad8beafab7446a44cdd1f8c
Author: plainheart <yh...@all-my-life.cn>
AuthorDate: Thu Jul 2 08:40:50 2020 +0800

    tweak(graph): tweak apache#12590.
---
 src/chart/graph/GraphSeries.js              | 3 +--
 src/chart/graph/forceLayout.js              | 2 +-
 src/chart/helper/createGraphFromNodeEdge.js | 2 +-
 src/chart/helper/multipleGraphEdgeHelper.js | 4 ++--
 src/data/Graph.js                           | 3 +--
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/chart/graph/GraphSeries.js b/src/chart/graph/GraphSeries.js
index e38e71a..249468a 100644
--- a/src/chart/graph/GraphSeries.js
+++ b/src/chart/graph/GraphSeries.js
@@ -25,8 +25,7 @@ import Model from '../../model/Model';
 import {encodeHTML} from '../../util/format';
 import createGraphFromNodeEdge from '../helper/createGraphFromNodeEdge';
 import LegendVisualProvider from '../../visual/LegendVisualProvider';
-import {initCurvenessList} from '../helper/multipleGraphEdgeHelper';
-import {createEdgeMapForCurveness} from '../../chart/helper/multipleGraphEdgeHelper';
+import {initCurvenessList, createEdgeMapForCurveness} from '../helper/multipleGraphEdgeHelper';
 
 var GraphSeries = echarts.extendSeriesModel({
 
diff --git a/src/chart/graph/forceLayout.js b/src/chart/graph/forceLayout.js
index a305757..2ce0d25 100644
--- a/src/chart/graph/forceLayout.js
+++ b/src/chart/graph/forceLayout.js
@@ -86,7 +86,7 @@ export default function (ecModel) {
                 }
                 var edgeModel = edge.getModel();
                 var curveness = zrUtil.retrieve3(
-                    edge.getModel().get('lineStyle.curveness'),
+                    edgeModel.get('lineStyle.curveness'),
                     -getCurvenessForEdge(edge, graphSeries, idx, true),
                     0
                 );
diff --git a/src/chart/helper/createGraphFromNodeEdge.js b/src/chart/helper/createGraphFromNodeEdge.js
index 8f875f3..ed6dfb0 100644
--- a/src/chart/helper/createGraphFromNodeEdge.js
+++ b/src/chart/helper/createGraphFromNodeEdge.js
@@ -46,7 +46,7 @@ export default function (nodes, edges, seriesModel, directed, beforeLink) {
         var target = link.target;
 
         // addEdge may fail when source or target not exists
-        if (graph.addEdge(source, target, linkCount, seriesModel)) {
+        if (graph.addEdge(source, target, linkCount)) {
             validEdges.push(link);
             linkNameList.push(zrUtil.retrieve(link.id, source + ' > ' + target));
             linkCount++;
diff --git a/src/chart/helper/multipleGraphEdgeHelper.js b/src/chart/helper/multipleGraphEdgeHelper.js
index cdc0b34..608e629 100644
--- a/src/chart/helper/multipleGraphEdgeHelper.js
+++ b/src/chart/helper/multipleGraphEdgeHelper.js
@@ -170,8 +170,8 @@ export function createEdgeMapForCurveness(n1, n2, seriesModel, index) {
  * @param index
  */
 export function getCurvenessForEdge(edge, seriesModel, index, needReverse) {
-    const autoCurvenessParams = getAutoCurvenessParams(seriesModel);
-    const isArrayParam = zrUtil.isArray(autoCurvenessParams);
+    var autoCurvenessParams = getAutoCurvenessParams(seriesModel);
+    var isArrayParam = zrUtil.isArray(autoCurvenessParams);
     if (!autoCurvenessParams) {
         return null;
     }
diff --git a/src/data/Graph.js b/src/data/Graph.js
index 6c0fca8..236089f 100644
--- a/src/data/Graph.js
+++ b/src/data/Graph.js
@@ -137,10 +137,9 @@ graphProto.getNodeById = function (id) {
  * @param {number|string|module:echarts/data/Graph.Node} n1
  * @param {number|string|module:echarts/data/Graph.Node} n2
  * @param {number} [dataIndex=-1]
- * @param {module:echarts/model/SeriesModel} seriesModel
  * @return {module:echarts/data/Graph.Edge}
  */
-graphProto.addEdge = function (n1, n2, dataIndex, seriesModel) {
+graphProto.addEdge = function (n1, n2, dataIndex) {
     var nodesMap = this._nodesMap;
     var edgesMap = this._edgesMap;
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org