@meta2d/core 1.1.14 → 1.1.15
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/core.d.ts +14 -4
- package/src/core.js +191 -58
- package/src/core.js.map +1 -1
- package/src/diagrams/line/arrow.js +128 -36
- package/src/diagrams/line/arrow.js.map +1 -1
- package/src/event/event.d.ts +3 -0
- package/src/pen/model.d.ts +1 -0
- package/src/pen/model.js.map +1 -1
- package/src/pen/render.js +33 -2
- package/src/pen/render.js.map +1 -1
- package/src/pen/text.js +5 -0
- package/src/pen/text.js.map +1 -1
- package/src/store/store.d.ts +4 -0
- package/src/store/store.js.map +1 -1
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import { LineAnimateType } from '../../pen';
|
|
2
|
+
import { deepClone } from '../../utils';
|
|
3
|
+
import { getBezierPoint, getQuadraticPoint } from './curve';
|
|
2
4
|
//箭头动画
|
|
3
5
|
export function drawArrow(pen, ctx) {
|
|
4
6
|
const path = !ctx ? new Path2D() : ctx;
|
|
5
|
-
|
|
7
|
+
let worldAnchors = pen.calculative.worldAnchors;
|
|
6
8
|
let scale = pen.calculative.canvas.store.data.scale;
|
|
7
9
|
let size = (pen.calculative.animateLineWidth || 6) * scale; // 箭头大小
|
|
8
10
|
let arrowLength = (pen.animateLineWidth * 2 || 12) * scale; // 箭头长度
|
|
@@ -20,51 +22,141 @@ export function drawArrow(pen, ctx) {
|
|
|
20
22
|
if (worldAnchors.length > 1) {
|
|
21
23
|
let from; // 上一个点
|
|
22
24
|
let lastLength = 0;
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
Math.sin((angle * Math.PI) / 180),
|
|
35
|
-
};
|
|
36
|
-
if (pen.animateReverse) {
|
|
37
|
-
newP = {
|
|
25
|
+
if (pen.close) {
|
|
26
|
+
worldAnchors = deepClone(worldAnchors);
|
|
27
|
+
worldAnchors.push(worldAnchors[0]);
|
|
28
|
+
}
|
|
29
|
+
if (['polyline', 'line'].includes(pen.lineName)) {
|
|
30
|
+
for (let i = 0; i < worldAnchors.length; i++) {
|
|
31
|
+
let pt = worldAnchors[i];
|
|
32
|
+
//获取箭头角度
|
|
33
|
+
if (from) {
|
|
34
|
+
let angle = getAngle(from, pt);
|
|
35
|
+
let newP = {
|
|
38
36
|
x: from.x +
|
|
39
|
-
((pen.
|
|
37
|
+
((pen.calculative.animatePos - lastLength) % d) *
|
|
40
38
|
Math.cos((angle * Math.PI) / 180),
|
|
41
39
|
y: from.y -
|
|
42
|
-
((pen.
|
|
40
|
+
((pen.calculative.animatePos - lastLength) % d) *
|
|
43
41
|
Math.sin((angle * Math.PI) / 180),
|
|
44
42
|
};
|
|
43
|
+
if (pen.animateReverse) {
|
|
44
|
+
newP = {
|
|
45
|
+
x: from.x +
|
|
46
|
+
((pen.length - (pen.calculative.animatePos + lastLength)) % d) *
|
|
47
|
+
Math.cos((angle * Math.PI) / 180),
|
|
48
|
+
y: from.y -
|
|
49
|
+
((pen.length - (pen.calculative.animatePos + lastLength)) % d) *
|
|
50
|
+
Math.sin((angle * Math.PI) / 180),
|
|
51
|
+
};
|
|
52
|
+
}
|
|
53
|
+
let newPTFrom = Math.sqrt((newP.x - from.x) ** 2 + (newP.y - from.y) ** 2);
|
|
54
|
+
let ptTFrom = Math.sqrt((pt.x - from.x) ** 2 + (pt.y - from.y) ** 2);
|
|
55
|
+
while (newPTFrom < ptTFrom) {
|
|
56
|
+
if (((pen.animateReverse && newPTFrom - arrowLength < ptTFrom) || //不允许超出连线绘制
|
|
57
|
+
(!pen.animateReverse &&
|
|
58
|
+
newPTFrom > arrowLength)) &&
|
|
59
|
+
newPTFrom > (smoothLenth + arrowLength) &&
|
|
60
|
+
ptTFrom - newPTFrom > smoothLenth) {
|
|
61
|
+
if (pen.lineAnimateType === LineAnimateType.Arrow) {
|
|
62
|
+
arrow(path, newP, size, angle, lineWidth, arrowLength);
|
|
63
|
+
}
|
|
64
|
+
else if (pen.lineAnimateType === LineAnimateType.WaterDrop) {
|
|
65
|
+
waterDrop(path, newP, pen.animateReverse, angle, lineWidth, arrowLength);
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
newP.x += d * Math.cos((angle * Math.PI) / 180);
|
|
69
|
+
newP.y -= d * Math.sin((angle * Math.PI) / 180);
|
|
70
|
+
newPTFrom = Math.sqrt((newP.x - from.x) ** 2 + (newP.y - from.y) ** 2);
|
|
71
|
+
}
|
|
45
72
|
}
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
73
|
+
from = pt;
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
else {
|
|
77
|
+
let from; // 上一个点
|
|
78
|
+
let pos = (pen.calculative.animatePos % d) / d;
|
|
79
|
+
if (pos > 1) {
|
|
80
|
+
pos = 1;
|
|
81
|
+
}
|
|
82
|
+
if (pen.animateReverse) {
|
|
83
|
+
pos = 1 - pos;
|
|
84
|
+
}
|
|
85
|
+
let step = 1 / (worldAnchors[0].lineLength / d);
|
|
86
|
+
let lastPos = pos * step;
|
|
87
|
+
let i;
|
|
88
|
+
worldAnchors.forEach((pt) => {
|
|
89
|
+
let to = pt;
|
|
90
|
+
if (from) {
|
|
91
|
+
step = 1 / (from.lineLength / d);
|
|
92
|
+
// pos = pos % step;
|
|
93
|
+
if (from.next) {
|
|
94
|
+
if (to.prev) {
|
|
95
|
+
for (i = lastPos; i < 1; i += step) {
|
|
96
|
+
let point = getBezierPoint(i, from, from.next, to.prev, to);
|
|
97
|
+
let pointNext = getBezierPoint(i + 0.001, from, from.next, to.prev, to);
|
|
98
|
+
let angle = getAngle(point, pointNext);
|
|
99
|
+
if (pen.lineAnimateType === LineAnimateType.Arrow) {
|
|
100
|
+
arrow(path, point, size, angle, lineWidth, arrowLength);
|
|
101
|
+
}
|
|
102
|
+
else if (pen.lineAnimateType === LineAnimateType.WaterDrop) {
|
|
103
|
+
waterDrop(path, point, pen.animateReverse, angle, lineWidth, arrowLength);
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
else {
|
|
108
|
+
for (i = lastPos; i < 1; i += step) {
|
|
109
|
+
let point = getQuadraticPoint(i, from, from.next, to);
|
|
110
|
+
let pointNext = getQuadraticPoint(i + 0.001, from, from.next, to);
|
|
111
|
+
let angle = getAngle(point, pointNext);
|
|
112
|
+
if (pen.lineAnimateType === LineAnimateType.Arrow) {
|
|
113
|
+
arrow(path, point, size, angle, lineWidth, arrowLength);
|
|
114
|
+
}
|
|
115
|
+
else if (pen.lineAnimateType === LineAnimateType.WaterDrop) {
|
|
116
|
+
waterDrop(path, point, pen.animateReverse, angle, lineWidth, arrowLength);
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
else {
|
|
122
|
+
if (to.prev) {
|
|
123
|
+
for (i = lastPos; i < 1; i += step) {
|
|
124
|
+
let point = getQuadraticPoint(i, from, to.prev, to);
|
|
125
|
+
let pointNext = getQuadraticPoint(i + 0.001, from, to.prev, to);
|
|
126
|
+
let angle = getAngle(point, pointNext);
|
|
127
|
+
if (pen.lineAnimateType === LineAnimateType.Arrow) {
|
|
128
|
+
arrow(path, point, size, angle, lineWidth, arrowLength);
|
|
129
|
+
}
|
|
130
|
+
else if (pen.lineAnimateType === LineAnimateType.WaterDrop) {
|
|
131
|
+
waterDrop(path, point, pen.animateReverse, angle, lineWidth, arrowLength);
|
|
132
|
+
}
|
|
133
|
+
}
|
|
56
134
|
}
|
|
57
|
-
else
|
|
58
|
-
|
|
135
|
+
else {
|
|
136
|
+
let angle = getAngle(from, to);
|
|
137
|
+
for (i = lastPos; i < 1; i += step) {
|
|
138
|
+
let point = {
|
|
139
|
+
x: from.x + (to.x - from.x) * i,
|
|
140
|
+
y: from.y + (to.y - from.y) * i,
|
|
141
|
+
};
|
|
142
|
+
if (pen.lineAnimateType === LineAnimateType.Arrow) {
|
|
143
|
+
arrow(path, point, size, angle, lineWidth, arrowLength);
|
|
144
|
+
}
|
|
145
|
+
else if (pen.lineAnimateType === LineAnimateType.WaterDrop) {
|
|
146
|
+
waterDrop(path, point, pen.animateReverse, angle, lineWidth, arrowLength);
|
|
147
|
+
}
|
|
148
|
+
}
|
|
59
149
|
}
|
|
60
150
|
}
|
|
61
|
-
newP.x += d * Math.cos((angle * Math.PI) / 180);
|
|
62
|
-
newP.y -= d * Math.sin((angle * Math.PI) / 180);
|
|
63
|
-
newPTFrom = Math.sqrt((newP.x - from.x) ** 2 + (newP.y - from.y) ** 2);
|
|
64
151
|
}
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
152
|
+
from = pt;
|
|
153
|
+
if (!i) {
|
|
154
|
+
i = lastPos;
|
|
155
|
+
}
|
|
156
|
+
else {
|
|
157
|
+
lastPos = i - 1;
|
|
158
|
+
}
|
|
159
|
+
});
|
|
68
160
|
}
|
|
69
161
|
}
|
|
70
162
|
if (path instanceof Path2D)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"arrow.js","sourceRoot":"","sources":["../../../../../packages/core/src/diagrams/line/arrow.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"arrow.js","sourceRoot":"","sources":["../../../../../packages/core/src/diagrams/line/arrow.ts"],"names":[],"mappings":"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"}
|
package/src/event/event.d.ts
CHANGED
package/src/pen/model.d.ts
CHANGED
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,MAAM,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;IACb,eAAe;CAChB,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;AAE/E,MAAM,CAAC,MAAM,0BAA0B,GAAG;IACxC,YAAY;IACZ,cAAc;IACd,eAAe;IACf,aAAa;IACb,OAAO;IACP,OAAO;IACP,SAAS;IACT,WAAW;CACZ,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,UAAU,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC;AAE3E,MAAM,CAAC,MAAM,4BAA4B,GAAI,CAAC,aAAa,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAC,WAAW,EAAE,YAAY,EAAE,YAAY,EAAE,UAAU,EAAC,SAAS,EAAE,WAAW,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AAoB5M,MAAM,CAAN,IAAY,eAOX;AAPD,WAAY,eAAe;IACzB,yDAAM,CAAA;IACN,uDAAK,CAAA;IACL,mDAAG,CAAA;IACH,uDAAK,CAAA;IACL,+DAAS,CAAA;IACT,yDAAM,CAAA,CAAC,QAAQ;AACjB,CAAC,EAPW,eAAe,KAAf,eAAe,QAO1B;AAED,MAAM,CAAN,IAAY,qBAKX;AALD,WAAY,qBAAqB;IAC/B,mEAAK,CAAA;IACL,iEAAI,CAAA;IACJ,+DAAG,CAAA;IACH,uEAAO,CAAA,CAAC,OAAO;AACjB,CAAC,EALW,qBAAqB,KAArB,qBAAqB,QAKhC;
|
|
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
|
@@ -785,9 +785,25 @@ function drawText(ctx, pen) {
|
|
|
785
785
|
fontSize,
|
|
786
786
|
lineHeight,
|
|
787
787
|
});
|
|
788
|
+
ctx.textBaseline = 'top';
|
|
788
789
|
ctx.fillStyle = pen.placeholderColor || '#c0c0c0';
|
|
790
|
+
const textLineWidth = ctx.measureText(pen.placeholder || '请输入').width;
|
|
789
791
|
const rect = pen.calculative.worldTextRect;
|
|
790
|
-
|
|
792
|
+
let x = 0;
|
|
793
|
+
let y = (rect.height - pen.calculative.fontSize) / 2;
|
|
794
|
+
if (pen.textAlign === 'center') {
|
|
795
|
+
x = (rect.width - textLineWidth) / 2;
|
|
796
|
+
}
|
|
797
|
+
else if (pen.textAlign === 'right') {
|
|
798
|
+
x = rect.width - textLineWidth;
|
|
799
|
+
}
|
|
800
|
+
if (pen.textBaseline === 'top') {
|
|
801
|
+
y = 0;
|
|
802
|
+
}
|
|
803
|
+
else if (pen.textBaseline === 'bottom') {
|
|
804
|
+
y = rect.height - pen.calculative.fontSize;
|
|
805
|
+
}
|
|
806
|
+
ctx.fillText(pen.placeholder || '请输入', rect.x + x, rect.y + y);
|
|
791
807
|
ctx.restore();
|
|
792
808
|
}
|
|
793
809
|
if (isEmptyText(text) || hiddenText || pen.hiddenText) {
|
|
@@ -2461,6 +2477,9 @@ export function scalePen(pen, scale, center) {
|
|
|
2461
2477
|
if (pen.calculative.initRect) {
|
|
2462
2478
|
scaleRect(pen.calculative.initRect, scale, center, pen.pivot);
|
|
2463
2479
|
}
|
|
2480
|
+
if (pen.calculative.prevFrameRect) {
|
|
2481
|
+
scaleRect(pen.calculative.prevFrameRect, scale, center, pen.pivot);
|
|
2482
|
+
}
|
|
2464
2483
|
scaleChildrenInitRect(pen, scale, center);
|
|
2465
2484
|
if (pen.calculative.x) {
|
|
2466
2485
|
scalePoint(pen.calculative, scale, center);
|
|
@@ -2770,6 +2789,7 @@ export function setNodeAnimate(pen, now) {
|
|
|
2770
2789
|
pen.calculative.x = pen.calculative.worldRect.x;
|
|
2771
2790
|
pen.calculative.y = pen.calculative.worldRect.y;
|
|
2772
2791
|
pen.calculative.initRect = deepClone(pen.calculative.worldRect);
|
|
2792
|
+
pen.calculative.prevFrameRect = deepClone(pen.calculative.worldRect);
|
|
2773
2793
|
if (pen.parentId) {
|
|
2774
2794
|
pen.calculative.initRelativeRect = {
|
|
2775
2795
|
x: pen.x,
|
|
@@ -2803,6 +2823,11 @@ export function setNodeAnimate(pen, now) {
|
|
|
2803
2823
|
for (const frame of pen.frames) {
|
|
2804
2824
|
d += frame.duration;
|
|
2805
2825
|
if (pos > d) {
|
|
2826
|
+
if (!pen.frames[frameIndex].switch) {
|
|
2827
|
+
pen.calculative.prevFrameRect = deepClone(pen.calculative.worldRect);
|
|
2828
|
+
//上一个动画帧结束
|
|
2829
|
+
pen.frames[frameIndex].switch = true;
|
|
2830
|
+
}
|
|
2806
2831
|
++frameIndex;
|
|
2807
2832
|
}
|
|
2808
2833
|
else {
|
|
@@ -2827,6 +2852,12 @@ export function setNodeAnimate(pen, now) {
|
|
|
2827
2852
|
// 新循环播放
|
|
2828
2853
|
let cycleChanged = false;
|
|
2829
2854
|
if (cycleIndex > pen.calculative.cycleIndex) {
|
|
2855
|
+
pen.frames.forEach((f) => {
|
|
2856
|
+
f.switch = false;
|
|
2857
|
+
});
|
|
2858
|
+
//每次循环结束保持最初状态
|
|
2859
|
+
pen.calculative.worldRect = deepClone(pen.calculative.initRect);
|
|
2860
|
+
pen.calculative.prevFrameRect = deepClone(pen.calculative.initRect);
|
|
2830
2861
|
pen.calculative.cycleIndex = cycleIndex;
|
|
2831
2862
|
pen.calculative.frameStart = pen.calculative.start + pen.calculative.duration * (cycleIndex - 1);
|
|
2832
2863
|
cycleChanged = true;
|
|
@@ -2892,7 +2923,7 @@ export function setNodeAnimateProcess(pen, process) {
|
|
|
2892
2923
|
continue;
|
|
2893
2924
|
}
|
|
2894
2925
|
else if (k === 'scale') {
|
|
2895
|
-
pen.calculative.worldRect = deepClone(pen.calculative.
|
|
2926
|
+
pen.calculative.worldRect = deepClone(pen.calculative.prevFrameRect);
|
|
2896
2927
|
scaleRect(pen.calculative.worldRect, pen.prevFrame.scale, pen.calculative.worldRect.center);
|
|
2897
2928
|
const newScale = pen.prevFrame.scale + (frame[k] - pen.prevFrame.scale) * process;
|
|
2898
2929
|
scaleRect(pen.calculative.worldRect, newScale / pen.prevFrame.scale, pen.calculative.worldRect.center);
|