@meta2d/core 1.1.0 → 1.1.1

package/package.json

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

@@ -264,7 +264,8 @@ export declare class Canvas {
      */
     private firefoxLoadSvg;
     loadImage(pen: Pen): void;
-    __loadImage(src: string): Promise<unknown>;
+    __loadMap: Map<any, any>;
+    __loadImage(src: string, retryNum?: number): any;
     private imageTimer;
     imageLoaded(): void;
     private templateImageTimer;

package/src/canvas/canvas.js

@@ -3324,6 +3324,7 @@ export class Canvas {
     clearCanvas() {
         this.activeRect = undefined;
         this.sizeCPs = undefined;
+        this.__loadMap = new Map();
         this.canvas
             .getContext('2d')
             .clearRect(0, 0, this.canvas.width, this.canvas.height);
@@ -4031,28 +4032,50 @@ export class Canvas {
             pen.calculative.strokeImage = pen.strokeImage;
         }
     }
+    __loadMap = new Map();
     // 加载图片到全局缓存
-    __loadImage(src) {
-        return new Promise(resolve => {
+    __loadImage(src, retryNum = 5) {
+        if (this.__loadMap.has(src))
+            return this.__loadMap.get(src); // promise
+        const promise = new Promise((resolve, reject) => {
             if (!globalStore.htmlElements[src]) {
                 const img = new Image();
                 img.crossOrigin = 'anonymous';
-                img.src = src;
+                // 处理 CDN 路径
                 if (this.store.options.cdn &&
                     !(src.startsWith('http') ||
                         src.startsWith('//') ||
                         src.startsWith('data:image'))) {
                     img.src = this.store.options.cdn + src;
                 }
+                else {
+                    img.src = src;
+                }
                 img.onload = () => {
                     globalStore.htmlElements[src] = img;
+                    this.__loadMap.delete(src); // 成功后清理
                     resolve(img);
                 };
+                img.onerror = () => {
+                    if (retryNum > 0) {
+                        console.warn(`Image ${src} load failed, retrying... (${retryNum})`);
+                        setTimeout(() => {
+                            this.__loadMap.delete(src);
+                            this.__loadImage(src, retryNum - 1).then(resolve).catch(reject);
+                        }, 1000);
+                    }
+                    else {
+                        this.__loadMap.set(src, 0);
+                        reject(new Error(`Failed to load image: ${src}`));
+                    }
+                };
             }
             else {
                 resolve(globalStore.htmlElements[src]);
             }
         });
+        this.__loadMap.set(src, promise);
+        return promise;
     }
     imageTimer;
     // 避免初始化图片加载重复调用 render，此处防抖
@@ -6558,7 +6581,7 @@ export class Canvas {
         else {
             // this.inputRight.style.display = 'none';
         }
-        this.inputDiv.contentEditable = 'true';
+        this.inputDiv.contentEditable = pen.readonly ? 'false' : 'true';
         this.inputDiv.focus();
         const range = window.getSelection(); //创建range
         range.selectAllChildren(this.inputDiv); //range 选择obj下所有子内容