fix (#43)

* fix: shadow destroy err * fix: clear bug * fix: demo
vesoft-inc · Apr 29, 2024 · 74592a7 · 74592a7
1 parent e111d20
commit 74592a7
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vesoft-inc/veditor",
-  "version": "4.4.12",
+  "version": "4.4.14",
   "description": "svg flow editor",
   "main": "./dist/VEditor.js",
   "types": "./types/index.d.ts",

diff --git a/public/flowChart.html b/public/flowChart.html
@@ -2,6 +2,7 @@
 
 <body>
   <div id="app" style="width:100%;height:300px;box-shadow:  0 0 10px 1px #123"></div>
+  <button onclick="onChangeLayoutSort()">sort</button>
 </body>
 <script src="../dist/VEditor.browser.js"></script>
 <script>
@@ -88,6 +89,7 @@
   // dagre配置
   editor.config.dagreOption = {
     rankdir: 'TB',
+    ranksep: 150
   }
   // async
   async function setData() {
@@ -98,6 +100,24 @@
   }
   setData();
 
+
+  const onChangeLayoutSort = async () => {
+    editor.config.dagreOption = {
+      // ...editor.config.dagreOption,
+      rankdir: editor.config.dagreOption?.rankdir === "TB" ? "BT" : "TB",
+      ranksep: 150,
+    };
+    const isRevert = editor.config.dagreOption?.rankdir === "TB";
+    for (const key in editor.graph.line.lines) {
+      const line = editor.graph.line.lines[key];
+      line.data.fromPoint = isRevert ? 3 : 2;
+      line.data.toPoint = isRevert ? 2 : 3;
+    }
+    editor.schema.format();
+    editor.controller.autoFit();
+  };
+
+
 </script>
 
 </html>
diff --git a/src/Shape/Graph.ts b/src/Shape/Graph.ts
@@ -158,7 +158,10 @@ class Graph extends Utils.Event {
 
 
   initDefs() {
-    if(document.getElementById("ve-svg-defs")) return;
+    if (document.getElementById("ve-svg-defs")) {
+      this.shadow = document.getElementById("ve-svg-defs") as unknown as SVGSVGElement;
+      return;
+    };
     this.shadow = svgWrapper(
       `<svg id="ve-svg-defs" style="position:absolute;left:-9999px;top:-9999px;" xmlns="http://www.w3.org/2000/svg">
       <defs>
@@ -193,6 +196,8 @@ class Graph extends Utils.Event {
   destroy() {
     this.clearGraph();
     this.clear();
+    this.shadow.remove();
+    this.shadow = undefined;
     document.removeEventListener("keydown", this.onKeyDown);
   }
 }

diff --git a/src/Shape/Line.ts b/src/Shape/Line.ts
@@ -246,6 +246,7 @@ class Line {
     line.arrow.remove();
     line.arrow = null;
     line.dom.remove();
+    line.label = null;
     this.activeLine = null;
   }
 
@@ -591,6 +592,7 @@ class Line {
     for (let key in lines) {
       this.deleteLine(lines[key].data, true);
     }
+    this.activeLine = null;
   }
 }
 export default Line;
diff --git a/src/Shape/Lines/Line.ts b/src/Shape/Lines/Line.ts
@@ -255,7 +255,7 @@ const DefaultLine: LineRender = {
       );
     }
     line.shape.appendChild(line.label.labelGroup);
-    const { text, textRect, textBBox, oldText, labelGroup } = line.label;
+    const { text, textBBox, oldText, labelGroup } = line.label;
     const x = xPoint + (refX || 0);
     const y = yPoint + (refY || 0);
     text.textContent = label;

diff --git a/src/Shape/Node.ts b/src/Shape/Node.ts
@@ -469,6 +469,7 @@ class Node {
     for (let key in nodes) {
       this.deleteNode(nodes[key].data, true);
     }
+    this.actives = {};
   }
 }
 export default Node;