@meta2d/core 1.1.3 → 1.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meta2d/core",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "description": "@meta2d/core: Powerful, Beautiful, Simple, Open - Web-Based 2D At Its Best .",
   "main": "index.js",
   "types": "index.d.ts",

package/src/canvas/canvas.js

@@ -1122,7 +1122,7 @@ export class Canvas {
         if (obj[0] && obj[0].draggable !== false) {
             const pt = { x: event.offsetX, y: event.offsetY };
             this.calibrateMouse(pt);
-            this.dropPens(obj, pt);
+            await this.dropPens(obj, pt);
             this.addCaches = [];
             // 拖拽新增图元判断是否是在容器上
             this.getContainerHover(pt);
@@ -1328,6 +1328,13 @@ export class Canvas {
             return [];
         }
         const list = [];
+        for (const pen of pens) {
+            if (!pen.id) {
+                pen.id = s8();
+            }
+            !pen.calculative && (pen.calculative = { canvas: this });
+            this.store.pens[pen.id] = pen;
+        }
         for (const pen of pens) {
             if (this.beforeAddPen && this.beforeAddPen(pen) != true) {
                 continue;
@@ -1383,6 +1390,7 @@ export class Canvas {
                 buttons: 1,
             });
             if (e.touches.length === 2) {
+                this.mouseDown = undefined;
                 this.initTouchDis = Math.hypot(e.touches[0].pageX - e.touches[1].pageX, e.touches[0].pageY - e.touches[1].pageY);
                 this.initScale = this.store.data.scale;
                 this.startTouches = e.touches;
@@ -1450,16 +1458,17 @@ export class Canvas {
             });
         }
         else if (len === 2 && this.startTouches?.length === 2) {
+            this.mouseDown = undefined;
             if (!this.touchMoving && !this.touchScaling) {
                 const x1 = this.startTouches[0].pageX - touches[0].pageX;
                 const x2 = this.startTouches[1].pageX - touches[1].pageX;
                 const y1 = this.startTouches[0].pageY - touches[0].pageY;
                 const y2 = this.startTouches[1].pageY - touches[1].pageY;
-                if (((x1 >= 0 && x2 < 0) || (x1 <= 0 && x2 > 0)) &&
-                    ((y1 >= 0 && y2 < 0) || (y1 <= 0 && y2 > 0))) {
+                if ((((x1 >= 0 && x2 < 0) || (x1 <= 0 && x2 > 0)) &&
+                    ((y1 >= 0 && y2 < 0) || (y1 <= 0 && y2 > 0))) || (x2 == 0 && y2 == 0) || (x1 == 0 && y1 == 0)) {
                     this.touchScaling = true;
                 }
-                else {
+                else if (y1 * y2 > 0 && x1 * x2 > 0) {
                     this.touchMoving = true;
                 }
             }
@@ -2812,7 +2821,7 @@ export class Canvas {
         if (this.dragRect) {
             return;
         }
-        this.store.hoverContainer = undefined;
+        // this.store.hoverContainer = undefined;
         const containerPens = this.store.data.pens.filter((pen) => pen.container || this.store.options.containerShapes?.includes(pen.name));
         if (containerPens.length) {
             for (let i = containerPens.length - 1; i >= 0; --i) {
@@ -2974,6 +2983,9 @@ export class Canvas {
                 pen.locked === LockState.Disable) {
                 continue;
             }
+            if (this.store.data.locked && pen.name === 'sceneContainer') {
+                continue;
+            }
             const r = getLineR(pen);
             if (!pen.calculative.active &&
                 !pointInSimpleRect(pt, pen.calculative.worldRect, r) &&
@@ -6023,10 +6035,25 @@ export class Canvas {
         this.store.clipboard = undefined;
         localStorage.removeItem(this.clipboardName);
         sessionStorage.setItem('page', page);
-        let copyPens = this.getAllByPens(deepClone(pens || this.store.active, true));
+        let precCopyPens = deepClone(pens, true);
+        if (!precCopyPens) {
+            precCopyPens = deepClone(this.store.active, true);
+            if (precCopyPens.length === 1 && precCopyPens[0].parentId) {
+                //复制子图元
+                precCopyPens[0].parentId = undefined;
+                precCopyPens[0].x = precCopyPens[0].calculative.worldRect.x;
+                precCopyPens[0].y = precCopyPens[0].calculative.worldRect.y;
+                precCopyPens[0].width = precCopyPens[0].calculative.worldRect.width;
+                precCopyPens[0].height = precCopyPens[0].calculative.worldRect.height;
+            }
+        }
+        let copyPens = this.getAllByPens(precCopyPens);
         //根据pens顺序复制
         copyPens.forEach((activePen) => {
             activePen.copyIndex = this.store.data.pens.findIndex((pen) => pen.id === activePen.id);
+            if (activePen.followers?.length) {
+                activePen.followers = undefined;
+            }
             if (activePen.pathId) {
                 //复制svgpath
                 activePen.path = this.store.data.paths[activePen.pathId];