@meta2d/core 1.0.63 → 1.0.65
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 +1 -1
- package/src/canvas/canvas.js +52 -30
- package/src/canvas/canvas.js.map +1 -1
- package/src/canvas/canvasTemplate.d.ts +1 -0
- package/src/canvas/canvasTemplate.js +8 -2
- package/src/canvas/canvasTemplate.js.map +1 -1
- package/src/core.d.ts +3 -2
- package/src/core.js +258 -208
- package/src/core.js.map +1 -1
- package/src/diagrams/video.js +1 -0
- package/src/diagrams/video.js.map +1 -1
- package/src/dialog/dialog.d.ts +9 -3
- package/src/dialog/dialog.js +79 -6
- package/src/dialog/dialog.js.map +1 -1
- package/src/pen/render.js +29 -11
- package/src/pen/render.js.map +1 -1
- package/src/utils/url.d.ts +3 -0
- package/src/utils/url.js +63 -0
- package/src/utils/url.js.map +1 -1
package/src/diagrams/video.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"video.js","sourceRoot":"","sources":["../../../../packages/core/src/diagrams/video.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"video.js","sourceRoot":"","sources":["../../../../packages/core/src/diagrams/video.ts"],"names":[],"mappings":"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"}
|
package/src/dialog/dialog.d.ts
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
|
+
import { Meta2d } from "../core";
|
|
2
|
+
import { Meta2dStore } from '../store';
|
|
1
3
|
export declare class Dialog {
|
|
2
4
|
parentElement: HTMLElement;
|
|
3
5
|
box: HTMLElement;
|
|
4
|
-
iframe:
|
|
6
|
+
iframe: HTMLIFrameElement;
|
|
5
7
|
dialog: HTMLElement;
|
|
6
8
|
close: HTMLElement;
|
|
7
9
|
title: HTMLElement;
|
|
@@ -9,13 +11,17 @@ export declare class Dialog {
|
|
|
9
11
|
x: number;
|
|
10
12
|
y: number;
|
|
11
13
|
url: string;
|
|
12
|
-
|
|
14
|
+
meta2dDiv: HTMLElement;
|
|
15
|
+
dialogMeta2d: Meta2d;
|
|
16
|
+
store: Meta2dStore;
|
|
17
|
+
constructor(parentElement: HTMLElement, store: Meta2dStore);
|
|
13
18
|
show(title?: string, url?: string, rect?: {
|
|
14
19
|
x: number;
|
|
15
20
|
y: number;
|
|
16
21
|
width: number;
|
|
17
22
|
height: number;
|
|
18
|
-
}): void
|
|
23
|
+
}, data?: any): Promise<void>;
|
|
19
24
|
hide(): void;
|
|
25
|
+
isUrl(url: string): boolean;
|
|
20
26
|
destroy(): void;
|
|
21
27
|
}
|
package/src/dialog/dialog.js
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { Meta2d } from "../core";
|
|
2
|
+
import { getMeta2dData } from "../utils";
|
|
1
3
|
export class Dialog {
|
|
2
4
|
parentElement;
|
|
3
5
|
box;
|
|
@@ -9,8 +11,12 @@ export class Dialog {
|
|
|
9
11
|
x;
|
|
10
12
|
y;
|
|
11
13
|
url;
|
|
12
|
-
|
|
14
|
+
meta2dDiv;
|
|
15
|
+
dialogMeta2d;
|
|
16
|
+
store;
|
|
17
|
+
constructor(parentElement, store) {
|
|
13
18
|
this.parentElement = parentElement;
|
|
19
|
+
this.store = store;
|
|
14
20
|
this.box = document.createElement('div');
|
|
15
21
|
this.dialog = document.createElement('div');
|
|
16
22
|
let header = document.createElement('div');
|
|
@@ -27,15 +33,18 @@ export class Dialog {
|
|
|
27
33
|
this.body = document.createElement('div');
|
|
28
34
|
this.iframe = document.createElement('iframe');
|
|
29
35
|
this.iframe.setAttribute('frameborder', '0');
|
|
36
|
+
this.meta2dDiv = document.createElement('div');
|
|
30
37
|
this.box.className = 'meta2d-dialog_mask';
|
|
31
38
|
this.dialog.className = 'meta2d-dialog';
|
|
32
39
|
this.body.className = 'meta2d-dialog_body';
|
|
33
40
|
header.className = 'meta2d-dialog_header';
|
|
34
41
|
this.title.className = 'meta2d-dialog-content';
|
|
35
42
|
this.close.className = 'meta2d-dialog-close';
|
|
43
|
+
this.meta2dDiv.className = 'meta2d-dialog-meta2d';
|
|
36
44
|
header.appendChild(this.title);
|
|
37
45
|
header.appendChild(this.close);
|
|
38
46
|
this.body.appendChild(this.iframe);
|
|
47
|
+
this.body.appendChild(this.meta2dDiv);
|
|
39
48
|
this.dialog.appendChild(header);
|
|
40
49
|
this.dialog.appendChild(this.body);
|
|
41
50
|
this.box.appendChild(this.dialog);
|
|
@@ -87,6 +96,8 @@ export class Dialog {
|
|
|
87
96
|
}`);
|
|
88
97
|
sheet.insertRule(`.meta2d-dialog_header {
|
|
89
98
|
display: flex;
|
|
99
|
+
position: relative;
|
|
100
|
+
z-index: 999;
|
|
90
101
|
}`);
|
|
91
102
|
sheet.insertRule(`.meta2d-dialog-content {
|
|
92
103
|
width: calc(100% - 20px);
|
|
@@ -109,19 +120,34 @@ export class Dialog {
|
|
|
109
120
|
cursor: pointer;
|
|
110
121
|
}`);
|
|
111
122
|
sheet.insertRule(`.meta2d-dialog_body{
|
|
112
|
-
|
|
123
|
+
width: 100%;
|
|
124
|
+
height: 100%;
|
|
113
125
|
} `);
|
|
114
126
|
sheet.insertRule(`.meta2d-dialog_body iframe{
|
|
115
127
|
width: 100%;
|
|
116
128
|
height: 100%;
|
|
117
129
|
}`);
|
|
130
|
+
sheet.insertRule(`.meta2d-dialog_body .meta2d-dialog-meta2d{
|
|
131
|
+
width: 100%;
|
|
132
|
+
height: 100%;
|
|
133
|
+
display: none;
|
|
134
|
+
}`);
|
|
118
135
|
}
|
|
119
136
|
}
|
|
120
|
-
show(title, url, rect) {
|
|
137
|
+
async show(title, url, rect, data) {
|
|
121
138
|
if (!url) {
|
|
122
139
|
return;
|
|
123
140
|
}
|
|
124
|
-
|
|
141
|
+
const isIframe = this.isUrl(url);
|
|
142
|
+
if (isIframe) {
|
|
143
|
+
this.meta2dDiv.style.display = 'none';
|
|
144
|
+
this.iframe.style.display = 'block';
|
|
145
|
+
}
|
|
146
|
+
else {
|
|
147
|
+
this.iframe.style.display = 'none';
|
|
148
|
+
this.meta2dDiv.style.display = 'block';
|
|
149
|
+
}
|
|
150
|
+
if (isIframe && url !== this.url) {
|
|
125
151
|
this.iframe.setAttribute('src', url);
|
|
126
152
|
this.url = url;
|
|
127
153
|
}
|
|
@@ -140,18 +166,65 @@ export class Dialog {
|
|
|
140
166
|
if (rect) {
|
|
141
167
|
this.dialog.style.width = rect.width ? (rect.width + 'px') : '80%';
|
|
142
168
|
this.dialog.style.height = rect.height ? (rect.height + 'px') : '420px';
|
|
143
|
-
this.dialog.style.top = rect.y ? (rect.y + 'px') : '15vh';
|
|
169
|
+
this.dialog.style.top = rect.y ? (rect.y + 'px') : (rect.height ? `calc( 50% - ${rect.height / 2}px )` : '15vh');
|
|
144
170
|
this.dialog.style.left = rect.x ? (rect.x + 'px') : `calc( 50% - ${rect.width ? rect.width / 2 + 'px' : '40%'} )`;
|
|
145
171
|
}
|
|
146
|
-
|
|
172
|
+
if (isIframe && data) {
|
|
173
|
+
let timeout = 0;
|
|
174
|
+
const interval = setInterval(() => {
|
|
175
|
+
if (this.iframe.contentWindow.meta2d) {
|
|
176
|
+
clearInterval(interval);
|
|
177
|
+
setTimeout(() => {
|
|
178
|
+
this.iframe.contentWindow.postMessage(JSON.stringify({
|
|
179
|
+
name: 'dialog',
|
|
180
|
+
data
|
|
181
|
+
}), '*');
|
|
182
|
+
}, 100);
|
|
183
|
+
}
|
|
184
|
+
timeout++;
|
|
185
|
+
if (timeout > 50) {
|
|
186
|
+
clearInterval(interval);
|
|
187
|
+
}
|
|
188
|
+
}, 300);
|
|
189
|
+
}
|
|
190
|
+
if (!this.dialogMeta2d || isIframe) {
|
|
191
|
+
this.box.style.display = 'block';
|
|
192
|
+
}
|
|
193
|
+
if (!isIframe) {
|
|
194
|
+
this.meta2dDiv.style.display = 'block';
|
|
195
|
+
if (!this.dialogMeta2d) {
|
|
196
|
+
globalThis.mainMeta2d = globalThis.meta2d;
|
|
197
|
+
this.dialogMeta2d = new Meta2d(this.meta2dDiv);
|
|
198
|
+
globalThis.meta2d = globalThis.mainMeta2d;
|
|
199
|
+
}
|
|
200
|
+
const meta2dData = await getMeta2dData(this.store, url);
|
|
201
|
+
if (meta2dData) {
|
|
202
|
+
this.box.style.display = 'block';
|
|
203
|
+
this.dialogMeta2d.clear(true);
|
|
204
|
+
this.dialogMeta2d.open(meta2dData, false);
|
|
205
|
+
this.dialogMeta2d.lock(1);
|
|
206
|
+
this.dialogMeta2d.resize();
|
|
207
|
+
this.dialogMeta2d.fitView(true, 0);
|
|
208
|
+
this.dialogMeta2d.render(true);
|
|
209
|
+
}
|
|
210
|
+
}
|
|
147
211
|
}
|
|
148
212
|
hide() {
|
|
149
213
|
this.box.style.display = 'none';
|
|
150
214
|
}
|
|
215
|
+
isUrl(url) {
|
|
216
|
+
if (url.startsWith('http') || url.includes('?') || url.includes('/')) {
|
|
217
|
+
return true;
|
|
218
|
+
}
|
|
219
|
+
else {
|
|
220
|
+
return false;
|
|
221
|
+
}
|
|
222
|
+
}
|
|
151
223
|
destroy() {
|
|
152
224
|
this.dialog.onclick = undefined;
|
|
153
225
|
this.box.onclick = undefined;
|
|
154
226
|
this.close.onclick = undefined;
|
|
227
|
+
this.dialogMeta2d?.destroy(true);
|
|
155
228
|
}
|
|
156
229
|
}
|
|
157
230
|
//# sourceMappingURL=dialog.js.map
|
package/src/dialog/dialog.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dialog.js","sourceRoot":"","sources":["../../../../packages/core/src/dialog/dialog.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,MAAM;
|
|
1
|
+
{"version":3,"file":"dialog.js","sourceRoot":"","sources":["../../../../packages/core/src/dialog/dialog.ts"],"names":[],"mappings":"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"}
|
package/src/pen/render.js
CHANGED
|
@@ -2396,7 +2396,7 @@ export function setNodeAnimate(pen, now) {
|
|
|
2396
2396
|
setNodeAnimateProcess(pen, 1);
|
|
2397
2397
|
return 0;
|
|
2398
2398
|
}
|
|
2399
|
-
const pos = (now - pen.calculative.start) % pen.calculative.duration;
|
|
2399
|
+
const pos = (now - pen.calculative.start) % pen.calculative.duration || pen.calculative.duration;
|
|
2400
2400
|
let d = 0;
|
|
2401
2401
|
for (const frame of pen.frames) {
|
|
2402
2402
|
d += frame.duration;
|
|
@@ -2411,17 +2411,24 @@ export function setNodeAnimate(pen, now) {
|
|
|
2411
2411
|
if (!pen.frames[frameIndex]) {
|
|
2412
2412
|
return true;
|
|
2413
2413
|
}
|
|
2414
|
-
pen.calculative.frameDuration = pen.frames[frameIndex].duration;
|
|
2415
|
-
pen.calculative.frameStart =
|
|
2416
|
-
pen.calculative.start + pen.calculative.duration * (cycleIndex - 1);
|
|
2417
|
-
pen.calculative.frameEnd =
|
|
2418
|
-
pen.calculative.frameStart + pen.calculative.frameDuration;
|
|
2419
2414
|
// 换帧
|
|
2420
|
-
|
|
2415
|
+
let frameChanged = false;
|
|
2416
|
+
if (frameIndex !== pen.calculative.frameIndex) {
|
|
2417
|
+
frameChanged = true;
|
|
2418
|
+
pen.calculative.frameIndex = frameIndex;
|
|
2419
|
+
pen.calculative.frameDuration = pen.frames[frameIndex].duration;
|
|
2420
|
+
if (frameIndex > 0) {
|
|
2421
|
+
pen.calculative.frameStart += pen.frames[frameIndex - 1].duration;
|
|
2422
|
+
}
|
|
2423
|
+
pen.calculative.frameEnd = pen.calculative.frameStart + pen.calculative.frameDuration;
|
|
2424
|
+
}
|
|
2421
2425
|
// 新循环播放
|
|
2422
|
-
|
|
2423
|
-
|
|
2424
|
-
|
|
2426
|
+
let cycleChanged = false;
|
|
2427
|
+
if (cycleIndex > pen.calculative.cycleIndex) {
|
|
2428
|
+
pen.calculative.cycleIndex = cycleIndex;
|
|
2429
|
+
pen.calculative.frameStart = pen.calculative.start + pen.calculative.duration * (cycleIndex - 1);
|
|
2430
|
+
cycleChanged = true;
|
|
2431
|
+
}
|
|
2425
2432
|
if (frameChanged || cycleChanged) {
|
|
2426
2433
|
// 以初始位置为参考点。因为网页在后台时，不执行动画帧，网页恢复显示时，位置不确定
|
|
2427
2434
|
pen.calculative.x = pen.calculative.initRect.x;
|
|
@@ -2452,7 +2459,7 @@ export function setNodeAnimate(pen, now) {
|
|
|
2452
2459
|
}
|
|
2453
2460
|
}
|
|
2454
2461
|
const process = ((now - pen.calculative.frameStart) / pen.calculative.frameDuration) % 1;
|
|
2455
|
-
setNodeAnimateProcess(pen, process);
|
|
2462
|
+
process > 0 && setNodeAnimateProcess(pen, process);
|
|
2456
2463
|
return true;
|
|
2457
2464
|
}
|
|
2458
2465
|
// 把前一个动画帧初始化为播放前状态
|
|
@@ -2492,6 +2499,11 @@ export function setNodeAnimateProcess(pen, process) {
|
|
|
2492
2499
|
const lastVal = getFrameValue(pen, k, pen.calculative.frameIndex);
|
|
2493
2500
|
pen.calculative.worldRect.x = pen.calculative.initRect.x + lastVal;
|
|
2494
2501
|
pen.calculative.worldRect.ex = pen.calculative.initRect.ex + lastVal;
|
|
2502
|
+
pen.calculative.worldRect.center.x = pen.calculative.initRect.center.x + lastVal;
|
|
2503
|
+
if (pen.calculative.worldRect.pivot?.x) {
|
|
2504
|
+
pen.calculative.worldRect.pivot.x =
|
|
2505
|
+
pen.calculative.initRect.pivot?.x + lastVal;
|
|
2506
|
+
}
|
|
2495
2507
|
translateRect(pen.calculative.worldRect, frame[k] * process * pen.calculative.canvas.store.data.scale, 0);
|
|
2496
2508
|
pen.calculative.patchFlags = true;
|
|
2497
2509
|
}
|
|
@@ -2499,6 +2511,12 @@ export function setNodeAnimateProcess(pen, process) {
|
|
|
2499
2511
|
const lastVal = getFrameValue(pen, k, pen.calculative.frameIndex);
|
|
2500
2512
|
pen.calculative.worldRect.y = pen.calculative.initRect.y + lastVal;
|
|
2501
2513
|
pen.calculative.worldRect.ey = pen.calculative.initRect.ey + lastVal;
|
|
2514
|
+
pen.calculative.worldRect.center.y =
|
|
2515
|
+
pen.calculative.initRect.center.y + lastVal;
|
|
2516
|
+
if (pen.calculative.worldRect.pivot?.x) {
|
|
2517
|
+
pen.calculative.worldRect.pivot.y =
|
|
2518
|
+
pen.calculative.initRect.pivot?.y + lastVal;
|
|
2519
|
+
}
|
|
2502
2520
|
translateRect(pen.calculative.worldRect, 0, frame[k] * process * pen.calculative.canvas.store.data.scale);
|
|
2503
2521
|
pen.calculative.patchFlags = true;
|
|
2504
2522
|
}
|