@meta2d/core 1.0.58 → 1.0.59

package/package.json

@@ -1,38 +1,39 @@
 {
-    "name": "@meta2d/core",
-    "version": "1.0.58",
-    "description": "@meta2d/core: Powerful, Beautiful, Simple, Open - Web-Based 2D At Its Best .",
-    "main": "index.js",
-    "types": "index.d.ts",
-    "scripts": {
-        "build": "tsc"
-    },
-    "keywords": [
-        "meta2d",
-        "diagram",
-        "2D",
-        "canvas"
-    ],
-    "author": "alsmile123@qq.com",
-    "license": "MIT",
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/le5le-com/meta2d.js.git"
-    },
-    "bugs": {
-        "url": "https://github.com/le5le-com/meta2d.js/issues"
-    },
-    "homepage": "https://github.com/le5le-com/meta2d.js#readme",
-    "devDependencies": {
-        "@types/marked": "^4.0.3",
-        "@types/offscreencanvas": "latest"
-    },
-    "dependencies": {
-        "mitt": "^2.1.0",
-        "mqtt": "^4.2.6"
-    },
-    "publishConfig": {
-        "access": "public"
-    },
-    "gitHead": "78f2a53ca1839c89b56e2e498d17ba4eb987ad14"
+  "name": "@meta2d/core",
+  "version": "1.0.59",
+  "description": "@meta2d/core: Powerful, Beautiful, Simple, Open - Web-Based 2D At Its Best .",
+  "main": "index.js",
+  "types": "index.d.ts",
+  "scripts": {
+    "copy": "copyfiles  package.json ../../dist/core/",
+    "build": "tsc && npm run copy"
+  },
+  "keywords": [
+    "meta2d",
+    "diagram",
+    "2D",
+    "canvas"
+  ],
+  "author": "alsmile123@qq.com",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/le5le-com/meta2d.js.git"
+  },
+  "bugs": {
+    "url": "https://github.com/le5le-com/meta2d.js/issues"
+  },
+  "homepage": "https://github.com/le5le-com/meta2d.js#readme",
+  "devDependencies": {
+    "@types/marked": "^4.0.3",
+    "@types/offscreencanvas": "latest"
+  },
+  "dependencies": {
+    "mitt": "^2.1.0",
+    "mqtt": "^4.2.6"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "gitHead": "78f2a53ca1839c89b56e2e498d17ba4eb987ad14"
 }

package/src/canvas/canvas.js

@@ -1652,6 +1652,13 @@ export class Canvas {
                 case HoverType.Node:
                 case HoverType.Line:
                     if (this.store.hover) {
+                        if (this.store.active?.length && this.store.active.length === 1) {
+                            if (this.store.hover.id === this.store.active[0].id) {
+                                //准备移动子图元
+                                this.calcActiveRect();
+                                break;
+                            }
+                        }
                         const parentPen = getParent(this.store.hover, true);
                         let pen = parentPen || this.store.hover;
                         if (parentPen && (parentPen.container || this.store.options.containerShapes?.includes(parentPen.name))) {
@@ -2001,9 +2008,8 @@ export class Canvas {
             return;
         }
         if (this.mouseRight === MouseRight.Down) {
-            if (this.store.hover && this.store.hover.calculative.focus) {
-                this.store.hover.onContextmenu &&
-                    this.store.hover.onContextmenu(this.store.hover, e);
+            if (this.store.hover && this.store.hover.onContextmenu) {
+                this.store.hover.onContextmenu(this.store.hover, e);
             }
             else {
                 this.store.emitter.emit('contextmenu', {
@@ -2391,6 +2397,10 @@ export class Canvas {
                     pen.calculative.y + pen.calculative.height;
             }
             calcChildrenInitRect(pen);
+            if (pen.parentId) {
+                //移动子图元，更新整个组件
+                this.parent.updateRectbyChild(pen.calculative.worldRect, pen, this.store.pens[pen.parentId]);
+            }
         });
         // active 消息表示拖拽结束
         // this.store.emitter.emit('active', this.store.active);
@@ -3344,8 +3354,17 @@ export class Canvas {
                         if (this.store.data.pens[i].type &&
                             this.store.data.pens[i].lastConnected) {
                             for (let key in this.store.data.pens[i].lastConnected) {
-                                this.store.pens[key] && (this.store.pens[key].connectedLines =
-                                    this.store.data.pens[i].lastConnected[key]);
+                                if (this.store.pens[key]) {
+                                    let connected = deepClone(this.store.data.pens[i].lastConnected[key]);
+                                    this.store.pens[key].connectedLines = connected;
+                                    pen.anchors.forEach((anchor) => {
+                                        connected.forEach((item) => {
+                                            if (anchor.id === item.lineAnchor) {
+                                                anchor.connectTo = key;
+                                            }
+                                        });
+                                    });
+                                }
                             }
                         }
                         this.store.data.pens[i] = pen;
@@ -4023,6 +4042,9 @@ export class Canvas {
             if (pen.canvasLayer === CanvasLayer.CanvasTemplate) {
                 continue;
             }
+            if (pen.name === 'combine' && !pen.draw) {
+                continue;
+            }
             if (pen.calculative.inView) {
                 if (pen.canvasLayer === CanvasLayer.CanvasMain &&
                     pen.name !== 'gif' &&
@@ -5986,6 +6008,10 @@ export class Canvas {
             this.store.data.pens.splice(i, 1);
             this.store.pens[pen.id] = undefined;
             delete this.store.pens[pen.id];
+            // 删除svgpath的数据
+            if (pen.pathId) {
+                delete this.store.data.paths[pen.pathId];
+            }
         }
         this.store.animates.delete(pen);
         this.store.animateMap.delete(pen);
@@ -6042,7 +6068,21 @@ export class Canvas {
                 this.store.hover.onShowInput(this.store.hover, e);
             }
             else {
-                this.showInput(this.store.hover);
+                if (this.store.hover && this.store.hover.parentId) {
+                    if (this.store.active?.length === 1 && this.store.active[0].id === this.store.hover.id) {
+                        this.showInput(this.store.hover);
+                    }
+                    else {
+                        this.store.pens[this.store.hover.parentId].children.forEach((id) => {
+                            this.store.pens[id].calculative.active = false;
+                            this.store.pens[id].calculative.hover = false;
+                        });
+                        this.active([this.store.hover]);
+                    }
+                }
+                else {
+                    this.showInput(this.store.hover);
+                }
             }
         }
         this.store.emitter.emit('dblclick', {