@meta2d/core 1.0.43 → 1.0.45
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 +52 -22
- 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 +1 -0
- package/src/core.js +74 -9
- package/src/core.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.d.ts +1 -0
- package/src/options.js.map +1 -1
- package/src/pen/render.js +7 -4
- 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 +6 -1
- package/src/store/store.js +1 -0
- package/src/store/store.js.map +1 -1
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.d.ts
CHANGED
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;AAsGD,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,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,QAAQ,EAAE,IAAI;IACd,UAAU,EAAE,IAAI;IAChB,eAAe,EAAE,EAAE;IACnB,cAAc,EAAE,EAAE;CACnB,CAAC"}
|
package/src/pen/render.js
CHANGED
|
@@ -1427,6 +1427,7 @@ export function ctxDrawPath(canUsePath, ctx, pen, store, fill) {
|
|
|
1427
1427
|
}
|
|
1428
1428
|
}
|
|
1429
1429
|
else {
|
|
1430
|
+
//svgPath
|
|
1430
1431
|
fill && ctx.fill(path);
|
|
1431
1432
|
}
|
|
1432
1433
|
}
|
|
@@ -1481,7 +1482,9 @@ export function ctxDrawPath(canUsePath, ctx, pen, store, fill) {
|
|
|
1481
1482
|
}
|
|
1482
1483
|
if (pen.calculative.lineWidth) {
|
|
1483
1484
|
if (path instanceof Path2D) {
|
|
1484
|
-
|
|
1485
|
+
if (store.options.svgPathStroke || pen.name !== 'svgPath') {
|
|
1486
|
+
ctx.stroke(path);
|
|
1487
|
+
}
|
|
1485
1488
|
}
|
|
1486
1489
|
else {
|
|
1487
1490
|
path(pen, ctx);
|
|
@@ -1517,7 +1520,7 @@ export function ctxDrawPath(canUsePath, ctx, pen, store, fill) {
|
|
|
1517
1520
|
}
|
|
1518
1521
|
pen.fromArrow && renderFromArrow(ctx, pen, store);
|
|
1519
1522
|
pen.toArrow && renderToArrow(ctx, pen, store);
|
|
1520
|
-
if (pen.calculative.active && !pen.calculative.pencil) {
|
|
1523
|
+
if (pen.calculative.active && !pen.calculative.pencil && !store.options.disableAnchor && !store.data.locked) {
|
|
1521
1524
|
renderLineAnchors(ctx, pen);
|
|
1522
1525
|
}
|
|
1523
1526
|
}
|
|
@@ -1572,7 +1575,7 @@ export function ctxDrawLinePath(canUsePath, ctx, pen, store) {
|
|
|
1572
1575
|
pen.fromArrow && renderFromArrow(ctx, pen, store);
|
|
1573
1576
|
pen.toArrow && renderToArrow(ctx, pen, store);
|
|
1574
1577
|
//TODO 锚点处渐进色的过渡
|
|
1575
|
-
if (pen.calculative.active && !pen.calculative.pencil) {
|
|
1578
|
+
if (pen.calculative.active && !pen.calculative.pencil && !store.options.disableAnchor && !store.data.locked) {
|
|
1576
1579
|
renderLineAnchors(ctx, pen);
|
|
1577
1580
|
}
|
|
1578
1581
|
}
|
|
@@ -2765,7 +2768,7 @@ export function setChildValue(pen, data) {
|
|
|
2765
2768
|
for (var k in data) {
|
|
2766
2769
|
if (inheritanceProps.includes(k)) {
|
|
2767
2770
|
pen[k] = data[k];
|
|
2768
|
-
if (
|
|
2771
|
+
if (['fontSize', 'lineWidth'].includes(k)) {
|
|
2769
2772
|
pen.calculative[k] = data[k] * pen.calculative.canvas.store.data.scale;
|
|
2770
2773
|
calcTextRect(pen);
|
|
2771
2774
|
}
|