@meta2d/core 1.0.87 → 1.0.89

package/package.json

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

@@ -15,6 +15,7 @@ import { MagnifierCanvas } from './magnifierCanvas';
 import { lockedError } from '../utils/error';
 import { Dialog } from '../dialog';
 import { setter } from '../utils/object';
+import { isNumber } from '../utils/tool';
 import { Title } from '../title';
 import { CanvasTemplate } from './canvasTemplate';
 import { getLinePoints } from '../diagrams/line';
@@ -369,6 +370,12 @@ export class Canvas {
         }
         let data = JSON.parse(e.data);
         if (typeof data === 'object') {
+            if (data.name === 'onload') {
+                this.dialog.iframe.contentWindow.postMessage(JSON.stringify({
+                    name: 'dialog',
+                    data: this.dialog.data
+                }), '*');
+            }
             this.parent.doMessageEvent(data.name, JSON.stringify(data.data));
         }
         else {
@@ -2631,15 +2638,16 @@ export class Canvas {
             pen.calculative.hover = false;
             setChildrenActive(pen, false);
         });
-        !drawing && this.store.emitter.emit('inactive', this.store.active);
+        const activePens = [...this.store.active];
         this.store.active = [];
         this.activeRect = undefined;
         this.sizeCPs = undefined;
         this.store.activeAnchor = undefined;
         this.patchFlags = true;
