@meta2d/core 1.0.46 → 1.0.48
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.
- package/package.json +1 -1
- package/src/canvas/canvas.d.ts +4 -0
- package/src/canvas/canvas.js +123 -25
- package/src/canvas/canvas.js.map +1 -1
- package/src/core.d.ts +7 -0
- package/src/core.js +76 -13
- package/src/core.js.map +1 -1
- package/src/diagrams/line/curve.js +3 -0
- package/src/diagrams/line/curve.js.map +1 -1
- package/src/options.d.ts +5 -0
- package/src/options.js +3 -0
- package/src/options.js.map +1 -1
- package/src/pen/model.d.ts +11 -0
- package/src/pen/model.js.map +1 -1
- package/src/pen/render.js +20 -13
- package/src/pen/render.js.map +1 -1
- package/src/store/store.d.ts +1 -0
- package/src/store/store.js.map +1 -1
- package/src/utils/math.d.ts +1 -1
- package/src/utils/math.js +17 -6
- package/src/utils/math.js.map +1 -1
|
@@ -135,6 +135,9 @@ function lerp(pt1, pt2, t) {
|
|
|
135
135
|
export function getSplitAnchor(pen, pt, index) {
|
|
136
136
|
var from = pen.calculative.worldAnchors[index];
|
|
137
137
|
var to = pen.calculative.worldAnchors[index + 1];
|
|
138
|
+
if (!to && pen.close) {
|
|
139
|
+
to = pen.calculative.worldAnchors[0];
|
|
140
|
+
}
|
|
138
141
|
var t = pt.step;
|
|
139
142
|
var anchor;
|
|
140
143
|
if (from.next && to.prev) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"curve.js","sourceRoot":"","sources":["../../../../../packages/core/src/diagrams/line/curve.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"curve.js","sourceRoot":"","sources":["../../../../../packages/core/src/diagrams/line/curve.ts"],"names":[],"mappings":"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"}
|
package/src/options.d.ts
CHANGED
|
@@ -27,6 +27,8 @@ export interface Options {
|
|
|
27
27
|
textAlign?: TextAlign;
|
|
28
28
|
textBaseline?: TextBaseline;
|
|
29
29
|
rotateCursor?: string;
|
|
30
|
+
rightCursor?: string;
|
|
31
|
+
downCursor?: string;
|
|
30
32
|
hoverCursor?: string;
|
|
31
33
|
disableInput?: boolean;
|
|
32
34
|
disableRotate?: boolean;
|
|
@@ -92,6 +94,7 @@ export interface Options {
|
|
|
92
94
|
polylineSpace?: number;
|
|
93
95
|
defaultFormat?: Pen;
|
|
94
96
|
domShapes?: string[];
|
|
97
|
+
containerShapes?: string[];
|
|
95
98
|
textFlip?: boolean;
|
|
96
99
|
textRotate?: boolean;
|
|
97
100
|
cacheLength?: number;
|
|
@@ -106,6 +109,8 @@ export interface Options {
|
|
|
106
109
|
padding?: Padding;
|
|
107
110
|
resizeMode?: boolean;
|
|
108
111
|
svgPathStroke?: boolean;
|
|
112
|
+
disabledColor?: string;
|
|
113
|
+
disabledBackground?: string;
|
|
109
114
|
}
|
|
110
115
|
export declare const defaultOptions: Options;
|
|
111
116
|
export interface PenPlugin {
|
package/src/options.js
CHANGED
|
@@ -21,6 +21,8 @@ export var defaultOptions = {
|
|
|
21
21
|
dockPenColor: '#1890FF',
|
|
22
22
|
dragColor: '#1890ff',
|
|
23
23
|
rotateCursor: 'rotate.cur',
|
|
24
|
+
rightCursor: 'right.cur',
|
|
25
|
+
downCursor: 'down.cur',
|
|
24
26
|
hoverCursor: 'pointer',
|
|
25
27
|
minScale: 0.1,
|
|
26
28
|
maxScale: 10,
|
|
@@ -68,6 +70,7 @@ export var defaultOptions = {
|
|
|
68
70
|
cdn: '',
|
|
69
71
|
polylineSpace: 10,
|
|
70
72
|
domShapes: [],
|
|
73
|
+
containerShapes: ['table'],
|
|
71
74
|
textFlip: true,
|
|
72
75
|
textRotate: true,
|
|
73
76
|
unavailableKeys: [],
|
package/src/options.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../../packages/core/src/options.ts"],"names":[],"mappings":"AAIA,MAAM,CAAN,IAAY,WAIX;AAJD,WAAY,WAAW;IACrB,8CAAS,CAAA;IACT,qDAAQ,CAAA;IACR,iDAAM,CAAA;AACR,CAAC,EAJW,WAAW,KAAX,WAAW,QAItB;
|
|
1
|
+
{"version":3,"file":"options.js","sourceRoot":"","sources":["../../../packages/core/src/options.ts"],"names":[],"mappings":"AAIA,MAAM,CAAN,IAAY,WAIX;AAJD,WAAY,WAAW;IACrB,8CAAS,CAAA;IACT,qDAAQ,CAAA;IACR,iDAAM,CAAA;AACR,CAAC,EAJW,WAAW,KAAX,WAAW,QAItB;AA2GD,MAAM,CAAC,IAAM,cAAc,GAAY;IACrC,UAAU,EACR,2EAA2E;IAC7E,QAAQ,EAAE,EAAE;IACZ,UAAU,EAAE,GAAG;IACf,SAAS,EAAE,QAAQ;IACnB,YAAY,EAAE,QAAQ;IACtB,KAAK,EAAE,SAAS;IAChB,WAAW,EAAE,SAAS;IACtB,UAAU,EAAE,uBAAuB;IACnC,WAAW,EAAE,SAAS;IACtB,gBAAgB,EAAE,SAAS;IAC3B,YAAY,EAAE,CAAC;IACf,gBAAgB,EAAE,MAAM;IACxB,SAAS,EAAE,uBAAuB;IAClC,YAAY,EAAE,SAAS;IACvB,SAAS,EAAE,SAAS;IACpB,YAAY,EAAE,YAAY;IAC1B,WAAW,EAAE,WAAW;IACxB,UAAU,EAAE,UAAU;IACtB,WAAW,EAAE,SAAS;IACtB,QAAQ,EAAE,GAAG;IACb,QAAQ,EAAE,EAAE;IACZ,OAAO,EAAE,WAAW,CAAC,QAAQ;IAC7B,QAAQ,EAAE,EAAE;IACZ,SAAS,EAAE,SAAS;IACpB,SAAS,EAAE,SAAS;IACpB,eAAe,EAAE,OAAO;IACxB,QAAQ,EAAE,EAAE;IACZ,eAAe,EAAE,EAAE;IACnB,YAAY,EAAE,IAAI;IAClB,UAAU,EAAE,IAAI;IAChB,aAAa,EAAE,KAAK;IACpB,YAAY,EAAE,SAAS;IACvB,aAAa,EAAE,SAAS;IACxB,aAAa,EAAE,CAAC;IAChB,aAAa,EAAE,CAAC;IAChB,UAAU,EAAE,EAAE;IACd,WAAW,EAAE,WAAW;IACxB,WAAW,EAAE,CAAC;IACd,cAAc,EAAE;QACd;YACE,CAAC,EAAE,GAAG;YACN,CAAC,EAAE,CAAC;SACL;QACD;YACE,CAAC,EAAE,CAAC;YACJ,CAAC,EAAE,GAAG;SACP;QACD;YACE,CAAC,EAAE,GAAG;YACN,CAAC,EAAE,CAAC;SACL;QACD;YACE,CAAC,EAAE,CAAC;YACJ,CAAC,EAAE,GAAG;SACP;KACF;IACD,gBAAgB,EAAE,IAAI;IACtB,iBAAiB,EAAE,IAAI;IACvB,gBAAgB,EAAE,IAAI;IACtB,gBAAgB,EAAE,KAAK;IACvB,iBAAiB,EAAE,CAAC;IACpB,oBAAoB,EAAE,KAAK;IAC3B,GAAG,EAAE,EAAE;IACP,aAAa,EAAE,EAAE;IACjB,SAAS,EAAE,EAAE;IACb,eAAe,EAAC,CAAC,OAAO,CAAC;IACzB,QAAQ,EAAE,IAAI;IACd,UAAU,EAAE,IAAI;IAChB,eAAe,EAAE,EAAE;IACnB,cAAc,EAAE,EAAE;IAClB,aAAa,EAAC,IAAI;CACnB,CAAC"}
|
package/src/pen/model.d.ts
CHANGED
|
@@ -252,6 +252,12 @@ export interface Pen extends Rect {
|
|
|
252
252
|
apiHeaders?: any;
|
|
253
253
|
apiBody?: any;
|
|
254
254
|
apiEnable?: boolean;
|
|
255
|
+
container?: boolean;
|
|
256
|
+
disabled?: boolean;
|
|
257
|
+
disabledColor?: string;
|
|
258
|
+
disabledBackground?: string;
|
|
259
|
+
disabledTextColor?: string;
|
|
260
|
+
inputType?: string;
|
|
255
261
|
calculative?: {
|
|
256
262
|
x?: number;
|
|
257
263
|
y?: number;
|
|
@@ -349,6 +355,7 @@ export interface Pen extends Rect {
|
|
|
349
355
|
backgroundImg?: HTMLImageElement;
|
|
350
356
|
strokeImg?: HTMLImageElement;
|
|
351
357
|
active?: boolean;
|
|
358
|
+
focus?: boolean;
|
|
352
359
|
hover?: boolean;
|
|
353
360
|
isDock?: boolean;
|
|
354
361
|
pencil?: boolean;
|
|
@@ -405,6 +412,10 @@ export interface Pen extends Rect {
|
|
|
405
412
|
cssDisplay?: string;
|
|
406
413
|
animations?: any[];
|
|
407
414
|
imageRadius?: number;
|
|
415
|
+
disabled?: boolean;
|
|
416
|
+
disabledColor?: string;
|
|
417
|
+
disabledBackground?: string;
|
|
418
|
+
disabledTextColor?: string;
|
|
408
419
|
};
|
|
409
420
|
lastConnected?: any;
|
|
410
421
|
textDecoration?: string;
|
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":"AAKA,MAAM,CAAN,IAAY,OAGX;AAHD,WAAY,OAAO;IACjB,qCAAI,CAAA;IACJ,qCAAI,CAAA;AACN,CAAC,EAHW,OAAO,KAAP,OAAO,QAGlB;AAED,MAAM,CAAN,IAAY,SAQX;AARD,WAAY,SAAS;IACnB,yCAAI,CAAA;IACJ,uDAAW,CAAA;IACX,uDAAW,CAAA;IACX,yDAAY,CAAA;IACZ,iEAAgB,CAAA;IAChB,iBAAiB;IACjB,gDAAY,CAAA;AACd,CAAC,EARW,SAAS,KAAT,SAAS,QAQpB;AAED,MAAM,CAAN,IAAY,UAIX;AAJD,WAAY,UAAU;IACpB,iDAAO,CAAA;IACP,uCAAE,CAAA;IACF,yCAAG,CAAA;AACL,CAAC,EAJW,UAAU,KAAV,UAAU,QAIrB;AAED,MAAM,CAAN,IAAY,QAIX;AAJD,WAAY,QAAQ;IAClB,uCAAI,CAAA;IACJ,2CAAM,CAAA;IACN,2CAAM,CAAA;AACR,CAAC,EAJW,QAAQ,KAAR,QAAQ,QAInB;AAED,oBAAoB;AACpB,MAAM,CAAN,IAAY,WAKX;AALD,WAAY,WAAW;IACrB,iEAAkB,CAAA;IAClB,uEAAiB,CAAA;IACjB,yDAAU,CAAA;IACV,2DAAW,CAAA,CAAC,OAAO;AACrB,CAAC,EALW,WAAW,KAAX,WAAW,QAKtB;AAED,qBAAqB;AACrB,gBAAgB;AAChB,wBAAwB;AACxB,sBAAsB;AACtB,iBAAiB;AACjB,IAAI;AAEJ,wBAAwB;AACxB,MAAM,CAAC,IAAM,qBAAqB,GAAG;IACnC,MAAM;IACN,WAAW;IACX,YAAY;IACZ,UAAU;IACV,SAAS;IACT,YAAY;IACZ,UAAU;IACV,YAAY;IACZ,WAAW;IACX,YAAY;IACZ,WAAW;IACX,cAAc;IACd,YAAY;IACZ,UAAU;IACV,aAAa;CACd,CAAC;AAEF,MAAM,CAAC,IAAM,eAAe,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;AAE/E,MAAM,CAAC,IAAM,0BAA0B,GAAG;IACxC,YAAY;IACZ,cAAc;IACd,eAAe;IACf,aAAa;IACb,OAAO;IACP,OAAO;IACP,SAAS;IACT,WAAW;CACZ,CAAC;AAEF,MAAM,CAAC,IAAM,qBAAqB,GAAG,CAAC,UAAU,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC;AAoB3E,MAAM,CAAN,IAAY,eAMX;AAND,WAAY,eAAe;IACzB,yDAAM,CAAA;IACN,uDAAK,CAAA;IACL,mDAAG,CAAA;IACH,uDAAK,CAAA;IACL,+DAAS,CAAA;AACX,CAAC,EANW,eAAe,KAAf,eAAe,QAM1B;
|
|
1
|
+
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../../packages/core/src/pen/model.ts"],"names":[],"mappings":"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"}
|
package/src/pen/render.js
CHANGED
|
@@ -55,7 +55,7 @@ import { calcTextLines, calcTextDrawRect, calcTextRect } from './text';
|
|
|
55
55
|
import { deepClone } from '../utils/clone';
|
|
56
56
|
import { renderFromArrow, renderToArrow } from './arrow';
|
|
57
57
|
import { Gradient, PenType } from '@meta2d/core';
|
|
58
|
-
import { rgba } from '../utils';
|
|
58
|
+
import { pSBC, rgba } from '../utils';
|
|
59
59
|
/**
|
|
60
60
|
* ancestor 是否是 pen 的祖先
|
|
61
61
|
* @param pen 当前画笔
|
|
@@ -747,7 +747,10 @@ function drawText(ctx, pen) {
|
|
|
747
747
|
ctx.shadowOffsetY = 0;
|
|
748
748
|
}
|
|
749
749
|
var fill = undefined;
|
|
750
|
-
if (pen.calculative.
|
|
750
|
+
if (pen.calculative.disabled) {
|
|
751
|
+
fill = pen.disabledTextColor || pen.disabledColor || pSBC(0.4, getTextColor(pen, store));
|
|
752
|
+
}
|
|
753
|
+
else if (pen.calculative.hover) {
|
|
751
754
|
fill = pen.hoverTextColor || pen.hoverColor || store.options.hoverColor;
|
|
752
755
|
}
|
|
753
756
|
else if (pen.calculative.active) {
|
|
@@ -1057,7 +1060,11 @@ export function renderPen(ctx, pen, download) {
|
|
|
1057
1060
|
// let setBack = true;
|
|
1058
1061
|
var lineGradientFlag = false;
|
|
1059
1062
|
var _stroke = undefined;
|
|
1060
|
-
if (pen.calculative.
|
|
1063
|
+
if (pen.calculative.disabled) {
|
|
1064
|
+
_stroke = pen.disabledColor || store.options.disabledColor || pSBC(0.4, pen.calculative.color || getGlobalColor(store));
|
|
1065
|
+
fill = pen.disabledBackground || store.options.disabledBackground || pSBC(0.4, pen.calculative.background || store.data.penBackground);
|
|
1066
|
+
}
|
|
1067
|
+
else if (pen.calculative.hover) {
|
|
1061
1068
|
_stroke = pen.hoverColor || store.options.hoverColor;
|
|
1062
1069
|
fill = pen.hoverBackground || store.options.hoverBackground;
|
|
1063
1070
|
// ctx.fillStyle = fill;
|
|
@@ -1123,17 +1130,17 @@ export function renderPen(ctx, pen, download) {
|
|
|
1123
1130
|
var back = void 0;
|
|
1124
1131
|
if (pen.calculative.bkType === Gradient.Linear) {
|
|
1125
1132
|
if (pen.calculative.gradientColors) {
|
|
1126
|
-
if (!pen.type) {
|
|
1127
|
-
|
|
1128
|
-
|
|
1129
|
-
|
|
1130
|
-
|
|
1131
|
-
|
|
1132
|
-
|
|
1133
|
-
|
|
1134
|
-
|
|
1135
|
-
}
|
|
1133
|
+
// if (!pen.type) {
|
|
1134
|
+
//连线不考虑渐进背景
|
|
1135
|
+
if (pen.calculative.gradient) {
|
|
1136
|
+
//位置变化/放大缩小操作不会触发重新计算
|
|
1137
|
+
back = pen.calculative.gradient;
|
|
1138
|
+
}
|
|
1139
|
+
else {
|
|
1140
|
+
back = getBkGradient(ctx, pen);
|
|
1141
|
+
pen.calculative.gradient = back;
|
|
1136
1142
|
}
|
|
1143
|
+
// }
|
|
1137
1144
|
}
|
|
1138
1145
|
else {
|
|
1139
1146
|
back = drawBkLinearGradient(ctx, pen);
|