fix (#43)

mizy · web-flow · commit 74592a761ab6 · 2024-04-29T15:21:51.000+08:00
* fix: shadow destroy err

* fix: clear bug

* fix: demo
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;

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@vesoft-inc/veditor",`
`3`		`- "version": "4.4.12",`
	`3`	`+ "version": "4.4.14",`
`4`	`4`	`"description": "svg flow editor",`
`5`	`5`	`"main": "./dist/VEditor.js",`
`6`	`6`	`"types": "./types/index.d.ts",`
Original file line number	Diff line number	Diff line change
`@@ -246,6 +246,7 @@ class Line {`
`246`	`246`	`line.arrow.remove();`
`247`	`247`	`line.arrow = null;`
`248`	`248`	`line.dom.remove();`
	`249`	`+ line.label = null;`
`249`	`250`	`this.activeLine = null;`
`250`	`251`	`}`
`251`	`252`
`@@ -591,6 +592,7 @@ class Line {`
`591`	`592`	`for (let key in lines) {`
`592`	`593`	`this.deleteLine(lines[key].data, true);`
`593`	`594`	`}`
	`595`	`+ this.activeLine = null;`
`594`	`596`	`}`
`595`	`597`	`}`
`596`	`598`	`export default Line;`
Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ const DefaultLine: LineRender = {`
`255`	`255`	`);`
`256`	`256`	`}`
`257`	`257`	`line.shape.appendChild(line.label.labelGroup);`
`258`		`- const { text, textRect, textBBox, oldText, labelGroup } = line.label;`
	`258`	`+ const { text, textBBox, oldText, labelGroup } = line.label;`
`259`	`259`	`const x = xPoint + (refX \|\| 0);`
`260`	`260`	`const y = yPoint + (refY \|\| 0);`
`261`	`261`	`text.textContent = label;`
Original file line number	Diff line number	Diff line change
`@@ -469,6 +469,7 @@ class Node {`
`469`	`469`	`for (let key in nodes) {`
`470`	`470`	`this.deleteNode(nodes[key].data, true);`
`471`	`471`	`}`
	`472`	`+ this.actives = {};`
`472`	`473`	`}`
`473`	`474`	`}`
`474`	`475`	`export default Node;`