+        !drawing && this.store.emitter.emit('inactive', activePens);
     }
     active(pens, emit = true) {
-        if (this.store.active) {
+        if (this.store.active && this.store.active.length) {
             emit && this.store.emitter.emit('inactive', this.store.active);
             for (const pen of this.store.active) {
                 pen.calculative.active = undefined;
@@ -4030,31 +4038,51 @@ export class Canvas {
             pen.calculative.fontSize =
                 pen.fontSize * pen.calculative.worldRect.height;
         }
-        pen.calculative.iconSize = pen.iconSize * scale;
-        pen.calculative.iconWidth = pen.iconWidth * scale;
-        pen.calculative.iconHeight = pen.iconHeight * scale;
-        pen.calculative.iconLeft =
-            pen.iconLeft < 1 && pen.iconLeft > -1
-                ? pen.iconLeft
-                : pen.iconLeft * scale;
-        pen.calculative.iconTop =
-            pen.iconTop < 1 && pen.iconTop > -1 ? pen.iconTop : pen.iconTop * scale;
-        pen.calculative.textWidth =
-            pen.textWidth < 1 && pen.textWidth > -1
-                ? pen.textWidth
-                : pen.textWidth * scale;
-        pen.calculative.textHeight =
-            pen.textHeight < 1 && pen.textHeight > -1
-                ? pen.textHeight
-                : pen.textHeight * scale;
-        pen.calculative.textLeft =
-            pen.textLeft < 1 && pen.textLeft > -1
-                ? pen.textLeft * pen.calculative.worldRect.width
-                : pen.textLeft * scale;
-        pen.calculative.textTop =
-            pen.textTop < 1 && pen.textTop > -1 ? pen.textTop * pen.calculative.worldRect.height : pen.textTop * scale;
-        if (pen.type === PenType.Line && pen.borderWidth) {
-            pen.calculative.borderWidth = pen.borderWidth * scale;
+        if (isNumber(pen.iconSize)) {
+            pen.calculative.iconSize = pen.iconSize * scale;
+        }
+        if (isNumber(pen.iconWidth)) {
+            pen.calculative.iconWidth = pen.iconWidth * scale;
+        }
+        if (isNumber(pen.iconHeight)) {
+            pen.calculative.iconHeight = pen.iconHeight * scale;
+        }
+        if (isNumber(pen.iconLeft)) {
+            pen.calculative.iconLeft =
+                pen.iconLeft < 1 && pen.iconLeft > -1
+                    ? pen.iconLeft
+                    : pen.iconLeft * scale;
+        }
+        if (isNumber(pen.iconTop)) {
+            pen.calculative.iconTop =
+                pen.iconTop < 1 && pen.iconTop > -1 ? pen.iconTop : pen.iconTop * scale;
+        }
+        if (isNumber(pen.textWidth)) {
+            pen.calculative.textWidth =
+                pen.textWidth < 1 && pen.textWidth > -1
+                    ? pen.textWidth
+                    : pen.textWidth * scale;
+        }
+        if (isNumber(pen.textHeight)) {
+            pen.calculative.textHeight =
+                pen.textHeight < 1 && pen.textHeight > -1
+                    ? pen.textHeight
+                    : pen.textHeight * scale;
+        }
+        if (isNumber(pen.textLeft)) {
+            pen.calculative.textLeft =
+                pen.textLeft < 1 && pen.textLeft > -1
+                    ? pen.textLeft * pen.calculative.worldRect.width
+                    : pen.textLeft * scale;
+        }
+        if (isNumber(pen.textTop)) {
+            pen.calculative.textTop =
+                pen.textTop < 1 && pen.textTop > -1 ? pen.textTop * pen.calculative.worldRect.height : pen.textTop * scale;
+        }
+        if (isNumber(pen.borderWidth)) {
+            if (pen.type === PenType.Line && pen.borderWidth) {
+                pen.calculative.borderWidth = pen.borderWidth * scale;
+            }
         }
     }
     updatePenRect(pen, { worldRectIsReady, playingAnimate, } = {}) {
@@ -4082,22 +4110,24 @@ export class Canvas {
             });
         }
         pen.type && this.initLineRect(pen);
-        if (pen.calculative.gradientTimer) {
-            clearTimeout(pen.calculative.gradientTimer);
-        }
-        pen.calculative.gradientTimer = setTimeout(() => {
-            if (pen.calculative.lineGradient) {
-                pen.calculative.lineGradient = null;
+        if (pen.gradientColors || pen.lineGradientColors) {
+            if (pen.calculative.gradientTimer) {
+                clearTimeout(pen.calculative.gradientTimer);
             }
-            if (pen.calculative.gradient) {
-                pen.calculative.gradient = null;
-            }
-            if (pen.calculative.radialGradient) {
-                pen.calculative.radialGradient = null;
-            }
-            this.patchFlags = true;
-            pen.calculative.gradientTimer = undefined;
-        }, 50);
+            pen.calculative.gradientTimer = setTimeout(() => {
+                if (pen.calculative.lineGradient) {
+                    pen.calculative.lineGradient = null;
+                }
+                if (pen.calculative.gradient) {
+                    pen.calculative.gradient = null;
+                }
+                if (pen.calculative.radialGradient) {
+                    pen.calculative.radialGradient = null;
+                }
+                this.patchFlags = true;
+                pen.calculative.gradientTimer = undefined;
+            }, 50);
+        }
     }
     initGlobalStyle() {
         if (this.store.options.themeOnlyCanvas || this.store.data.themeOnlyCanvas) {
@@ -4107,15 +4137,16 @@ export class Canvas {
         const data = {};
         const theme = {};
         themeKeys.forEach(key => {
-            if (this.store.options[key] !== undefined) {
+            // 过滤调 null undefined ''
+            if (this.store.options[key] != null && this.store.options[key] !== '') {
                 options[key] = this.store.options[key];
             }
-            if (this.store.data[key] !== undefined) {
+            if (this.store.data[key] != null && this.store.data[key] !== '') {
                 data[key] = this.store.data[key];
             }
             if (this.store.data.theme) {
                 const value = this.store.theme[this.store.data.theme]?.[key];
-                if (value !== undefined) {
+                if (value != null && value !== '') {
                     theme[key] = value;
                 }
             }
@@ -4196,7 +4227,7 @@ export class Canvas {
                     pen.calculative.img) {
                     ctx.save();
                     ctxFlip(ctx, pen);
-                    if (pen.calculative.rotate) {
+                    if (pen.rotateByRoot || pen.calculative.rotate) {
                         ctxRotate(ctx, pen);
                     }
                     setGlobalAlpha(ctx, pen);
@@ -5555,7 +5586,10 @@ export class Canvas {
      * @param angle 本次的旋转值，加到 pen.calculative.rotate 上
      */
     rotatePen(pen, angle, rect) {
-        if (pen.type) {
+        if (pen.rotateByRoot) {
+            return;
+        }
+        if (pen.name === 'line') {
             pen.calculative.worldAnchors.forEach((anchor) => {
                 rotatePoint(anchor, angle, rect.center);
             });
@@ -6583,7 +6617,7 @@ export class Canvas {
                 this.store.emitter.emit('change', pen);
                 this.store.emitter.emit('valueUpdate', pen);
             }
-            else if (pen.text === this.inputDiv.dataset.value && pen.calculative.textLines.length == 0) {
+            else if (pen.text === this.inputDiv.dataset.value && pen.calculative.textLines && pen.calculative.textLines.length == 0) {
                 calcTextRect(pen);
             }
             this.initTemplateCanvas([pen]);
@@ -7005,7 +7039,7 @@ export class Canvas {
             this.updatePenRect(pen);
         }
         else {
-            willCalcTextRect && calcTextRect(pen);
+            !pen.hiddenText && willCalcTextRect && calcTextRect(pen);
             willCalcIconRect && calcIconRect(this.store.pens, pen);
             if (willUpdatePath) {
                 globalStore.path2dDraws[pen.name] &&