@meta2d/core 1.0.66 → 1.0.67

package/package.json

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

@@ -6051,7 +6051,9 @@ export class Canvas {
         const i = this.store.data.pens.findIndex((item) => item.id === pen.id);
         if (i > -1) {
             const delPen = this.store.pens[pen.id];
-            delPen.calculative.active = undefined;
+            if (delPen && delPen.calculative) {
+                delPen.calculative.active = undefined;
+            }
             delPens.push(delPen);
         }
         if (pen.children) {
@@ -6995,7 +6997,7 @@ export class Canvas {
         const oldRect = deepClone(rect);
         const storeData = this.store.data;
         // TODO: 目前背景颜色优先级更高
-        const isDrawBkImg = containBkImg && !storeData.background && this.store.bkImg;
+        const isDrawBkImg = containBkImg && this.store.bkImg;
         // 主体在背景的右侧，下侧
         let isRight = false, isBottom = false;
         if (isDrawBkImg) {
@@ -7066,16 +7068,11 @@ export class Canvas {
         ctx.textBaseline = 'middle'; // 默认垂直居中
         ctx.scale(scale, scale);
         const background = this.store.data.background || this.store.options.background;
-        if (background) {
+        if (background && isV) {
             // 绘制背景颜色
             ctx.save();
             ctx.fillStyle = background;
-            if (isV) {
-                ctx.fillRect(0, 0, vRect.width + (p[1] + p[3]) * _scale, vRect.height + (p[0] + p[2]) * _scale);
-            }
-            else {
-                ctx.fillRect(0, 0, oldRect.width + (p[3] + p[1]) * _scale, oldRect.height + (p[0] + p[2]) * _scale);
-            }
+            ctx.fillRect(0, 0, vRect.width + (p[1] + p[3]) * _scale, vRect.height + (p[0] + p[2]) * _scale);
             ctx.restore();
         }
         if (isDrawBkImg) {
@@ -7088,6 +7085,23 @@ export class Canvas {
                 ctx.drawImage(this.store.bkImg, x, y, this.canvasRect.width, this.canvasRect.height);
             }
         }
+        if (background && !isV) {
+            // 绘制背景颜色
+            if (isDrawBkImg) {
+                const x = rect.x < 0 ? -rect.x : 0;
+                const y = rect.y < 0 ? -rect.y : 0;
+                ctx.save();
+                ctx.fillStyle = background;
+                ctx.fillRect(x, y, this.canvasRect.width, this.canvasRect.height);
+                ctx.restore();
+            }
+            else {
+                ctx.save();
+                ctx.fillStyle = background;
+                ctx.fillRect(0, 0, oldRect.width + (p[3] + p[1]) * _scale, oldRect.height + (p[0] + p[2]) * _scale);
+                ctx.restore();
+            }
+        }
         if (!isDrawBkImg) {
             ctx.translate(-rect.x, -rect.y);
         }