@meta2d/core 1.0.70 → 1.0.72
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 +6 -5
- package/src/canvas/canvas.js.map +1 -1
- package/src/core.d.ts +12 -3
- package/src/core.js +253 -141
- package/src/core.js.map +1 -1
- package/src/diagrams/rectangle.js +29 -0
- package/src/diagrams/rectangle.js.map +1 -1
- package/src/dialog/dialog.js +9 -1
- package/src/dialog/dialog.js.map +1 -1
- package/src/event/event.d.ts +2 -0
- package/src/message/message.d.ts +2 -0
- package/src/message/message.js +6 -4
- package/src/message/message.js.map +1 -1
- package/src/pen/model.d.ts +5 -0
- package/src/pen/model.js.map +1 -1
- package/src/pen/render.js +46 -5
- package/src/pen/render.js.map +1 -1
- package/src/pen/text.js +15 -6
- package/src/pen/text.js.map +1 -1
- package/src/store/store.d.ts +33 -2
- package/src/store/store.js.map +1 -1
- package/src/theme.d.ts +9 -0
- package/src/theme.js +116 -28
- package/src/theme.js.map +1 -1
- package/src/utils/jetLinks.d.ts +9 -0
- package/src/utils/jetLinks.js +200 -0
- package/src/utils/jetLinks.js.map +1 -0
- package/src/utils/url.js +6 -0
- package/src/utils/url.js.map +1 -1
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
export function rectangle(pen, ctx) {
|
|
2
2
|
const path = !ctx ? new Path2D() : ctx;
|
|
3
|
+
if (!pen.setTheme) {
|
|
4
|
+
pen.setTheme = setTheme;
|
|
5
|
+
}
|
|
3
6
|
let wr = pen.calculative.borderRadius || 0, hr = wr;
|
|
4
7
|
const { x, y, width, height, ex, ey } = pen.calculative.worldRect;
|
|
5
8
|
if (wr < 1) {
|
|
@@ -23,5 +26,31 @@ export function rectangle(pen, ctx) {
|
|
|
23
26
|
return path;
|
|
24
27
|
}
|
|
25
28
|
}
|
|
29
|
+
function setTheme(pen, styles) {
|
|
30
|
+
if (!pen.affectByTheme) {
|
|
31
|
+
return;
|
|
32
|
+
}
|
|
33
|
+
for (const key in styles) {
|
|
34
|
+
if (Object.prototype.hasOwnProperty.call(styles, key)) {
|
|
35
|
+
const element = styles[key];
|
|
36
|
+
if (pen.hasOwnProperty(key)) {
|
|
37
|
+
pen[key] = element;
|
|
38
|
+
}
|
|
39
|
+
if (pen.calculative.hasOwnProperty(key)) {
|
|
40
|
+
pen.calculative[key] = element;
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
pen.hoverTextColor = styles["textPrimaryColor"];
|
|
45
|
+
pen.iconColor = styles["buttonBg"];
|
|
46
|
+
pen.calculative.iconColor = styles["buttonBg"];
|
|
47
|
+
// 很多input表单，全局消息都是复用的rectangle，这里的设置会互相影响，暂时不知如何区分
|
|
48
|
+
pen.hoverBackground = styles["formBg"];
|
|
49
|
+
pen.activeBackground = styles["activeBg"];
|
|
50
|
+
pen.color = styles["borderColor"];
|
|
51
|
+
pen.calculative.color = styles["borderColor"];
|
|
52
|
+
pen.textColor = styles["textColor"];
|
|
53
|
+
pen.calculative.textColor = styles["textColor"];
|
|
54
|
+
}
|
|
26
55
|
export const square = rectangle;
|
|
27
56
|
//# sourceMappingURL=rectangle.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rectangle.js","sourceRoot":"","sources":["../../../../packages/core/src/diagrams/rectangle.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,SAAS,CAAC,GAAQ,EAAE,GAA8B;IAChE,MAAM,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,MAAM,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;IACvC,IAAI,EAAE,GAAG,GAAG,CAAC,WAAW,CAAC,YAAY,IAAI,CAAC,EACxC,EAAE,GAAG,EAAE,CAAC;IACV,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,GAAG,CAAC,WAAW,CAAC,SAAS,CAAC;IAClE,IAAI,EAAE,GAAG,CAAC,EAAE,CAAC;QACX,EAAE,GAAG,KAAK,GAAG,EAAE,CAAC;QAChB,EAAE,GAAG,MAAM,GAAG,EAAE,CAAC;IACnB,CAAC;IACD,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC1B,IAAI,KAAK,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;QAClB,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC;IAChB,CAAC;IACD,IAAI,MAAM,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;QACnB,CAAC,GAAG,MAAM,GAAG,CAAC,CAAC;IACjB,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IACtB,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;IAC7B,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;IAC7B,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAC3B,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAC3B,IAAI,CAAC,SAAS,EAAE,CAAC;IACjB,IAAI,IAAI,YAAY,MAAM,EAAE,CAAC;QAC3B,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AACD,MAAM,CAAC,MAAM,MAAM,GAAG,SAAS,CAAC"}
|
|
1
|
+
{"version":3,"file":"rectangle.js","sourceRoot":"","sources":["../../../../packages/core/src/diagrams/rectangle.ts"],"names":[],"mappings":"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"}
|
package/src/dialog/dialog.js
CHANGED
|
@@ -114,7 +114,11 @@ export class Dialog {
|
|
|
114
114
|
color: #617b91;
|
|
115
115
|
position: absolute;
|
|
116
116
|
right:20px;
|
|
117
|
-
top:
|
|
117
|
+
top:2px;
|
|
118
|
+
}`);
|
|
119
|
+
sheet.insertRule(`.meta2d-dialog-close svg{
|
|
120
|
+
width: 18px;
|
|
121
|
+
height: 18px;
|
|
118
122
|
}`);
|
|
119
123
|
sheet.insertRule(`.meta2d-dialog-close :hover{
|
|
120
124
|
cursor: pointer;
|
|
@@ -157,11 +161,15 @@ export class Dialog {
|
|
|
157
161
|
this.title.style.display = 'none';
|
|
158
162
|
this.body.style.height = '100%';
|
|
159
163
|
this.body.style.overflow = 'hidden';
|
|
164
|
+
this.close.style.top = '18px';
|
|
165
|
+
this.close.style.right = '20px';
|
|
160
166
|
}
|
|
161
167
|
else {
|
|
162
168
|
this.dialog.style.padding = '16px 20px';
|
|
163
169
|
this.title.style.display = 'block';
|
|
164
170
|
this.body.style.height = 'calc(100% - 26px)';
|
|
171
|
+
this.close.style.top = '2px';
|
|
172
|
+
this.close.style.right = '2px';
|
|
165
173
|
}
|
|
166
174
|
if (rect) {
|
|
167
175
|
this.dialog.style.width = rect.width ? (rect.width + 'px') : '80%';
|
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":"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
|
|
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
package/src/message/message.d.ts
CHANGED
|
@@ -6,6 +6,7 @@ export interface MessageOptions {
|
|
|
6
6
|
placement?: string;
|
|
7
7
|
duration?: number;
|
|
8
8
|
closeBtn?: boolean;
|
|
9
|
+
height?: number;
|
|
9
10
|
}
|
|
10
11
|
export declare const messageList: {
|
|
11
12
|
[key: string]: Message;
|
|
@@ -20,6 +21,7 @@ export declare class Message {
|
|
|
20
21
|
content: string;
|
|
21
22
|
theme: Theme;
|
|
22
23
|
placement: string;
|
|
24
|
+
height: number;
|
|
23
25
|
id: string;
|
|
24
26
|
constructor(parentElement: HTMLElement, options: MessageOptions);
|
|
25
27
|
init(): void;
|
package/src/message/message.js
CHANGED
|
@@ -32,6 +32,7 @@ export class Message {
|
|
|
32
32
|
content;
|
|
33
33
|
theme; //主题
|
|
34
34
|
placement; //位置
|
|
35
|
+
height;
|
|
35
36
|
id;
|
|
36
37
|
constructor(parentElement, options) {
|
|
37
38
|
this.parentElement = parentElement;
|
|
@@ -98,6 +99,7 @@ export class Message {
|
|
|
98
99
|
this.duration = options.duration ?? 3000;
|
|
99
100
|
this.placement = options.placement || 'top';
|
|
100
101
|
this.theme = options.theme || 'info';
|
|
102
|
+
this.height = options.height;
|
|
101
103
|
// this.init();
|
|
102
104
|
}
|
|
103
105
|
init() {
|
|
@@ -120,19 +122,19 @@ export class Message {
|
|
|
120
122
|
setPosition(placement, index = 0) {
|
|
121
123
|
switch (placement) {
|
|
122
124
|
case 'top':
|
|
123
|
-
this.box.style.top = `${30 + index * 60}px`;
|
|
125
|
+
this.box.style.top = `${30 + index * (this.height || 60)}px`;
|
|
124
126
|
this.box.style.left = '50%';
|
|
125
127
|
break;
|
|
126
128
|
case 'bottom':
|
|
127
|
-
this.box.style.bottom = `${30 + index * 60}px`;
|
|
129
|
+
this.box.style.bottom = `${30 + index * (this.height || 60)}px`;
|
|
128
130
|
this.box.style.left = '50%';
|
|
129
131
|
break;
|
|
130
132
|
case 'left':
|
|
131
|
-
this.box.style.top = `${30 + index * 60}px`;
|
|
133
|
+
this.box.style.top = `${30 + index * (this.height || 60)}px`;
|
|
132
134
|
this.box.style.left = '30px';
|
|
133
135
|
break;
|
|
134
136
|
case 'right':
|
|
135
|
-
this.box.style.top = `${30 + index * 60}px`;
|
|
137
|
+
this.box.style.top = `${30 + index * (this.height || 60)}px`;
|
|
136
138
|
this.box.style.right = '30px';
|
|
137
139
|
break;
|
|
138
140
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message.js","sourceRoot":"","sources":["../../../../packages/core/src/message/message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,UAAU,CAAC;AAE9B,MAAM,MAAM,GAAG;IACb,OAAO,EAAE;QACP,KAAK,EAAE,SAAS;QAChB,IAAI,EAAE,4JAA4J;KACnK;IACD,IAAI,EAAE;QACJ,KAAK,EAAE,SAAS;QAChB,IAAI,EAAE,yIAAyI;KAChJ;IACD,OAAO,EAAE;QACP,KAAK,EAAE,SAAS;QAChB,IAAI,EAAE,uIAAuI;KAC9I;IACD,KAAK,EAAE;QACL,KAAK,EAAE,SAAS;QAChB,IAAI,EAAE,uIAAuI;KAC9I;IACD,QAAQ,EAAE;QACR,KAAK,EAAE,SAAS;QAChB,IAAI,EAAE,+SAA+S;KACtT;CACF,CAAC;
|
|
1
|
+
{"version":3,"file":"message.js","sourceRoot":"","sources":["../../../../packages/core/src/message/message.ts"],"names":[],"mappings":"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"}
|
package/src/pen/model.d.ts
CHANGED
|
@@ -226,6 +226,7 @@ export interface Pen extends Rect {
|
|
|
226
226
|
progressGradientColors?: string;
|
|
227
227
|
externElement?: boolean;
|
|
228
228
|
autoPolyline?: boolean;
|
|
229
|
+
affectByTheme?: boolean;
|
|
229
230
|
flipX?: boolean;
|
|
230
231
|
flipY?: boolean;
|
|
231
232
|
fillTexts?: string[];
|
|
@@ -269,6 +270,7 @@ export interface Pen extends Rect {
|
|
|
269
270
|
apiHeaders?: any;
|
|
270
271
|
apiBody?: any;
|
|
271
272
|
apiEnable?: boolean;
|
|
273
|
+
sql?: string;
|
|
272
274
|
container?: boolean;
|
|
273
275
|
disabled?: boolean;
|
|
274
276
|
disabledColor?: string;
|
|
@@ -289,6 +291,8 @@ export interface Pen extends Rect {
|
|
|
289
291
|
formKey?: string;
|
|
290
292
|
formValue?: string;
|
|
291
293
|
formType?: string;
|
|
294
|
+
className?: string;
|
|
295
|
+
styles?: any;
|
|
292
296
|
calculative?: {
|
|
293
297
|
x?: number;
|
|
294
298
|
y?: number;
|
|
@@ -490,6 +494,7 @@ export interface Pen extends Rect {
|
|
|
490
494
|
onKeyDown?: (pen: Pen, key: string) => void;
|
|
491
495
|
onWheel?: (pen: Pen, e: WheelEvent) => void;
|
|
492
496
|
onContextmenu?: (pen: Pen, e: Point) => void;
|
|
497
|
+
setTheme?: (pen: Pen, styles: any) => void;
|
|
493
498
|
onConnectLine?: (line: Pen, e: {
|
|
494
499
|
lineAnchor: Point;
|
|
495
500
|
fromAnchor: Point;
|
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;CACd,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;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
|
@@ -730,7 +730,16 @@ export function drawImage(ctx, pen) {
|
|
|
730
730
|
ctx.restore();
|
|
731
731
|
}
|
|
732
732
|
else {
|
|
733
|
-
|
|
733
|
+
let _y = y;
|
|
734
|
+
let offsety = 0;
|
|
735
|
+
if (pen.thumbImg) {
|
|
736
|
+
// 缩略图 宽度充满 高度居中绘制
|
|
737
|
+
let _width = img.naturalWidth;
|
|
738
|
+
let _height = img.naturalHeight;
|
|
739
|
+
offsety = (height / width * _width - _height) / 2;
|
|
740
|
+
_y = y + offsety;
|
|
741
|
+
}
|
|
742
|
+
ctx.drawImage(img, x, _y, width, height - 2 * offsety);
|
|
734
743
|
}
|
|
735
744
|
}
|
|
736
745
|
/**
|
|
@@ -2483,6 +2492,7 @@ export function setNodeAnimateProcess(pen, process) {
|
|
|
2483
2492
|
process = 1;
|
|
2484
2493
|
}
|
|
2485
2494
|
const frame = pen.frames[pen.calculative.frameIndex];
|
|
2495
|
+
const scale = pen.calculative.canvas.store.data.scale;
|
|
2486
2496
|
for (const k in frame) {
|
|
2487
2497
|
if (k === 'duration') {
|
|
2488
2498
|
continue;
|
|
@@ -2495,7 +2505,7 @@ export function setNodeAnimateProcess(pen, process) {
|
|
|
2495
2505
|
pen.calculative.patchFlags = true;
|
|
2496
2506
|
}
|
|
2497
2507
|
else if (k === 'x') {
|
|
2498
|
-
const lastVal = getFrameValue(pen, k, pen.calculative.frameIndex);
|
|
2508
|
+
const lastVal = getFrameValue(pen, k, pen.calculative.frameIndex) * scale;
|
|
2499
2509
|
pen.calculative.worldRect.x = pen.calculative.initRect.x + lastVal;
|
|
2500
2510
|
pen.calculative.worldRect.ex = pen.calculative.initRect.ex + lastVal;
|
|
2501
2511
|
pen.calculative.worldRect.center.x = pen.calculative.initRect.center.x + lastVal;
|
|
@@ -2503,11 +2513,11 @@ export function setNodeAnimateProcess(pen, process) {
|
|
|
2503
2513
|
pen.calculative.worldRect.pivot.x =
|
|
2504
2514
|
pen.calculative.initRect.pivot?.x + lastVal;
|
|
2505
2515
|
}
|
|
2506
|
-
translateRect(pen.calculative.worldRect, frame[k] * process *
|
|
2516
|
+
translateRect(pen.calculative.worldRect, frame[k] * process * scale, 0);
|
|
2507
2517
|
pen.calculative.patchFlags = true;
|
|
2508
2518
|
}
|
|
2509
2519
|
else if (k === 'y') {
|
|
2510
|
-
const lastVal = getFrameValue(pen, k, pen.calculative.frameIndex);
|
|
2520
|
+
const lastVal = getFrameValue(pen, k, pen.calculative.frameIndex) * scale;
|
|
2511
2521
|
pen.calculative.worldRect.y = pen.calculative.initRect.y + lastVal;
|
|
2512
2522
|
pen.calculative.worldRect.ey = pen.calculative.initRect.ey + lastVal;
|
|
2513
2523
|
pen.calculative.worldRect.center.y =
|
|
@@ -2516,7 +2526,30 @@ export function setNodeAnimateProcess(pen, process) {
|
|
|
2516
2526
|
pen.calculative.worldRect.pivot.y =
|
|
2517
2527
|
pen.calculative.initRect.pivot?.y + lastVal;
|
|
2518
2528
|
}
|
|
2519
|
-
translateRect(pen.calculative.worldRect, 0, frame[k] * process *
|
|
2529
|
+
translateRect(pen.calculative.worldRect, 0, frame[k] * process * scale);
|
|
2530
|
+
pen.calculative.patchFlags = true;
|
|
2531
|
+
}
|
|
2532
|
+
else if (k === 'width') {
|
|
2533
|
+
//仅考虑抽屉效果
|
|
2534
|
+
const lastVal = getFrameValue(pen, k, pen.calculative.frameIndex) * scale;
|
|
2535
|
+
pen.calculative.worldRect.width = pen.calculative.initRect.width + lastVal;
|
|
2536
|
+
pen.calculative.worldRect.ex = pen.calculative.initRect.ex + lastVal;
|
|
2537
|
+
pen.calculative.worldRect.center.x = pen.calculative.initRect.center.x + lastVal;
|
|
2538
|
+
let value = frame[k] * process * scale;
|
|
2539
|
+
pen.calculative.worldRect.width += value;
|
|
2540
|
+
pen.calculative.worldRect.ex += value;
|
|
2541
|
+
pen.calculative.worldRect.center.x += value;
|
|
2542
|
+
pen.calculative.patchFlags = true;
|
|
2543
|
+
}
|
|
2544
|
+
else if (k === 'height') {
|
|
2545
|
+
const lastVal = getFrameValue(pen, k, pen.calculative.frameIndex) * scale;
|
|
2546
|
+
pen.calculative.worldRect.height = pen.calculative.initRect.height + lastVal;
|
|
2547
|
+
pen.calculative.worldRect.ey = pen.calculative.initRect.ey + lastVal;
|
|
2548
|
+
pen.calculative.worldRect.center.y = pen.calculative.initRect.center.y + lastVal;
|
|
2549
|
+
let value = frame[k] * process * scale;
|
|
2550
|
+
pen.calculative.worldRect.height += value;
|
|
2551
|
+
pen.calculative.worldRect.ey += value;
|
|
2552
|
+
pen.calculative.worldRect.center.y += value;
|
|
2520
2553
|
pen.calculative.patchFlags = true;
|
|
2521
2554
|
}
|
|
2522
2555
|
else if (k === 'rotate') {
|
|
@@ -2723,6 +2756,14 @@ export function setElemPosition(pen, elem) {
|
|
|
2723
2756
|
elem.style.userSelect = 'none';
|
|
2724
2757
|
elem.style.pointerEvents = 'none';
|
|
2725
2758
|
}
|
|
2759
|
+
if (pen.className) {
|
|
2760
|
+
elem.className = pen.className;
|
|
2761
|
+
}
|
|
2762
|
+
if (pen.styles) {
|
|
2763
|
+
for (let key in pen.styles) {
|
|
2764
|
+
elem.style[key] = pen.styles[key];
|
|
2765
|
+
}
|
|
2766
|
+
}
|
|
2726
2767
|
}
|
|
2727
2768
|
export function setElemImg(pen, elem) {
|
|
2728
2769
|
if (!elem) {
|