@meta2d/core 1.0.42 → 1.0.44
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.js +47 -17
- package/src/canvas/canvas.js.map +1 -1
- package/src/canvas/canvasImage.js +19 -15
- package/src/canvas/canvasImage.js.map +1 -1
- package/src/core.d.ts +3 -0
- package/src/core.js +131 -21
- package/src/core.js.map +1 -1
- package/src/diagrams/line/arrow.js +47 -17
- package/src/diagrams/line/arrow.js.map +1 -1
- package/src/diagrams/video.js +38 -4
- package/src/diagrams/video.js.map +1 -1
- package/src/event/event.d.ts +1 -0
- package/src/options.js +1 -1
- package/src/pen/model.d.ts +2 -1
- package/src/pen/model.js +1 -0
- package/src/pen/model.js.map +1 -1
- package/src/pen/render.js +18 -7
- package/src/pen/render.js.map +1 -1
- package/src/rect/rect.d.ts +1 -0
- package/src/rect/rect.js +13 -0
- package/src/rect/rect.js.map +1 -1
- package/src/store/store.d.ts +11 -1
- package/src/store/store.js +4 -0
- package/src/store/store.js.map +1 -1
- package/src/theme.d.ts +13 -0
- package/src/theme.js +23 -0
- package/src/theme.js.map +1 -0
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { LineAnimateType } from '../../pen';
|
|
1
2
|
//箭头动画
|
|
2
3
|
export function drawArrow(pen, ctx) {
|
|
3
4
|
var path = !ctx ? new Path2D() : ctx;
|
|
@@ -5,6 +6,9 @@ export function drawArrow(pen, ctx) {
|
|
|
5
6
|
var scale = pen.calculative.canvas.store.data.scale;
|
|
6
7
|
var size = (pen.calculative.animateLineWidth || 6) * scale; // 箭头大小
|
|
7
8
|
var arrowLength = (pen.animateLineWidth * 2 || 12) * scale; // 箭头长度
|
|
9
|
+
if (pen.lineAnimateType === LineAnimateType.WaterDrop) {
|
|
10
|
+
arrowLength = (pen.animateLineWidth * 4 || 24) * scale; // 水滴长度
|
|
11
|
+
}
|
|
8
12
|
var d = (pen.animateInterval || 100) * scale; // 箭头间距
|
|
9
13
|
var smoothLenth = pen.calculative.lineWidth * (pen.calculative.lineSmooth || 0); //*scale;
|
|
10
14
|
var lineWidth = (pen.calculative.animateLineWidth / 2 || 3) * scale;
|
|
@@ -42,25 +46,17 @@ export function drawArrow(pen, ctx) {
|
|
|
42
46
|
var newPTFrom = Math.sqrt(Math.pow((newP.x - from.x), 2) + Math.pow((newP.y - from.y), 2));
|
|
43
47
|
var ptTFrom = Math.sqrt(Math.pow((pt.x - from.x), 2) + Math.pow((pt.y - from.y), 2));
|
|
44
48
|
while (newPTFrom < ptTFrom) {
|
|
45
|
-
if (((pen.animateReverse && newPTFrom - arrowLength
|
|
49
|
+
if (((pen.animateReverse && newPTFrom - arrowLength < ptTFrom) || //不允许超出连线绘制
|
|
46
50
|
(!pen.animateReverse &&
|
|
47
|
-
newPTFrom > arrowLength
|
|
48
|
-
newPTFrom > (smoothLenth + arrowLength
|
|
51
|
+
newPTFrom > arrowLength)) &&
|
|
52
|
+
newPTFrom > (smoothLenth + arrowLength) &&
|
|
49
53
|
ptTFrom - newPTFrom > smoothLenth) {
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
path.moveTo(pr.x, pr.y);
|
|
57
|
-
path.lineTo(newP.x, newP.y);
|
|
58
|
-
path.lineTo(pl.x, pl.y);
|
|
59
|
-
path.lineTo(pl1.x, pl1.y);
|
|
60
|
-
path.lineTo(pl2.x, pl2.y);
|
|
61
|
-
path.lineTo(pr2.x, pr2.y);
|
|
62
|
-
path.lineTo(pr1.x, pr1.y);
|
|
63
|
-
path.lineTo(pr.x, pr.y);
|
|
54
|
+
if (pen.lineAnimateType === LineAnimateType.Arrow) {
|
|
55
|
+
arrow(path, newP, size, angle, lineWidth, arrowLength);
|
|
56
|
+
}
|
|
57
|
+
else if (pen.lineAnimateType === LineAnimateType.WaterDrop) {
|
|
58
|
+
waterDrop(path, newP, pen.animateReverse, angle, lineWidth, arrowLength);
|
|
59
|
+
}
|
|
64
60
|
}
|
|
65
61
|
newP.x += d * Math.cos((angle * Math.PI) / 180);
|
|
66
62
|
newP.y -= d * Math.sin((angle * Math.PI) / 180);
|
|
@@ -95,4 +91,38 @@ function getRotatePoint(p, rp, _angle) {
|
|
|
95
91
|
y: (p.x - rp.x) * Math.sin(angle) + (p.y - rp.y) * Math.cos(angle) + rp.y,
|
|
96
92
|
};
|
|
97
93
|
}
|
|
94
|
+
//标准箭头
|
|
95
|
+
function arrow(path, newP, size, angle, lineWidth, arrowLength) {
|
|
96
|
+
var pr = getRotatePoint({ x: newP.x + size, y: newP.y + 0.57 * size }, { x: newP.x, y: newP.y }, angle);
|
|
97
|
+
var pl = getRotatePoint({ x: newP.x + size, y: newP.y - 0.57 * size }, { x: newP.x, y: newP.y }, angle);
|
|
98
|
+
var pr1 = getRotatePoint({ x: newP.x + size, y: newP.y + lineWidth / 2 }, { x: newP.x, y: newP.y }, angle);
|
|
99
|
+
var pr2 = getRotatePoint({ x: newP.x + arrowLength, y: newP.y + lineWidth / 2 }, { x: newP.x, y: newP.y }, angle);
|
|
100
|
+
var pl1 = getRotatePoint({ x: newP.x + size, y: newP.y - lineWidth / 2 }, { x: newP.x, y: newP.y }, angle);
|
|
101
|
+
var pl2 = getRotatePoint({ x: newP.x + arrowLength, y: newP.y - lineWidth / 2 }, { x: newP.x, y: newP.y }, angle);
|
|
102
|
+
path.moveTo(pr.x, pr.y);
|
|
103
|
+
path.lineTo(newP.x, newP.y);
|
|
104
|
+
path.lineTo(pl.x, pl.y);
|
|
105
|
+
path.lineTo(pl1.x, pl1.y);
|
|
106
|
+
path.lineTo(pl2.x, pl2.y);
|
|
107
|
+
path.lineTo(pr2.x, pr2.y);
|
|
108
|
+
path.lineTo(pr1.x, pr1.y);
|
|
109
|
+
path.lineTo(pr.x, pr.y);
|
|
110
|
+
}
|
|
111
|
+
//水滴
|
|
112
|
+
function waterDrop(path, newP, reverse, angle, lineWidth, arrowLength) {
|
|
113
|
+
var dis = lineWidth / 2;
|
|
114
|
+
if (reverse) {
|
|
115
|
+
dis = -lineWidth / 2;
|
|
116
|
+
}
|
|
117
|
+
var pl1 = getRotatePoint({ x: newP.x, y: newP.y + dis }, { x: newP.x, y: newP.y }, angle);
|
|
118
|
+
var pE = getRotatePoint({ x: newP.x + arrowLength, y: newP.y }, { x: newP.x, y: newP.y }, angle);
|
|
119
|
+
var rAngle = Math.PI / 2;
|
|
120
|
+
if (reverse) {
|
|
121
|
+
rAngle = -Math.PI / 2;
|
|
122
|
+
}
|
|
123
|
+
path.moveTo(newP.x, newP.y);
|
|
124
|
+
path.arc(newP.x, newP.y, lineWidth / 2, -rAngle - angle / 180 * Math.PI, rAngle - angle / 180 * Math.PI, false);
|
|
125
|
+
path.lineTo(pE.x, pE.y);
|
|
126
|
+
path.lineTo(pl1.x, pl1.y);
|
|
127
|
+
}
|
|
98
128
|
//# sourceMappingURL=arrow.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"arrow.js","sourceRoot":"","sources":["../../../../../packages/core/src/diagrams/line/arrow.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"arrow.js","sourceRoot":"","sources":["../../../../../packages/core/src/diagrams/line/arrow.ts"],"names":[],"mappings":"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"}
|
package/src/diagrams/video.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { setElemPosition } from '../pen';
|
|
2
2
|
export var videos = {};
|
|
3
|
+
var mutedIcons = ['<svg viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M473.088 125.44L256 256H52.224C23.552 256 0 279.552 0 308.224V716.8c0 28.16 23.04 51.2 51.2 51.2h204.8l217.088 130.56c16.896 10.24 38.912-2.048 38.912-22.016V147.456c0-19.968-21.504-32.256-38.912-22.016zM699.904 320.512c-20.992-18.944-53.248-17.408-72.192 3.584-18.944 20.992-17.408 53.248 3.584 72.192 0.512 0.512 58.368 54.784 58.368 121.344 0 37.888-19.456 74.752-58.368 110.08-20.992 18.944-22.528 51.2-3.584 72.192 10.24 11.264 24.064 16.896 37.888 16.896 12.288 0 24.576-4.608 34.304-13.312 61.44-55.296 92.16-117.76 92.16-185.856 0-112.64-88.576-193.536-92.16-197.12z" fill="" p-id="2434"></path><path d="M853.504 166.4c-20.992-18.944-53.248-16.896-72.192 4.096-18.944 20.992-16.896 53.248 4.096 72.192 1.536 1.024 135.68 122.88 135.68 280.576 0 90.624-45.568 177.152-135.68 257.536-20.992 18.944-23.04 51.2-4.096 72.192 10.24 11.264 24.064 16.896 38.4 16.896 12.288 0 24.576-4.096 34.304-12.8 112.64-100.864 169.984-212.992 169.984-333.824-1.024-202.752-163.84-350.208-170.496-356.864z"></path></svg>', '<svg viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" ><path d="M256 768H51.2c-28.16 0-51.2-23.04-51.2-51.2V308.224C0 279.552 23.552 256 52.224 256H256v512zM512 147.456v728.576c0 19.968-21.504 32.256-38.912 22.016L256 768V256l217.088-130.56c17.408-10.24 38.912 2.048 38.912 22.016zM623.104 656.896c-19.968-19.968-19.968-52.224 0-72.192l217.088-217.088c19.968-19.968 52.224-19.968 72.192 0 19.968 19.968 19.968 52.224 0 72.192l-217.088 217.088c-19.456 19.968-52.224 19.968-72.192 0z" fill="" p-id="2582"></path><path d="M623.104 367.104c19.968-19.968 52.224-19.968 72.192 0l217.088 217.088c19.968 19.968 19.968 52.224 0 72.192-19.968 19.968-52.224 19.968-72.192 0l-217.088-217.088c-19.968-19.456-19.968-52.224 0-72.192z"></path></svg>'];
|
|
3
4
|
export function video(pen) {
|
|
4
5
|
var _a;
|
|
5
6
|
if (!pen.onDestroy) {
|
|
@@ -22,7 +23,39 @@ export function video(pen) {
|
|
|
22
23
|
progress_1.style.height = '2px';
|
|
23
24
|
progress_1.style.background = '#52c41a';
|
|
24
25
|
progress_1.style.zIndex = '1';
|
|
26
|
+
var muted_1 = document.createElement('div');
|
|
27
|
+
muted_1.innerHTML = mutedIcons[1];
|
|
28
|
+
muted_1.style.position = 'absolute';
|
|
29
|
+
muted_1.style.right = '0';
|
|
30
|
+
muted_1.style.bottom = '0';
|
|
31
|
+
muted_1.style.width = '20px';
|
|
32
|
+
muted_1.style.height = '20px';
|
|
33
|
+
muted_1.style.fill = 'hsla(0, 0%, 100%, .8)';
|
|
34
|
+
muted_1.style.zIndex = '1';
|
|
35
|
+
muted_1.style.display = 'none';
|
|
25
36
|
player.appendChild(progress_1);
|
|
37
|
+
player.appendChild(muted_1);
|
|
38
|
+
muted_1.onclick = function (e) {
|
|
39
|
+
e.stopPropagation();
|
|
40
|
+
if (pen.calculative.media.muted) {
|
|
41
|
+
muted_1.innerHTML = mutedIcons[0];
|
|
42
|
+
pen.calculative.media.muted = false;
|
|
43
|
+
}
|
|
44
|
+
else {
|
|
45
|
+
muted_1.innerHTML = mutedIcons[1];
|
|
46
|
+
pen.calculative.media.muted = true;
|
|
47
|
+
}
|
|
48
|
+
};
|
|
49
|
+
if (!pen.calculative.singleton) {
|
|
50
|
+
pen.calculative.singleton = {};
|
|
51
|
+
}
|
|
52
|
+
pen.calculative.singleton.muted = muted_1;
|
|
53
|
+
player.onmouseenter = function (e) {
|
|
54
|
+
muted_1.style.display = 'block';
|
|
55
|
+
};
|
|
56
|
+
player.onmouseleave = function (e) {
|
|
57
|
+
muted_1.style.display = 'none';
|
|
58
|
+
};
|
|
26
59
|
player.onclick = function (e) {
|
|
27
60
|
e.stopPropagation();
|
|
28
61
|
click(pen);
|
|
@@ -56,7 +89,7 @@ export function video(pen) {
|
|
|
56
89
|
setElemPosition(pen, player);
|
|
57
90
|
if (pen.autoPlay) {
|
|
58
91
|
media_1.autoplay = true;
|
|
59
|
-
media_1.muted =
|
|
92
|
+
media_1.muted = true;
|
|
60
93
|
}
|
|
61
94
|
}
|
|
62
95
|
else if (pen.video &&
|
|
@@ -65,7 +98,7 @@ export function video(pen) {
|
|
|
65
98
|
console.warn('video 更改, 此处是否执行？');
|
|
66
99
|
pen.calculative.media.src = pen.video;
|
|
67
100
|
if (pen.autoPlay) {
|
|
68
|
-
pen.calculative.media.muted =
|
|
101
|
+
pen.calculative.media.muted = true;
|
|
69
102
|
pen.calculative.media.autoplay = true;
|
|
70
103
|
}
|
|
71
104
|
pen.calculative.media.loop = pen.playLoop;
|
|
@@ -76,7 +109,7 @@ export function video(pen) {
|
|
|
76
109
|
pen.audio !== pen.calculative.audio) {
|
|
77
110
|
pen.calculative.media.src = pen.audio;
|
|
78
111
|
if (pen.autoPlay) {
|
|
79
|
-
pen.calculative.media.muted =
|
|
112
|
+
pen.calculative.media.muted = true;
|
|
80
113
|
pen.calculative.media.autoplay = true;
|
|
81
114
|
}
|
|
82
115
|
pen.calculative.media.loop = pen.playLoop;
|
|
@@ -101,6 +134,7 @@ function move(pen) {
|
|
|
101
134
|
function click(pen) {
|
|
102
135
|
if (pen.calculative.media) {
|
|
103
136
|
pen.calculative.media.muted = false;
|
|
137
|
+
pen.calculative.singleton.muted.innerHTML = mutedIcons[0];
|
|
104
138
|
if (pen.calculative.media.paused) {
|
|
105
139
|
pen.calculative.media.play();
|
|
106
140
|
}
|
|
@@ -139,7 +173,7 @@ function value(pen) {
|
|
|
139
173
|
}
|
|
140
174
|
// TODO: 下面每次都改动，是否影响性能？
|
|
141
175
|
if (pen.autoPlay) {
|
|
142
|
-
pen.calculative.media.muted =
|
|
176
|
+
pen.calculative.media.muted = true;
|
|
143
177
|
// TODO: 自动播放何时关？
|
|
144
178
|
pen.calculative.media.autoplay = true;
|
|
145
179
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"video.js","sourceRoot":"","sources":["../../../../packages/core/src/diagrams/video.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,eAAe,EAAE,MAAM,QAAQ,CAAC;AAE9C,MAAM,CAAC,IAAM,MAAM,GAEf,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"video.js","sourceRoot":"","sources":["../../../../packages/core/src/diagrams/video.ts"],"names":[],"mappings":"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"}
|
package/src/event/event.d.ts
CHANGED
package/src/options.js
CHANGED
package/src/pen/model.d.ts
CHANGED
package/src/pen/model.js
CHANGED
|
@@ -75,6 +75,7 @@ export var LineAnimateType;
|
|
|
75
75
|
LineAnimateType[LineAnimateType["Beads"] = 1] = "Beads";
|
|
76
76
|
LineAnimateType[LineAnimateType["Dot"] = 2] = "Dot";
|
|
77
77
|
LineAnimateType[LineAnimateType["Arrow"] = 3] = "Arrow";
|
|
78
|
+
LineAnimateType[LineAnimateType["WaterDrop"] = 4] = "WaterDrop";
|
|
78
79
|
})(LineAnimateType || (LineAnimateType = {}));
|
|
79
80
|
/**
|
|
80
81
|
* dom 类型的 图形
|
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,
|
|
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
|
@@ -433,7 +433,7 @@ function smoothTransition(ctx, pen, smoothLenth, p1, p2, p3) {
|
|
|
433
433
|
var last = getSmoothAdjacent(smoothLenth, p2, p1);
|
|
434
434
|
var next = getSmoothAdjacent(smoothLenth, p2, p3);
|
|
435
435
|
var contrlPoint = { x: p2.x, y: p2.y };
|
|
436
|
-
var points = getBezierPoints(
|
|
436
|
+
var points = getBezierPoints(pen.calculative.canvas.store.data.smoothNum || 20, last, contrlPoint, next);
|
|
437
437
|
for (var k = 0; k < points.length - 1; k++) {
|
|
438
438
|
drawLinearGradientLine(ctx, pen, [
|
|
439
439
|
{
|
|
@@ -1421,7 +1421,14 @@ export function ctxDrawPath(canUsePath, ctx, pen, store, fill) {
|
|
|
1421
1421
|
ctx.restore();
|
|
1422
1422
|
}
|
|
1423
1423
|
if (path instanceof Path2D) {
|
|
1424
|
-
|
|
1424
|
+
if (pen.type) {
|
|
1425
|
+
if (pen.close) {
|
|
1426
|
+
fill && ctx.fill(path);
|
|
1427
|
+
}
|
|
1428
|
+
}
|
|
1429
|
+
else {
|
|
1430
|
+
fill && ctx.fill(path);
|
|
1431
|
+
}
|
|
1425
1432
|
}
|
|
1426
1433
|
else {
|
|
1427
1434
|
ctx.save();
|
|
@@ -1485,7 +1492,7 @@ export function ctxDrawPath(canUsePath, ctx, pen, store, fill) {
|
|
|
1485
1492
|
if (pen.calculative.animatePos) {
|
|
1486
1493
|
ctx.save();
|
|
1487
1494
|
setCtxLineAnimate(ctx, pen, store);
|
|
1488
|
-
if (pen.lineAnimateType === LineAnimateType.Arrow) {
|
|
1495
|
+
if (pen.lineAnimateType === LineAnimateType.Arrow || pen.lineAnimateType === LineAnimateType.WaterDrop) {
|
|
1489
1496
|
//箭头动画
|
|
1490
1497
|
var _path = drawArrow(pen, ctx);
|
|
1491
1498
|
if (_path instanceof Path2D) {
|
|
@@ -1510,7 +1517,7 @@ export function ctxDrawPath(canUsePath, ctx, pen, store, fill) {
|
|
|
1510
1517
|
}
|
|
1511
1518
|
pen.fromArrow && renderFromArrow(ctx, pen, store);
|
|
1512
1519
|
pen.toArrow && renderToArrow(ctx, pen, store);
|
|
1513
|
-
if (pen.calculative.active && !pen.calculative.pencil) {
|
|
1520
|
+
if (pen.calculative.active && !pen.calculative.pencil && !store.options.disableAnchor && !store.data.locked) {
|
|
1514
1521
|
renderLineAnchors(ctx, pen);
|
|
1515
1522
|
}
|
|
1516
1523
|
}
|
|
@@ -1532,7 +1539,7 @@ export function ctxDrawLinePath(canUsePath, ctx, pen, store) {
|
|
|
1532
1539
|
ctx.beginPath();
|
|
1533
1540
|
if (path instanceof Path2D) {
|
|
1534
1541
|
if (pen.lineName === 'polyline' || pen.lineName === 'line') {
|
|
1535
|
-
if (pen.lineAnimateType === LineAnimateType.Arrow) {
|
|
1542
|
+
if (pen.lineAnimateType === LineAnimateType.Arrow || pen.lineAnimateType === LineAnimateType.WaterDrop) {
|
|
1536
1543
|
//箭头动画
|
|
1537
1544
|
var _path = drawArrow(pen);
|
|
1538
1545
|
ctx.stroke(_path);
|
|
@@ -1565,7 +1572,7 @@ export function ctxDrawLinePath(canUsePath, ctx, pen, store) {
|
|
|
1565
1572
|
pen.fromArrow && renderFromArrow(ctx, pen, store);
|
|
1566
1573
|
pen.toArrow && renderToArrow(ctx, pen, store);
|
|
1567
1574
|
//TODO 锚点处渐进色的过渡
|
|
1568
|
-
if (pen.calculative.active && !pen.calculative.pencil) {
|
|
1575
|
+
if (pen.calculative.active && !pen.calculative.pencil && !store.options.disableAnchor && !store.data.locked) {
|
|
1569
1576
|
renderLineAnchors(ctx, pen);
|
|
1570
1577
|
}
|
|
1571
1578
|
}
|
|
@@ -1622,6 +1629,10 @@ export function setCtxLineAnimate(ctx, pen, store) {
|
|
|
1622
1629
|
ctx.fillStyle = pen.animateColor || store.options.animateColor;
|
|
1623
1630
|
ctx.lineWidth = 1;
|
|
1624
1631
|
break;
|
|
1632
|
+
case LineAnimateType.WaterDrop:
|
|
1633
|
+
ctx.fillStyle = pen.animateColor || store.options.animateColor;
|
|
1634
|
+
ctx.lineWidth = 1;
|
|
1635
|
+
break;
|
|
1625
1636
|
default:
|
|
1626
1637
|
if (pen.animateReverse) {
|
|
1627
1638
|
ctx.lineDashOffset = Number.EPSILON; //防止在执行动画时会绘制多余的远点
|
|
@@ -2754,7 +2765,7 @@ export function setChildValue(pen, data) {
|
|
|
2754
2765
|
for (var k in data) {
|
|
2755
2766
|
if (inheritanceProps.includes(k)) {
|
|
2756
2767
|
pen[k] = data[k];
|
|
2757
|
-
if (
|
|
2768
|
+
if (['fontSize', 'lineWidth'].includes(k)) {
|
|
2758
2769
|
pen.calculative[k] = data[k] * pen.calculative.canvas.store.data.scale;
|
|
2759
2770
|
calcTextRect(pen);
|
|
2760
2771
|
}
|