@meta2d/core 1.0.76 → 1.0.78

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meta2d/core",
-  "version": "1.0.76",
+  "version": "1.0.78",
   "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

@@ -1115,6 +1115,8 @@ export class Canvas {
             !pen.parentId && this.randomCombineId(pen, pens);
         }
         if (Object.keys(this.randomIdObj).length !== 0) {
+            const keys = Object.keys(this.randomIdObj).join('|');
+            const regex = new RegExp(`(${keys})`, "g");
             for (const pen of pens) {
                 if (pen.type) {
                     pen.anchors[0].connectTo = this.randomIdObj[pen.anchors[0].connectTo];
@@ -1127,6 +1129,19 @@ export class Canvas {
                         item.lineId = this.randomIdObj[item.lineId];
                     });
                 }
+                //动画、事件和状态
+                if (pen.animations?.length) {
+                    const str = JSON.stringify(pen.animations).replace(regex, match => this.randomIdObj[match]);
+                    pen.animations = JSON.parse(str);
+                }
+                if (pen.triggers?.length) {
+                    const str = JSON.stringify(pen.triggers).replace(regex, match => this.randomIdObj[match]);
+                    pen.triggers = JSON.parse(str);
+                }
+                if (pen.events?.length) {
+                    const str = JSON.stringify(pen.events).replace(regex, match => this.randomIdObj[match]);
+                    pen.events = JSON.parse(str);
+                }
             }
         }
         for (const pen of pens) {
@@ -1237,12 +1252,14 @@ export class Canvas {
             }
         }
         else {
-            if (pen.connectedLines && pen.connectedLines.length) {
+            if (pens.length > 1) {
+                // if (pen.connectedLines && pen.connectedLines.length) {
                 beforeIds = [pen.id];
             }
         }
         randomId(pen);
-        if (beforeIds) {
+        if (pens.length > 1) {
+            // if (beforeIds) {
             if (beforeIds.length === 1) {
                 this.randomIdObj[beforeIds[0]] = pen.id;
             }
@@ -5819,8 +5836,14 @@ export class Canvas {
         const curPage = sessionStorage.getItem('page');
         const scale = this.store.data.scale;
         if (this.store.clipboard.mousePos && (Math.abs(this.store.clipboard.mousePos.x - this.mousePos.x) > 100 * scale || Math.abs(this.store.clipboard.mousePos.y - this.mousePos.y) > 100 * scale)) {
-            const offsetX = (scale - this.store.clipboard.scale) * this.store.clipboard.initRect.width / 2;
-            const offsetY = (scale - this.store.clipboard.scale) * this.store.clipboard.initRect.height / 2;
+            let _x = -this.store.clipboard.initRect.width / this.store.clipboard.scale / 10 / (scale);
+            let _y = -this.store.clipboard.initRect.height / this.store.clipboard.scale / 10 / (scale);
+            let offsetX = (scale - this.store.clipboard.scale) * this.store.clipboard.initRect.width / 2 + _x;
+            let offsetY = (scale - this.store.clipboard.scale) * this.store.clipboard.initRect.height / 2 + _y;
+            if (this.store.clipboard.pens.length > 1) {
+                offsetX = (scale - 1) * this.store.clipboard.initRect.width / this.store.clipboard.scale / 2;
+                offsetY = (scale - 1) * this.store.clipboard.initRect.height / this.store.clipboard.scale / 2;
+            }
             this.store.clipboard.pos = { x: this.mousePos.x - offsetX, y: this.mousePos.y - offsetY };
             this.store.clipboard.offset = 0;
         }
@@ -6893,7 +6916,7 @@ export class Canvas {
                 if (needCalcIconRectProps.includes(k)) {
                     willCalcIconRect = true;
                 }
-                if (pen.image && pen.name !== 'gif' && ['globalAlpha', 'flipY', 'flipX', 'x', 'y', 'width', 'height', 'iconWidth', 'iconHeight', 'imageRatio', 'iconLeft', 'iconTop', 'iconAlign', 'rotate'].includes(k)) {
+                if (pen.image && pen.name !== 'gif' && ['globalAlpha', 'flipY', 'flipX', 'x', 'y', 'width', 'height', 'iconWidth', 'iconHeight', 'imageRatio', 'iconLeft', 'iconTop', 'iconAlign', 'rotate', 'visible'].includes(k)) {
                     willRenderImage = true;
                 }
             }