4.4.2 release

.github/workflows/github-pages.yml

@@ -1,4 +1,4 @@
-name: Dashboard-Ent Release
+name: VEditor GitHub Pages
 on:
   push:
     branches:
@@ -15,10 +15,11 @@ jobs:
       - name: Install dependencies
         run: npm ci
       - name: Build
-        run: npm run build:all 
+        run: npm run build:all && npm run doc
       - name: Delete node_modules
-        run: rm -rf node_modules
-             rm -rf demo
+        run: |
+          rm -rf node_modules && rm -rf demo && rm -rf src
+          rm .gitignore
       - name: Deploy to GitHub Pages
         uses: peaceiris/actions-gh-pages@v3
         with:

.gitignore

@@ -60,4 +60,5 @@ typings/
 
 # next.js build output
 .next
-types/
+types/
+dist/

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vesoft-inc/veditor",
-  "version": "4.4.1-beta.0",
+  "version": "4.4.2",
   "description": "svg flow editor",
   "main": "./dist/VEditor.js",
   "types": "./types/index.d.ts",

src/Model/Schema.ts

@@ -126,7 +126,7 @@ class Schema {
       node.data.x = nodeData.x;
       node.data.y = nodeData.y;
     });
-    
+
     // 触发format事件，保存历史
     this.editor.graph.update();
     /**
@@ -183,6 +183,7 @@ class Schema {
 
   /**
    * 获取当前最新的map
+   * TODO: 数据引用有点混乱，应该去除掉nodesMap和linesMap，改为实时获取
    */
   makeNowDataMap() {
     const nodes = this.editor.graph.node.nodes;

src/Shape/Graph.ts

@@ -12,7 +12,6 @@ class Graph extends Utils.Event {
   node: Node;
   line: Line;
   anchorLine: AnchorLine;
-  mode: "edit" | "view";
   linkStatus: string;
   data: VEditorSchema;
   constructor(editor: VEditor) {
@@ -22,9 +21,6 @@ class Graph extends Utils.Event {
     this.line = new Line(this);
     this.anchorLine = new AnchorLine(this);
 
-    // 模式：操作、查看模式
-    this.mode = editor.config.mode;
-
     this.listenEvents();
     if (this.editor.config.showBackGrid) {
       this.addBack();
@@ -68,7 +64,7 @@ class Graph extends Utils.Event {
   onKeyDown = (e: KeyboardEvent) => {
 
     // 查看模式不能删除节点、线条；如果存在部分可操作则自己在业务中监听处理相关逻辑
-    if (this.mode === "view") {
+    if (this.editor.config.mode === "view") {
       return
     }
     if (
@@ -98,16 +94,20 @@ class Graph extends Utils.Event {
       /**
        * @event Graph#copy
        * @type {Object}
-       */
-      this.fire("copy", { event: e });
+      */
+      if (!this.editor.config.disableCopy) {
+        this.fire("copy", { event: e });
+      }
       return;
     }
     if (e.keyCode === "V".charCodeAt(0) && (e.metaKey || e.ctrlKey)) {
       /**
        * @event Graph#paste
        * @type {Object}
-       */
-      this.fire("paste", { event: e });
+      */
+      if (!this.editor.config.disableCopy) {
+        this.fire("paste", { event: e });
+      }
       return;
     }
     if (

src/Shape/Line.ts

@@ -419,7 +419,7 @@ class Line {
        */
       this.graph.fire("line:click", { line: g, event: e });
     });
-    if (this.graph.mode === "view") return;
+    if (this.graph.editor.config.mode === "view") return;
     let startX: number;
     let startY: number;
     // 箭头拖拽
@@ -505,7 +505,7 @@ class Line {
    * 节点的新增线逻辑
    */
   addLinkPointEvent = (point: InstanceNodePoint) => {
-    if (this.graph.mode === "view") return;
+    if (this.graph.editor.config.mode === "view") return;
     const { nodes } = this.graph.node;
     const node = nodes[point.nodeId];
     let startX: number;

src/Shape/Lines/Line.ts

@@ -115,7 +115,7 @@ const DefaultLine: LineRender = {
       }
 
     } else {
-      const offsetLength = Math.sqrt(Math.pow(start.x - end.y, 2) + Math.pow(start.x - end.y, 2)) / this.arcRatio; // 连接点的距离的一半作为控制点的长度
+      const offsetLength = Math.sqrt(Math.pow(start.x - end.x, 2) + Math.pow(start.y - end.y, 2)) / this.arcRatio; // 连接点的距离的一半作为控制点的长度
       startControlPoint.x += Math.cos(startAngle) * offsetLength;
       startControlPoint.y += Math.sin(startAngle) * offsetLength; // svg坐标系倒置需要给y坐标加负号
       endControlPoint.x += Math.cos(endAngle) * offsetLength;

src/Shape/Node.ts

@@ -176,7 +176,7 @@ class Node {
    * 删除节点
    *  @param {object} data
    */
-  deleteNode = (input: VEditorNode | string) => {
+  deleteNode = (input: VEditorNode | string, noEvent: boolean = false) => {
     const uuid = typeof input === "string" ? input : input.uuid;
     const deleteNode = this.nodes[uuid] as InstanceNode;
     const nodeRender = this.shapes[deleteNode.data.type || "default"];
@@ -185,7 +185,9 @@ class Node {
     /**
      * @event Graph#node:remove - 移除节点事件
      */
-    this.graph.fire("node:remove", { node: deleteNode, uuid });
+    if (!noEvent) {
+      this.graph.fire("node:remove", { node: deleteNode, uuid });
+    }
     deleteNode.linkPoints?.forEach((point) => {
       point.dom.remove();
       point = null;
@@ -489,7 +491,7 @@ class Node {
     const { nodes } = this;
     clearTimeout(this.timeout);
     for (let key in nodes) {
-      this.deleteNode(nodes[key].data);
+      this.deleteNode(nodes[key].data, true);
     }
   }
 }

src/VEditor.ts

@@ -13,6 +13,7 @@ export interface VEditorOptions {
   hideAchor?: boolean;
   hideAchorLine?: boolean;
   anchorDistance?: number;
+  disableCopy?: boolean;
   showBackGrid?: boolean;
   showMiniMap?: boolean;
   mode?: "edit" | "view";

tsconfig.json

@@ -1,5 +1,7 @@
 {
-  "include": ["src/**/*"],
+  "include": [
+    "src/**/*"
+  ],
   "compileOnSave": true,
   "compilerOptions": {
     "pretty": true,
@@ -9,11 +11,11 @@
     "importHelpers": true,
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
-    "jsx":"react",
+    "jsx": "react",
     "outDir": "dist",
-    "module": "es6",
-    "target": "es5",
+    "module": "esnext",
+    "target": "ES2015",
     "resolveJsonModule": true,
-    "moduleResolution": "node"
+    "moduleResolution": "NodeNext"
   }
 }