@meta2d/core 1.0.77 → 1.0.79

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meta2d/core",
-  "version": "1.0.77",
+  "version": "1.0.79",
   "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) {
@@ -1235,14 +1250,19 @@ export class Canvas {
                     pen.anchors[pen.anchors.length - 1].id,
                 ];
             }
+            else {
+                beforeIds = [pen.id];
+            }
         }
         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;
             }