@meta2d/core 1.0.53 → 1.0.55
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 -0
- package/src/canvas/canvas.js +62 -24
- package/src/canvas/canvas.js.map +1 -1
- package/src/core.d.ts +5 -0
- package/src/core.js +211 -50
- package/src/core.js.map +1 -1
- package/src/dialog/dialog.d.ts +8 -1
- package/src/dialog/dialog.js +33 -12
- package/src/dialog/dialog.js.map +1 -1
- package/src/event/event.d.ts +2 -2
- package/src/event/event.js.map +1 -1
- package/src/options.d.ts +1 -0
- package/src/options.js.map +1 -1
- package/src/pen/model.d.ts +8 -0
- package/src/pen/model.js +11 -0
- package/src/pen/model.js.map +1 -1
- package/src/pen/render.js +36 -15
- package/src/pen/render.js.map +1 -1
- package/src/store/store.d.ts +5 -0
- package/src/store/store.js.map +1 -1
package/src/dialog/dialog.d.ts
CHANGED
|
@@ -5,10 +5,17 @@ export declare class Dialog {
|
|
|
5
5
|
dialog: HTMLElement;
|
|
6
6
|
close: HTMLElement;
|
|
7
7
|
title: HTMLElement;
|
|
8
|
+
body: HTMLElement;
|
|
8
9
|
x: number;
|
|
9
10
|
y: number;
|
|
11
|
+
url: string;
|
|
10
12
|
constructor(parentElement: HTMLElement);
|
|
11
|
-
show(title?: string, url?: string
|
|
13
|
+
show(title?: string, url?: string, rect?: {
|
|
14
|
+
x: number;
|
|
15
|
+
y: number;
|
|
16
|
+
width: number;
|
|
17
|
+
height: number;
|
|
18
|
+
}): void;
|
|
12
19
|
hide(): void;
|
|
13
20
|
destroy(): void;
|
|
14
21
|
}
|
package/src/dialog/dialog.js
CHANGED
|
@@ -8,20 +8,20 @@ var Dialog = /** @class */ (function () {
|
|
|
8
8
|
this.title = document.createElement('div');
|
|
9
9
|
this.close = document.createElement('span');
|
|
10
10
|
this.close.innerHTML = "\n <svg fill=\"none\" viewBox=\"0 0 16 16\" width=\"1em\" height=\"1em\">\n <path\n fill=\"currentColor\"\n d=\"M8 8.92L11.08 12l.92-.92L8.92 8 12 4.92 11.08 4 8 7.08 4.92 4 4 4.92 7.08 8 4 11.08l.92.92L8 8.92z\"\n fill-opacity=\"0.9\"\n ></path>\n </svg>";
|
|
11
|
-
|
|
11
|
+
this.body = document.createElement('div');
|
|
12
12
|
this.iframe = document.createElement('iframe');
|
|
13
13
|
this.iframe.setAttribute('frameborder', '0');
|
|
14
14
|
this.box.className = 'meta2d-dialog_mask';
|
|
15
15
|
this.dialog.className = 'meta2d-dialog';
|
|
16
|
-
body.className = 'meta2d-dialog_body';
|
|
16
|
+
this.body.className = 'meta2d-dialog_body';
|
|
17
17
|
header.className = 'meta2d-dialog_header';
|
|
18
18
|
this.title.className = 'meta2d-dialog-content';
|
|
19
19
|
this.close.className = 'meta2d-dialog-close';
|
|
20
20
|
header.appendChild(this.title);
|
|
21
21
|
header.appendChild(this.close);
|
|
22
|
-
body.appendChild(this.iframe);
|
|
22
|
+
this.body.appendChild(this.iframe);
|
|
23
23
|
this.dialog.appendChild(header);
|
|
24
|
-
this.dialog.appendChild(body);
|
|
24
|
+
this.dialog.appendChild(this.body);
|
|
25
25
|
this.box.appendChild(this.dialog);
|
|
26
26
|
parentElement.appendChild(this.box);
|
|
27
27
|
this.dialog.onclick = function (e) {
|
|
@@ -49,19 +49,40 @@ var Dialog = /** @class */ (function () {
|
|
|
49
49
|
document.head.appendChild(style);
|
|
50
50
|
sheet = style.sheet;
|
|
51
51
|
sheet.insertRule(".meta2d-dialog_mask {\n display: none;\n position: absolute;\n top: 0%;\n left: 0%;\n width: 100%;\n height: 100%;\n background-color: #0000006f;\n z-index: 9999;");
|
|
52
|
-
sheet.insertRule(".meta2d-dialog_mask .meta2d-dialog {\n position: absolute;\n top: 15vh;\n left: 10%;\n width: 80%;\n padding: 16px 20px;\n border-radius: 9px;\n background-color: #1e2430;\n z-index: 19999;\n overflow: auto;\n }");
|
|
52
|
+
sheet.insertRule(".meta2d-dialog_mask .meta2d-dialog {\n position: absolute;\n top: 15vh;\n left: 10%;\n width: 80%;\n height:420px;\n padding: 16px 20px;\n border-radius: 9px;\n background-color: #1e2430;\n z-index: 19999;\n overflow: auto;\n }");
|
|
53
53
|
sheet.insertRule(".meta2d-dialog_header {\n display: flex;\n }");
|
|
54
|
-
sheet.insertRule(".meta2d-dialog-content {\n width: calc(100% - 20px);\n font-weight: 600;\n font-size: 14px;\n color: #bdc7db;\n }");
|
|
55
|
-
sheet.insertRule(".meta2d-dialog-close {\n width: 20px;\n height: 20px;\n line-height: 20px;\n text-align: center;\n color: #617b91;\n }");
|
|
54
|
+
sheet.insertRule(".meta2d-dialog-content {\n width: calc(100% - 20px);\n font-weight: 600;\n font-size: 14px;\n color: #bdc7db;\n padding-bottom:8px;\n }");
|
|
55
|
+
sheet.insertRule(".meta2d-dialog-close {\n width: 20px;\n height: 20px;\n line-height: 20px;\n text-align: center;\n color: #617b91;\n position: absolute;\n right:20px;\n top:18px;\n }");
|
|
56
56
|
sheet.insertRule(".meta2d-dialog-close :hover{\n cursor: pointer;\n }");
|
|
57
|
-
sheet.insertRule(".meta2d-dialog_body{\n margin-top: 4px;\n } ");
|
|
58
|
-
sheet.insertRule(".meta2d-dialog_body iframe{\n width: 100%;\n height:
|
|
57
|
+
sheet.insertRule(".meta2d-dialog_body{\n // margin-top: 4px;\n } ");
|
|
58
|
+
sheet.insertRule(".meta2d-dialog_body iframe{\n width: 100%;\n height: 100%;\n }");
|
|
59
59
|
}
|
|
60
60
|
}
|
|
61
|
-
Dialog.prototype.show = function (title, url) {
|
|
62
|
-
|
|
63
|
-
|
|
61
|
+
Dialog.prototype.show = function (title, url, rect) {
|
|
62
|
+
if (!url) {
|
|
63
|
+
return;
|
|
64
|
+
}
|
|
65
|
+
if (url !== this.url) {
|
|
66
|
+
this.iframe.setAttribute('src', url);
|
|
67
|
+
this.url = url;
|
|
68
|
+
}
|
|
64
69
|
title && (this.title.innerText = title);
|
|
70
|
+
if (!title) {
|
|
71
|
+
this.dialog.style.padding = '0px';
|
|
72
|
+
this.title.style.display = 'none';
|
|
73
|
+
this.body.style.height = '100%';
|
|
74
|
+
this.body.style.overflow = 'hidden';
|
|
75
|
+
}
|
|
76
|
+
else {
|
|
77
|
+
this.dialog.style.padding = '16px 20px';
|
|
78
|
+
this.title.style.display = 'block';
|
|
79
|
+
this.body.style.height = 'calc(100% - 26px)';
|
|
80
|
+
}
|
|
81
|
+
this.dialog.style.top = rect.y ? (rect.y + 'px') : '15vh';
|
|
82
|
+
this.dialog.style.left = rect.x ? (rect.x + 'px') : '10%';
|
|
83
|
+
this.dialog.style.width = rect.width ? (rect.width + 'px') : '80%';
|
|
84
|
+
this.dialog.style.height = rect.height ? (rect.height + 'px') : '420px';
|
|
85
|
+
this.box.style.display = 'block';
|
|
65
86
|
};
|
|
66
87
|
Dialog.prototype.hide = function () {
|
|
67
88
|
this.box.style.display = 'none';
|
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;
|
|
1
|
+
{"version":3,"file":"dialog.js","sourceRoot":"","sources":["../../../../packages/core/src/dialog/dialog.ts"],"names":[],"mappings":"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"}
|
package/src/event/event.d.ts
CHANGED
|
@@ -2,14 +2,14 @@ import { Meta2d } from '../core';
|
|
|
2
2
|
import { IValue, Pen } from '../pen';
|
|
3
3
|
import { Network } from '../store';
|
|
4
4
|
export declare type EventValue = string | IValue | undefined | null;
|
|
5
|
-
export declare type EventName = 'enter' | 'leave' | 'active' | 'inactive' | 'click' | 'mousedown' | 'mouseup' | 'dblclick' | 'valueUpdate' | 'message' | 'contextmenu';
|
|
5
|
+
export declare type EventName = 'enter' | 'leave' | 'active' | 'inactive' | 'click' | 'mousedown' | 'mouseup' | 'dblclick' | 'valueUpdate' | 'message' | 'contextmenu' | 'input' | 'change';
|
|
6
6
|
export interface Event {
|
|
7
7
|
name: EventName;
|
|
8
8
|
action: EventAction;
|
|
9
9
|
where?: Where;
|
|
10
10
|
value?: EventValue;
|
|
11
11
|
params?: string;
|
|
12
|
-
extend?:
|
|
12
|
+
extend?: any;
|
|
13
13
|
fn?: (pen: Pen, params: string, context?: {
|
|
14
14
|
meta2d: Meta2d;
|
|
15
15
|
eventName: string;
|
package/src/event/event.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"event.js","sourceRoot":"","sources":["../../../../packages/core/src/event/event.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"event.js","sourceRoot":"","sources":["../../../../packages/core/src/event/event.ts"],"names":[],"mappings":"AA0CA,MAAM,CAAN,IAAY,WAmBX;AAnBD,WAAY,WAAW;IACrB,6CAAI,CAAA;IACJ,qDAAQ,CAAA;IACR,6DAAY,CAAA;IACZ,6DAAY,CAAA;IACZ,2DAAW,CAAA;IACX,yCAAE,CAAA;IACF,qDAAQ,CAAA;IACR,6CAAI,CAAA;IACJ,yDAAU,CAAA;IACV,yDAAU,CAAA;IACV,wDAAS,CAAA;IACT,8DAAY,CAAA;IACZ,4DAAW,CAAA;IACX,wDAAS,CAAA;IACT,kDAAM,CAAA;IACN,sDAAQ,CAAA;IACR,4DAAW,CAAA;IACX,4EAAmB,CAAA;AACrB,CAAC,EAnBW,WAAW,KAAX,WAAW,QAmBtB"}
|
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;AA8GD,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,WAAW,CAAC;IAC7B,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
|
@@ -268,6 +268,9 @@ export interface Pen extends Rect {
|
|
|
268
268
|
deviceId?: string;
|
|
269
269
|
pivot?: Point;
|
|
270
270
|
noOnBinds?: boolean;
|
|
271
|
+
interaction?: boolean;
|
|
272
|
+
childHover?: boolean;
|
|
273
|
+
childActive?: boolean;
|
|
271
274
|
calculative?: {
|
|
272
275
|
x?: number;
|
|
273
276
|
y?: number;
|
|
@@ -285,6 +288,7 @@ export interface Pen extends Rect {
|
|
|
285
288
|
svgRect?: Rect;
|
|
286
289
|
initRect?: Rect;
|
|
287
290
|
initRelativeRect?: Rect;
|
|
291
|
+
childrenVisible?: any;
|
|
288
292
|
rotate?: number;
|
|
289
293
|
lineWidth?: number;
|
|
290
294
|
borderWidth?: number;
|
|
@@ -499,6 +503,10 @@ export interface ChartData {
|
|
|
499
503
|
* dom 类型的 图形
|
|
500
504
|
*/
|
|
501
505
|
export declare const isDomShapes: string[];
|
|
506
|
+
/**
|
|
507
|
+
* 交互图元
|
|
508
|
+
*/
|
|
509
|
+
export declare const isInteraction: string[];
|
|
502
510
|
export declare const formatAttrs: Set<string>;
|
|
503
511
|
/**
|
|
504
512
|
* 清空 pen 的 生命周期
|
package/src/pen/model.js
CHANGED
|
@@ -88,6 +88,17 @@ export var isDomShapes = [
|
|
|
88
88
|
'highcharts',
|
|
89
89
|
'lightningCharts',
|
|
90
90
|
];
|
|
91
|
+
/**
|
|
92
|
+
* 交互图元
|
|
93
|
+
*/
|
|
94
|
+
export var isInteraction = [
|
|
95
|
+
'radio',
|
|
96
|
+
'checkbox',
|
|
97
|
+
'button',
|
|
98
|
+
'inputDom',
|
|
99
|
+
'slider',
|
|
100
|
+
'echarts',
|
|
101
|
+
];
|
|
91
102
|
// 格式刷同步的属性
|
|
92
103
|
export var formatAttrs = new Set([
|
|
93
104
|
'borderRadius',
|
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
|
@@ -2084,14 +2084,18 @@ export function scalePen(pen, scale, center) {
|
|
|
2084
2084
|
}
|
|
2085
2085
|
export function scaleChildrenInitRect(pen, scale, center) {
|
|
2086
2086
|
var _a;
|
|
2087
|
+
if (!pen) {
|
|
2088
|
+
return;
|
|
2089
|
+
}
|
|
2087
2090
|
if ((_a = pen.children) === null || _a === void 0 ? void 0 : _a.length) {
|
|
2088
2091
|
pen.children.forEach(function (id) {
|
|
2089
2092
|
var child = pen.calculative.canvas.store.pens[id];
|
|
2090
|
-
if (child
|
|
2091
|
-
child.calculative.initRect) {
|
|
2092
|
-
|
|
2093
|
+
if (child) {
|
|
2094
|
+
if (child.calculative.initRect) {
|
|
2095
|
+
scaleRect(child.calculative.initRect, scale, center);
|
|
2096
|
+
}
|
|
2097
|
+
scaleChildrenInitRect(child, scale, center);
|
|
2093
2098
|
}
|
|
2094
|
-
scaleChildrenInitRect(child, scale, center);
|
|
2095
2099
|
});
|
|
2096
2100
|
}
|
|
2097
2101
|
}
|
|
@@ -2344,7 +2348,7 @@ export function getToAnchor(pen) {
|
|
|
2344
2348
|
}
|
|
2345
2349
|
export function setNodeAnimate(pen, now) {
|
|
2346
2350
|
var e_4, _a, e_5, _b;
|
|
2347
|
-
var _c;
|
|
2351
|
+
var _c, _d;
|
|
2348
2352
|
if (pen.calculative.start === 0 || !pen.frames || !pen.frames.length) {
|
|
2349
2353
|
pen.calculative.start = undefined;
|
|
2350
2354
|
return 0;
|
|
@@ -2352,8 +2356,8 @@ export function setNodeAnimate(pen, now) {
|
|
|
2352
2356
|
if (!pen.calculative.duration) {
|
|
2353
2357
|
pen.calculative.duration = 0;
|
|
2354
2358
|
try {
|
|
2355
|
-
for (var
|
|
2356
|
-
var f =
|
|
2359
|
+
for (var _e = __values(pen.frames), _f = _e.next(); !_f.done; _f = _e.next()) {
|
|
2360
|
+
var f = _f.value;
|
|
2357
2361
|
pen.calculative.duration += f.duration;
|
|
2358
2362
|
for (var k in f) {
|
|
2359
2363
|
if (k !== 'duration' && !pen[k]) {
|
|
@@ -2367,7 +2371,7 @@ export function setNodeAnimate(pen, now) {
|
|
|
2367
2371
|
catch (e_4_1) { e_4 = { error: e_4_1 }; }
|
|
2368
2372
|
finally {
|
|
2369
2373
|
try {
|
|
2370
|
-
if (
|
|
2374
|
+
if (_f && !_f.done && (_a = _e.return)) _a.call(_e);
|
|
2371
2375
|
}
|
|
2372
2376
|
finally { if (e_4) throw e_4.error; }
|
|
2373
2377
|
}
|
|
@@ -2394,6 +2398,13 @@ export function setNodeAnimate(pen, now) {
|
|
|
2394
2398
|
height: pen.height,
|
|
2395
2399
|
};
|
|
2396
2400
|
}
|
|
2401
|
+
if ((_c = pen.children) === null || _c === void 0 ? void 0 : _c.length) {
|
|
2402
|
+
var store_1 = pen.calculative.canvas.store;
|
|
2403
|
+
pen.calculative.childrenVisible = {};
|
|
2404
|
+
pen.children.forEach(function (id) {
|
|
2405
|
+
pen.calculative.childrenVisible[id] = store_1.pens[id].visible;
|
|
2406
|
+
});
|
|
2407
|
+
}
|
|
2397
2408
|
pen.calculative.initRect.rotate = pen.calculative.rotate || 0;
|
|
2398
2409
|
initPrevFrame(pen);
|
|
2399
2410
|
}
|
|
@@ -2410,8 +2421,8 @@ export function setNodeAnimate(pen, now) {
|
|
|
2410
2421
|
var pos = (now - pen.calculative.start) % pen.calculative.duration;
|
|
2411
2422
|
var d = 0;
|
|
2412
2423
|
try {
|
|
2413
|
-
for (var
|
|
2414
|
-
var frame =
|
|
2424
|
+
for (var _g = __values(pen.frames), _h = _g.next(); !_h.done; _h = _g.next()) {
|
|
2425
|
+
var frame = _h.value;
|
|
2415
2426
|
d += frame.duration;
|
|
2416
2427
|
if (pos > d) {
|
|
2417
2428
|
++frameIndex;
|
|
@@ -2424,7 +2435,7 @@ export function setNodeAnimate(pen, now) {
|
|
|
2424
2435
|
catch (e_5_1) { e_5 = { error: e_5_1 }; }
|
|
2425
2436
|
finally {
|
|
2426
2437
|
try {
|
|
2427
|
-
if (
|
|
2438
|
+
if (_h && !_h.done && (_b = _g.return)) _b.call(_g);
|
|
2428
2439
|
}
|
|
2429
2440
|
finally { if (e_5) throw e_5.error; }
|
|
2430
2441
|
}
|
|
@@ -2447,7 +2458,7 @@ export function setNodeAnimate(pen, now) {
|
|
|
2447
2458
|
// 以初始位置为参考点。因为网页在后台时，不执行动画帧，网页恢复显示时，位置不确定
|
|
2448
2459
|
pen.calculative.x = pen.calculative.initRect.x;
|
|
2449
2460
|
pen.calculative.y = pen.calculative.initRect.y;
|
|
2450
|
-
if (((
|
|
2461
|
+
if (((_d = pen.children) === null || _d === void 0 ? void 0 : _d.length) && !pen.parentId) {
|
|
2451
2462
|
pen.calculative.canvas.rotatePen(pen, (pen.calculative.initRect.rotate || 0) - (pen.calculative.rotate || 0), pen.calculative.initRect);
|
|
2452
2463
|
}
|
|
2453
2464
|
else {
|
|
@@ -2647,7 +2658,7 @@ export function setLineAnimate(pen, now) {
|
|
|
2647
2658
|
}
|
|
2648
2659
|
export function setChildrenActive(pen, active) {
|
|
2649
2660
|
if (active === void 0) { active = true; }
|
|
2650
|
-
if (!pen.children) {
|
|
2661
|
+
if (!pen.children || pen.childActive === false) {
|
|
2651
2662
|
return;
|
|
2652
2663
|
}
|
|
2653
2664
|
var store = pen.calculative.canvas.store;
|
|
@@ -2666,6 +2677,9 @@ export function setHover(pen, hover) {
|
|
|
2666
2677
|
}
|
|
2667
2678
|
var store = pen.calculative.canvas.store;
|
|
2668
2679
|
pen.calculative.hover = hover;
|
|
2680
|
+
if (pen.childHover === false) {
|
|
2681
|
+
return;
|
|
2682
|
+
}
|
|
2669
2683
|
if (pen.children) {
|
|
2670
2684
|
pen.children.forEach(function (id) {
|
|
2671
2685
|
var _a, _b;
|
|
@@ -2907,7 +2921,8 @@ export function calcInView(pen, calcChild) {
|
|
|
2907
2921
|
}
|
|
2908
2922
|
// TODO: 语义化上，用 onValue 更合适，但 onValue 会触发 echarts 图形的重绘，没有必要
|
|
2909
2923
|
// 更改 view 后，修改 dom 节点的显示隐藏
|
|
2910
|
-
|
|
2924
|
+
// pen.onMove?.(pen);
|
|
2925
|
+
((_b = pen.calculative.singleton) === null || _b === void 0 ? void 0 : _b.div) && setElemPosition(pen, pen.calculative.singleton.div);
|
|
2911
2926
|
}
|
|
2912
2927
|
/**
|
|
2913
2928
|
* 绘制 rect ，上线后可查看 rect 位置
|
|
@@ -3180,8 +3195,14 @@ export function setChildValue(pen, data) {
|
|
|
3180
3195
|
) {
|
|
3181
3196
|
var children = pen.children;
|
|
3182
3197
|
children === null || children === void 0 ? void 0 : children.forEach(function (childId) {
|
|
3198
|
+
var _data = deepClone(data);
|
|
3199
|
+
if (pen.calculative.childrenVisible) {
|
|
3200
|
+
if (pen.calculative.childrenVisible[childId] === false) {
|
|
3201
|
+
delete _data.visible;
|
|
3202
|
+
}
|
|
3203
|
+
}
|
|
3183
3204
|
var child = pen.calculative.canvas.store.pens[childId];
|
|
3184
|
-
child && setChildValue(child,
|
|
3205
|
+
child && setChildValue(child, _data);
|
|
3185
3206
|
});
|
|
3186
3207
|
}
|
|
3187
3208
|
}
|