@meta2d/core 1.0.81 → 1.0.83

package/package.json

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

package/src/canvas/canvas.d.ts

@@ -260,6 +260,7 @@ export declare class Canvas {
      */
     private firefoxLoadSvg;
     loadImage(pen: Pen): void;
+    __loadImage(src: string): Promise<unknown>;
     private imageTimer;
     imageLoaded(): void;
     private templateImageTimer;

package/src/canvas/canvas.js

@@ -3646,6 +3646,12 @@ export class Canvas {
             });
         }
         !pen.rotate && (pen.rotate = 0);
+        pen.lineAnimateImages ??= [];
+        if (pen.lineAnimateImages) {
+            pen.lineAnimateImages.forEach((src) => {
+                this.__loadImage(src);
+            });
+        }
         this.loadImage(pen);
         this.parent.penNetwork(pen);
     }
@@ -3966,6 +3972,29 @@ export class Canvas {
             pen.calculative.strokeImage = pen.strokeImage;
         }
     }
+    // 加载图片到全局缓存
+    __loadImage(src) {
+        return new Promise(resolve => {
+            if (!globalStore.htmlElements[src]) {
+                const img = new Image();
+                img.crossOrigin = 'anonymous';
+                img.src = src;
+                if (this.store.options.cdn &&
+                    !(src.startsWith('http') ||
+                        src.startsWith('//') ||
+                        src.startsWith('data:image'))) {
+                    img.src = this.store.options.cdn + src;
+                }
+                img.onload = () => {
+                    globalStore.htmlElements[src] = img;
+                    resolve(img);
+                };
+            }
+            else {
+                resolve(globalStore.htmlElements[src]);
+            }
+        });
+    }
     imageTimer;
     // 避免初始化图片加载重复调用 render，此处防抖
     imageLoaded() {
@@ -4519,11 +4548,11 @@ export class Canvas {
         }
         scalePoint(this.store.data.origin, s, center);
         this.store.data.pens.forEach((pen) => {
+            pen.onScale && pen.onScale(pen);
             if (pen.parentId) {
                 return;
             }
             scalePen(pen, s, center);
-            pen.onScale && pen.onScale(pen);
             if (pen.isRuleLine) {
                 // 扩大线的比例，若是放大，即不缩小，若是缩小，会放大
                 const lineScale = 1 / s; //s > 1 ? 1 : 1 / s / s;
@@ -5844,6 +5873,11 @@ export class Canvas {
             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 (scale < this.store.clipboard.scale) {
+                // 减小粘贴偏移量
+                offsetX = (scale - this.store.clipboard.scale) / ((this.store.clipboard.scale - scale) * 100) * this.store.clipboard.initRect.width / 2 + _x;
+                offsetY = (scale - this.store.clipboard.scale) / ((this.store.clipboard.scale - scale) * 100) * 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;