@meta2d/core 1.0.68 → 1.0.70

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (23) hide show
  1. package/package.json +1 -1
  2. package/src/canvas/canvas.d.ts +1 -0
  3. package/src/canvas/canvas.js +42 -11
  4. package/src/canvas/canvas.js.map +1 -1
  5. package/src/canvas/canvasImage.js +1 -1
  6. package/src/canvas/canvasImage.js.map +1 -1
  7. package/src/canvas/canvasTemplate.js +2 -1
  8. package/src/canvas/canvasTemplate.js.map +1 -1
  9. package/src/core.js +23 -17
  10. package/src/core.js.map +1 -1
  11. package/src/pen/model.js +1 -0
  12. package/src/pen/model.js.map +1 -1
  13. package/src/pen/render.d.ts +1 -1
  14. package/src/pen/render.js +33 -35
  15. package/src/pen/render.js.map +1 -1
  16. package/src/store/store.d.ts +1 -0
  17. package/src/store/store.js +1 -1
  18. package/src/store/store.js.map +1 -1
  19. package/src/theme.js +4 -0
  20. package/src/theme.js.map +1 -1
  21. package/src/utils/url.d.ts +6 -0
  22. package/src/utils/url.js +21 -5
  23. package/src/utils/url.js.map +1 -1
package/src/pen/model.js CHANGED
@@ -87,6 +87,7 @@ export const isDomShapes = [
87
87
  'echarts',
88
88
  'highcharts',
89
89
  'lightningCharts',
90
+ 'vue'
90
91
  ];
91
92
  /**
92
93
  * 交互图元
package/src/pen/model.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"model.js","sourceRoot":"","sources":["../../../../packages/core/src/pen/model.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"model.js","sourceRoot":"","sources":["../../../../packages/core/src/pen/model.ts"],"names":[],"mappings":"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"}
package/src/pen/render.d.ts CHANGED
@@ -17,7 +17,7 @@ export declare function drawImage(ctx: CanvasRenderingContext2D | OffscreenCanva
17
17
  /**
18
18
  * 获取文字颜色， textColor 优先其次 color
19
19
  */
20
- export declare function getTextColor(pen: Pen, store: Meta2dStore): string;
20
+ export declare function getTextColor(pen: Pen, store: Meta2dStore): any;
21
21
  export declare function drawIcon(ctx: CanvasRenderingContext2D | OffscreenCanvasRenderingContext2D, pen: Pen): void;
22
22
  export declare function drawDropdown(ctx: CanvasRenderingContext2D | OffscreenCanvasRenderingContext2D, pen: Pen): void;
23
23
  /**
package/src/pen/render.js CHANGED
@@ -738,13 +738,11 @@ export function drawImage(ctx, pen) {
738
738
  */
739
739
  export function getTextColor(pen, store) {
740
740
  const { textColor, color } = pen.calculative;
741
- const { data, options } = store;
741
+ const { styles } = store;
742
742
  return (textColor ||
743
743
  color ||
744
- data.textColor ||
745
- data.color ||
746
- options.textColor ||
747
- options.color);
744
+ styles.textColor ||
745
+ styles.color);
748
746
  }
