@meta2d/core 1.0.69 → 1.0.71

package/package.json

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

@@ -4046,8 +4046,8 @@ export class Canvas {
                 }
             }
         });
-        this.store.globalStyle = {};
-        Object.assign(this.store.globalStyle, options, data, theme);
+        this.store.styles = {};
+        Object.assign(this.store.styles, options, data, theme);
     }
     render = (patchFlags) => {
         if (patchFlags) {
@@ -4100,7 +4100,7 @@ export class Canvas {
     };
     renderPens = () => {
         const ctx = this.offscreen.getContext('2d');
-        ctx.strokeStyle = this.store.globalStyle.color; //getGlobalColor(this.store);
+        ctx.strokeStyle = this.store.styles.color; //getGlobalColor(this.store);
         for (const pen of this.store.data.pens) {
             if (!isFinite(pen.x)) {
                 continue;
@@ -4167,7 +4167,7 @@ export class Canvas {
                     ctx.rotate((this.activeRect.rotate * Math.PI) / 180);
                     ctx.translate(-pivot.x, -pivot.y);
                 }
-                ctx.strokeStyle = this.store.globalStyle.activeColor;
+                ctx.strokeStyle = this.store.styles.activeColor;
                 ctx.globalAlpha = this.store.options.activeGlobalAlpha === undefined ? 0.3 : this.store.options.activeGlobalAlpha;
                 ctx.beginPath();
                 ctx.lineWidth = this.store.options.activeLineWidth || 1;
@@ -4189,7 +4189,7 @@ export class Canvas {
                 ctx.stroke();
                 // Draw rotate control points.
                 ctx.beginPath();
-                ctx.strokeStyle = this.store.globalStyle.activeColor;
+                ctx.strokeStyle = this.store.styles.activeColor;
                 ctx.fillStyle = '#ffffff';
                 ctx.arc(this.activeRect.center.x, this.activeRect.y - 30, 5, 0, Math.PI * 2);
                 ctx.fill();
@@ -4217,7 +4217,7 @@ export class Canvas {
             }
             if (anchors) {
                 ctx.strokeStyle =
-                    this.store.hover.anchorColor || this.store.globalStyle.anchorColor;
+                    this.store.hover.anchorColor || this.store.styles.anchorColor;
                 ctx.fillStyle =
                     this.store.hover.anchorBackground ||
                         this.store.options.anchorBackground;
@@ -4273,7 +4273,7 @@ export class Canvas {
                     if (this.store.hover.type && this.store.hoverAnchor === anchor) {
                         ctx.save();
                         ctx.strokeStyle =
-                            this.store.hover.activeColor || this.store.globalStyle.activeColor;
+                            this.store.hover.activeColor || this.store.styles.activeColor;
                         ctx.fillStyle = ctx.strokeStyle;
                     }
                     else if (anchor.color || anchor.background) {
@@ -4321,7 +4321,7 @@ export class Canvas {
             if (!getPensLock(this.store.active) &&
                 !getPensDisableResize(this.store.active) &&
                 !this.store.options.disableSize) {
-                ctx.strokeStyle = this.store.globalStyle.activeColor;
+                ctx.strokeStyle = this.store.styles.activeColor;
                 ctx.fillStyle = '#ffffff';
                 this.sizeCPs.forEach((pt, i) => {
                     if (this.activeRect.rotate) {
@@ -7096,7 +7096,7 @@ export class Canvas {
         // }
         ctx.textBaseline = 'middle'; // 默认垂直居中
         ctx.scale(scale, scale);
-        const background = this.store.globalStyle.background;
+        const background = this.store.data.background || this.store.styles.background;
         // this.store.data.background || this.store.options.background;
         if (background && isV) {
             // 绘制背景颜色
@@ -7138,7 +7138,11 @@ export class Canvas {
         else {
             // 平移画布，画笔的 worldRect 不变化
             if (isV) {
-                ctx.translate(-oldRect.x + p[3] * _scale || 0, -oldRect.y + p[0] * _scale || 0);
+                // ctx.translate(
+                //   -oldRect.x + p[3] * _scale || 0,
+                //   -oldRect.y + p[0] * _scale || 0
+                // );
+                ctx.translate(-rect.x, -rect.y);
             }
             else {
                 ctx.translate((isRight ? storeData.x : -oldRect.x) + p[3] * _scale || 0, (isBottom ? storeData.y : -oldRect.y) + p[0] * _scale || 0);
@@ -7206,7 +7210,7 @@ export class Canvas {
         const ctx = canvas.getContext('2d');
         ctx.textBaseline = 'middle'; // 默认垂直居中
         ctx.scale(scale, scale);
-        const background = this.store.globalStyle.background;
+        const background = this.store.data.background || this.store.styles.background;
         // this.store.data.background || this.store.options.background;
         if (background) {
             // 绘制背景颜色
@@ -7223,6 +7227,9 @@ export class Canvas {
                 if (!isShowChild(pen, this.store) || pen.visible == false) {
                     continue;
                 }
+                if (pen.name === 'combine' && !pen.draw) {
+                    continue;
+                }
                 const { active } = pen.calculative;
                 pen.calculative.active = false;
                 if (pen.calculative.img) {