@meta2d/core 1.0.69 → 1.0.70

package/src/pen/model.js

@@ -87,6 +87,7 @@ export const isDomShapes = [
     'echarts',
     'highcharts',
     'lightningCharts',
+    'vue'
 ];
 /**
  *  交互图元

package/src/pen/model.js.map

@@ -1 +1 @@
-{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../../packages/core/src/pen/model.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../../packages/core/src/pen/model.ts"],"names":[],"mappings":"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"}

package/src/pen/render.js

@@ -738,11 +738,11 @@ export function drawImage(ctx, pen) {
  */
 export function getTextColor(pen, store) {
     const { textColor, color } = pen.calculative;
-    const { globalStyle } = store;
+    const { styles } = store;
     return (textColor ||
         color ||
-        globalStyle.textColor ||
-        globalStyle.color);
+        styles.textColor ||
+        styles.color);
 }
 function drawText(ctx, pen) {
     const { fontStyle, fontWeight, fontSize, fontFamily, lineHeight, text, hiddenText, canvas, textHasShadow, textBackground, textType, } = pen.calculative;
@@ -764,10 +764,10 @@ function drawText(ctx, pen) {
                 pSBC(0.4, getTextColor(pen, store));
     }
     else if (pen.calculative.hover) {
-        fill = pen.hoverTextColor || pen.hoverColor || store.globalStyle.hoverColor;
+        fill = pen.hoverTextColor || pen.hoverColor || store.styles.hoverColor;
     }
     else if (pen.calculative.active) {
-        fill = pen.activeTextColor || pen.activeColor || store.globalStyle.activeColor;
+        fill = pen.activeTextColor || pen.activeColor || store.styles.activeColor;
     }
     let gradient = undefined;
     if (textType === Gradient.Linear) {
@@ -877,10 +877,10 @@ function drawFillText(ctx, pen, text) {
     ctx.save();
     let fill = undefined;
     if (pen.calculative.hover) {
-        fill = pen.hoverTextColor || pen.hoverColor || store.globalStyle.hoverColor;
+        fill = pen.hoverTextColor || pen.hoverColor || store.styles.hoverColor;
     }
     else if (pen.calculative.active) {
-        fill = pen.activeTextColor || pen.activeColor || store.globalStyle.activeColor;
+        fill = pen.activeTextColor || pen.activeColor || store.styles.activeColor;
     }
     ctx.fillStyle = fill || getTextColor(pen, store);
     ctx.font = getFont({
@@ -1082,20 +1082,20 @@ export function renderPen(ctx, pen, download) {
     if (pen.calculative.disabled) {
         _stroke =
             pen.disabledColor ||
-                store.globalStyle.disabledColor ||
-                pSBC(0.4, pen.calculative.color || store.globalStyle.color);
+                store.styles.disabledColor ||
+                pSBC(0.4, pen.calculative.color || store.styles.color);
         fill =
             pen.disabledBackground ||
-                store.globalStyle.disabledBackground ||
-                pSBC(0.4, pen.calculative.background || store.globalStyle.penBackground);
+                store.styles.disabledBackground ||
+                pSBC(0.4, pen.calculative.background || store.styles.penBackground);
     }
     else if (pen.mouseDownValid && pen.calculative.mouseDown) {
         _stroke =
             pen.mouseDownColor ||
-                pSBC(-0.4, pen.calculative.color || store.globalStyle.color);
+                pSBC(-0.4, pen.calculative.color || store.styles.color);
         fill =
             pen.mouseDownBackground ||
-                pSBC(-0.4, pen.calculative.background || store.globalStyle.penBackground);
+                pSBC(-0.4, pen.calculative.background || store.styles.penBackground);
     }
     else if (pen.switch && pen.calculative.checked) {
         if (!pen.calculative.bkType) {
@@ -1103,23 +1103,23 @@ export function renderPen(ctx, pen, download) {
         }
     }
     else if (pen.calculative.hover) {
-        _stroke = pen.hoverColor || store.globalStyle.hoverColor;
-        fill = pen.hoverBackground || store.globalStyle.hoverBackground;
+        _stroke = pen.hoverColor || store.styles.hoverColor;
+        fill = pen.hoverBackground || store.styles.hoverBackground;
         //  ctx.fillStyle = fill;
         //  fill && (setBack = false);
     }
     else if (pen.calculative.active) {
-        _stroke = pen.activeColor || store.globalStyle.activeColor;
-        fill = pen.activeBackground || store.globalStyle.activeBackground;
+        _stroke = pen.activeColor || store.styles.activeColor;
+        fill = pen.activeBackground || store.styles.activeBackground;
         // ctx.fillStyle = fill;
         // fill && (setBack = false);
     }
     else if (pen.calculative.isDock) {
         if (pen.type === PenType.Line) {
-            _stroke = store.globalStyle.dockPenColor;
+            _stroke = store.styles.dockPenColor;
         }
         else {
-            fill = rgba(store.globalStyle.dockPenColor, 0.2);
+            fill = rgba(store.styles.dockPenColor, 0.2);
             //  ctx.fillStyle = fill;
             //  fill && (setBack = false);
         }
@@ -1153,7 +1153,7 @@ export function renderPen(ctx, pen, download) {
             }
         }
         else {
-            stroke = pen.calculative.color || (pen.type ? store.data.lineColor : '') || store.globalStyle.color;
+            stroke = pen.calculative.color || (pen.type ? store.data.lineColor : '') || store.styles.color;
         }
         ctx.strokeStyle = _stroke || stroke;
     }
@@ -1199,7 +1199,7 @@ export function renderPen(ctx, pen, download) {
             }
         }
         else {
-            back = pen.calculative.background || store.globalStyle.penBackground;
+            back = pen.calculative.background || store.styles.penBackground;
         }
         ctx.fillStyle = fill || back;
         fill = !!back;
@@ -1324,14 +1324,14 @@ export function renderPenRaw(ctx, pen, rect, download) {
     }
     let fill;
     if (pen.calculative.hover) {
-        ctx.strokeStyle = pen.hoverColor || store.globalStyle.hoverColor;
-        ctx.fillStyle = pen.hoverBackground || store.globalStyle.hoverBackground;
-        fill = pen.hoverBackground || store.globalStyle.hoverBackground;
+        ctx.strokeStyle = pen.hoverColor || store.styles.hoverColor;
+        ctx.fillStyle = pen.hoverBackground || store.styles.hoverBackground;
+        fill = pen.hoverBackground || store.styles.hoverBackground;
     }
     else if (pen.calculative.active) {
-        ctx.strokeStyle = pen.activeColor || store.globalStyle.activeColor;
-        ctx.fillStyle = pen.activeBackground || store.globalStyle.activeBackground;
-        fill = pen.activeBackground || store.globalStyle.activeBackground;
+        ctx.strokeStyle = pen.activeColor || store.styles.activeColor;
+        ctx.fillStyle = pen.activeBackground || store.styles.activeBackground;
+        fill = pen.activeBackground || store.styles.activeBackground;
     }
     else {
         if (pen.strokeImage) {
@@ -1348,7 +1348,7 @@ export function renderPenRaw(ctx, pen, rect, download) {
                 lineGradientFlag = true;
             }
             else {
-                stroke = pen.calculative.color || store.globalStyle.color; //getGlobalColor(store);
+                stroke = pen.calculative.color || store.styles.color; //getGlobalColor(store);
             }
             ctx.strokeStyle = stroke;
         }
@@ -1689,11 +1689,11 @@ export function ctxDrawLinePath(canUsePath = true, ctx, pen, store) {
  * 设置线条动画，ctx 的 strokeStyle lineDash 等属性更改
  */
 export function setCtxLineAnimate(ctx, pen, store) {
-    ctx.strokeStyle = pen.animateColor || store.globalStyle.animateColor;
+    ctx.strokeStyle = pen.animateColor || store.styles.animateColor;
     if (pen.animateShadow) {
         ctx.shadowBlur = pen.animateShadowBlur || pen.animateLineWidth || 6;
         ctx.shadowColor =
-            pen.animateShadowColor || pen.animateColor || store.globalStyle.animateColor;
+            pen.animateShadowColor || pen.animateColor || store.styles.animateColor;
     }
     pen.calculative.animateLineWidth &&
         (ctx.lineWidth = pen.calculative.animateLineWidth * store.data.scale);
@@ -1734,11 +1734,11 @@ export function setCtxLineAnimate(ctx, pen, store) {
             ctx.setLineDash([0.1, pen.length]);
             break;
         case LineAnimateType.Arrow:
-            ctx.fillStyle = pen.animateColor || store.globalStyle.animateColor;
+            ctx.fillStyle = pen.animateColor || store.styles.animateColor;
             ctx.lineWidth = 1;
             break;
         case LineAnimateType.WaterDrop:
-            ctx.fillStyle = pen.animateColor || store.globalStyle.animateColor;
+            ctx.fillStyle = pen.animateColor || store.styles.animateColor;
             ctx.lineWidth = 1;
             break;
         default:
@@ -1770,7 +1770,7 @@ export function renderLineAnchors(ctx, pen) {
     const store = pen.calculative.canvas.store;
     ctx.save();
     ctx.lineWidth = 1;
-    ctx.fillStyle = pen.activeColor || store.globalStyle.activeColor; //store.options.activeColor;
+    ctx.fillStyle = pen.activeColor || store.styles.activeColor; //store.options.activeColor;
     pen.calculative.worldAnchors.forEach((pt) => {
         !pt.hidden && !pt.isTemp && renderAnchor(ctx, pt, pen);
     });