fix(graph): user cursor has higher priority (#16867)

* fix(graph): user cursor has higher priority * fix(graph): simplify code
apache · Apr 13, 2022 · ee116a0 · ee116a0
1 parent 2a67f86
commit ee116a0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/src/chart/graph/GraphSeries.ts b/src/chart/graph/GraphSeries.ts
@@ -106,6 +106,7 @@ export interface GraphNodeItemOption extends SymbolOptionMixin, GraphNodeStateOp
     category?: number | string
 
     draggable?: boolean
+    cursor?: string
 }
 
 export interface GraphEdgeStateOption {

diff --git a/src/chart/graph/GraphView.ts b/src/chart/graph/GraphView.ts
@@ -150,7 +150,7 @@ class GraphView extends ChartView {
                     }
                 });
             }
-            el.setDraggable(draggable && !!forceLayout);
+            el.setDraggable(draggable && !!forceLayout, !!itemModel.get('cursor'));
 
             const focus = itemModel.get(['emphasis', 'focus']);
 

diff --git a/src/chart/helper/Symbol.ts b/src/chart/helper/Symbol.ts
@@ -141,10 +141,10 @@ class Symbol extends graphic.Group {
         symbolPath.z = z;
     }
 
-    setDraggable(draggable: boolean) {
+    setDraggable(draggable: boolean, hasCursorOption?: boolean) {
         const symbolPath = this.childAt(0) as ECSymbol;
         symbolPath.draggable = draggable;
-        symbolPath.cursor = draggable ? 'move' : symbolPath.cursor;
+        symbolPath.cursor = !hasCursorOption && draggable ? 'move' : symbolPath.cursor;
     }
 
     /**

diff --git a/test/graph-symbol.html b/test/graph-symbol.html
-Original file line number
+Diff line change
@@ Expand Up / @@ -150,7 +150,7 @@ class GraphView extends ChartView { @@
                         }
                     });
                 }
-                el.setDraggable(draggable && !!forceLayout);
+                el.setDraggable(draggable && !!forceLayout, !!itemModel.get('cursor'));
                 const focus = itemModel.get(['emphasis', 'focus']);
@@ Expand Down @@