749
747
  function drawText(ctx, pen) {
750
748
  const { fontStyle, fontWeight, fontSize, fontFamily, lineHeight, text, hiddenText, canvas, textHasShadow, textBackground, textType, } = pen.calculative;
@@ -766,10 +764,10 @@ function drawText(ctx, pen) {
766
764
  pSBC(0.4, getTextColor(pen, store));
767
765
  }
768
766
  else if (pen.calculative.hover) {
769
- fill = pen.hoverTextColor || pen.hoverColor || store.options.hoverColor;
767
+ fill = pen.hoverTextColor || pen.hoverColor || store.styles.hoverColor;
770
768
  }
771
769
  else if (pen.calculative.active) {
772
- fill = pen.activeTextColor || pen.activeColor || store.options.activeColor;
770
+ fill = pen.activeTextColor || pen.activeColor || store.styles.activeColor;
773
771
  }
774
772
  let gradient = undefined;
775
773
  if (textType === Gradient.Linear) {
@@ -879,10 +877,10 @@ function drawFillText(ctx, pen, text) {
879
877
  ctx.save();
880
878
  let fill = undefined;
881
879
  if (pen.calculative.hover) {
882
- fill = pen.hoverTextColor || pen.hoverColor || store.options.hoverColor;
880
+ fill = pen.hoverTextColor || pen.hoverColor || store.styles.hoverColor;
883
881
  }
884
882
  else if (pen.calculative.active) {
885
- fill = pen.activeTextColor || pen.activeColor || store.options.activeColor;
883
+ fill = pen.activeTextColor || pen.activeColor || store.styles.activeColor;
886
884
  }
887
885
  ctx.fillStyle = fill || getTextColor(pen, store);
888
886
  ctx.font = getFont({
@@ -1084,20 +1082,20 @@ export function renderPen(ctx, pen, download) {
1084
1082
  if (pen.calculative.disabled) {
1085
1083
  _stroke =
1086
1084
  pen.disabledColor ||
1087
- store.options.disabledColor ||
1088
- pSBC(0.4, pen.calculative.color || getGlobalColor(store));
1085
+ store.styles.disabledColor ||
1086
+ pSBC(0.4, pen.calculative.color || store.styles.color);
1089
1087
  fill =
1090
1088
  pen.disabledBackground ||
1091
- store.options.disabledBackground ||
1092
- pSBC(0.4, pen.calculative.background || store.data.penBackground);
1089
+ store.styles.disabledBackground ||
1090
+ pSBC(0.4, pen.calculative.background || store.styles.penBackground);
1093
1091
  }
1094
1092
  else if (pen.mouseDownValid && pen.calculative.mouseDown) {
1095
1093
  _stroke =
1096
1094
  pen.mouseDownColor ||
1097
- pSBC(-0.4, pen.calculative.color || getGlobalColor(store));
1095
+ pSBC(-0.4, pen.calculative.color || store.styles.color);
1098
1096
  fill =
1099
1097
  pen.mouseDownBackground ||
1100
- pSBC(-0.4, pen.calculative.background || store.data.penBackground);
1098
+ pSBC(-0.4, pen.calculative.background || store.styles.penBackground);
1101
1099
  }
1102
1100
  else if (pen.switch && pen.calculative.checked) {
1103
1101
  if (!pen.calculative.bkType) {
@@ -1105,23 +1103,23 @@ export function renderPen(ctx, pen, download) {
1105
1103
  }
1106
1104
  }
1107
1105
  else if (pen.calculative.hover) {
1108
- _stroke = pen.hoverColor || store.options.hoverColor;
1109
- fill = pen.hoverBackground || store.options.hoverBackground;
1106
+ _stroke = pen.hoverColor || store.styles.hoverColor;
1107
+ fill = pen.hoverBackground || store.styles.hoverBackground;
1110
1108
  // ctx.fillStyle = fill;
1111
1109
  // fill && (setBack = false);
1112
1110
  }
1113
1111
  else if (pen.calculative.active) {
1114
- _stroke = pen.activeColor || store.options.activeColor;
1115
- fill = pen.activeBackground || store.options.activeBackground;
1112
+ _stroke = pen.activeColor || store.styles.activeColor;
1113
+ fill = pen.activeBackground || store.styles.activeBackground;
1116
1114
  // ctx.fillStyle = fill;
1117
1115
  // fill && (setBack = false);
1118
1116
  }
1119
1117
  else if (pen.calculative.isDock) {
1120
1118
  if (pen.type === PenType.Line) {
1121
- _stroke = store.options.dockPenColor;
1119
+ _stroke = store.styles.dockPenColor;
1122
1120
  }
1123
1121
  else {
1124
- fill = rgba(store.options.dockPenColor, 0.2);
1122
+ fill = rgba(store.styles.dockPenColor, 0.2);
1125
1123
  // ctx.fillStyle = fill;
1126
1124
  // fill && (setBack = false);
1127
1125
  }
@@ -1155,7 +1153,7 @@ export function renderPen(ctx, pen, download) {
1155
1153
  }
1156
1154
  }
1157
1155
  else {
1158
- stroke = pen.calculative.color || (pen.type ? store.data.lineColor : '') || getGlobalColor(store);
1156
+ stroke = pen.calculative.color || (pen.type ? store.data.lineColor : '') || store.styles.color;
1159
1157
  }
1160
1158
  ctx.strokeStyle = _stroke || stroke;
1161
1159
  }
@@ -1201,7 +1199,7 @@ export function renderPen(ctx, pen, download) {
1201
1199
  }
1202
1200
  }
1203
1201
  else {
1204
- back = pen.calculative.background || store.data.penBackground;
1202
+ back = pen.calculative.background || store.styles.penBackground;
1205
1203
  }
1206
1204
  ctx.fillStyle = fill || back;
1207
1205
  fill = !!back;
@@ -1326,14 +1324,14 @@ export function renderPenRaw(ctx, pen, rect, download) {
1326
1324
  }
1327
1325
  let fill;
1328
1326
  if (pen.calculative.hover) {
1329
- ctx.strokeStyle = pen.hoverColor || store.options.hoverColor;
1330
- ctx.fillStyle = pen.hoverBackground || store.options.hoverBackground;
1331
- fill = pen.hoverBackground || store.options.hoverBackground;
1327
+ ctx.strokeStyle = pen.hoverColor || store.styles.hoverColor;
1328
+ ctx.fillStyle = pen.hoverBackground || store.styles.hoverBackground;
1329
+ fill = pen.hoverBackground || store.styles.hoverBackground;
1332
1330
  }
1333
1331
  else if (pen.calculative.active) {
1334
- ctx.strokeStyle = pen.activeColor || store.options.activeColor;
1335
- ctx.fillStyle = pen.activeBackground || store.options.activeBackground;
1336
- fill = pen.activeBackground || store.options.activeBackground;
1332
+ ctx.strokeStyle = pen.activeColor || store.styles.activeColor;
1333
+ ctx.fillStyle = pen.activeBackground || store.styles.activeBackground;
1334
+ fill = pen.activeBackground || store.styles.activeBackground;
1337
1335
  }
1338
1336
  else {
1339
1337
  if (pen.strokeImage) {
@@ -1350,7 +1348,7 @@ export function renderPenRaw(ctx, pen, rect, download) {
1350
1348
  lineGradientFlag = true;
1351
1349
  }
1352
1350
  else {
1353
- stroke = pen.calculative.color || getGlobalColor(store);
1351
+ stroke = pen.calculative.color || store.styles.color; //getGlobalColor(store);
1354
1352
  }
1355
1353
  ctx.strokeStyle = stroke;
1356
1354
  }
@@ -1691,11 +1689,11 @@ export function ctxDrawLinePath(canUsePath = true, ctx, pen, store) {
1691
1689
  * 设置线条动画，ctx 的 strokeStyle lineDash 等属性更改
1692
1690
  */
1693
1691
  export function setCtxLineAnimate(ctx, pen, store) {
1694
- ctx.strokeStyle = pen.animateColor || store.options.animateColor;
1692
+ ctx.strokeStyle = pen.animateColor || store.styles.animateColor;
1695
1693
  if (pen.animateShadow) {
1696
1694
  ctx.shadowBlur = pen.animateShadowBlur || pen.animateLineWidth || 6;
1697
1695
  ctx.shadowColor =
1698
- pen.animateShadowColor || pen.animateColor || store.options.animateColor;
1696
+ pen.animateShadowColor || pen.animateColor || store.styles.animateColor;
1699
1697
  }
1700
1698
  pen.calculative.animateLineWidth &&
1701
1699
  (ctx.lineWidth = pen.calculative.animateLineWidth * store.data.scale);
@@ -1736,11 +1734,11 @@ export function setCtxLineAnimate(ctx, pen, store) {
1736
1734
  ctx.setLineDash([0.1, pen.length]);
1737
1735
  break;
1738
1736
  case LineAnimateType.Arrow:
1739
- ctx.fillStyle = pen.animateColor || store.options.animateColor;
1737
+ ctx.fillStyle = pen.animateColor || store.styles.animateColor;
1740
1738
  ctx.lineWidth = 1;
1741
1739
  break;
1742
1740
  case LineAnimateType.WaterDrop:
1743
- ctx.fillStyle = pen.animateColor || store.options.animateColor;
1741
+ ctx.fillStyle = pen.animateColor || store.styles.animateColor;
1744
1742
  ctx.lineWidth = 1;
1745
1743
  break;
1746
1744
  default:
@@ -1772,7 +1770,7 @@ export function renderLineAnchors(ctx, pen) {
1772
1770
  const store = pen.calculative.canvas.store;
1773
1771
  ctx.save();
1774
1772
  ctx.lineWidth = 1;
1775
- ctx.fillStyle = pen.activeColor || store.options.activeColor;
1773
+ ctx.fillStyle = pen.activeColor || store.styles.activeColor; //store.options.activeColor;
1776
1774
  pen.calculative.worldAnchors.forEach((pt) => {
1777
1775
  !pt.hidden && !pt.isTemp && renderAnchor(ctx, pt, pen);
1778
1776
  });