@meta2d/core 1.1.3 → 1.1.5
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 +33 -6
- package/src/canvas/canvas.js.map +1 -1
- package/src/core.js +28 -10
- package/src/core.js.map +1 -1
- package/src/diagrams/form.js +55 -12
- package/src/diagrams/form.js.map +1 -1
- package/src/diagrams/index.d.ts +3 -0
- package/src/diagrams/index.js +3 -0
- package/src/diagrams/index.js.map +1 -1
- package/src/diagrams/sceneContainer.d.ts +2 -0
- package/src/diagrams/sceneContainer.js +112 -0
- package/src/diagrams/sceneContainer.js.map +1 -0
- package/src/pen/model.d.ts +1 -0
- package/src/pen/model.js.map +1 -1
- package/src/pen/plugin.js +1 -1
- package/src/pen/plugin.js.map +1 -1
- package/src/pen/render.js +2 -1
- package/src/pen/render.js.map +1 -1
- package/src/store/store.js +2 -1
- package/src/store/store.js.map +1 -1
- package/src/tooltip/tooltip.js +3 -0
- package/src/tooltip/tooltip.js.map +1 -1
- package/src/utils/debounce.d.ts +2 -0
- package/src/utils/debounce.js +28 -0
- package/src/utils/debounce.js.map +1 -0
- package/src/utils/index.d.ts +1 -0
- package/src/utils/index.js +1 -0
- package/src/utils/index.js.map +1 -1
package/src/diagrams/form.js
CHANGED
|
@@ -5,13 +5,13 @@ export function form(pen, ctx) {
|
|
|
5
5
|
const path = !ctx ? new Path2D() : ctx;
|
|
6
6
|
if (!pen.onDestroy) {
|
|
7
7
|
pen.onDestroy = destory;
|
|
8
|
-
pen.onMove = move;
|
|
9
|
-
pen.onRotate = move;
|
|
10
|
-
pen.onMouseEnter = mouseEnter;
|
|
8
|
+
// pen.onMove = move;
|
|
9
|
+
// pen.onRotate = move;
|
|
10
|
+
// pen.onMouseEnter = mouseEnter;
|
|
11
11
|
pen.onMouseLeave = mouseLeave;
|
|
12
|
-
pen.onMouseMove = mouseMove;
|
|
12
|
+
// pen.onMouseMove = mouseMove;
|
|
13
13
|
pen.onMouseUp = mouseUp;
|
|
14
|
-
pen.onInput = input;
|
|
14
|
+
// pen.onInput = input;
|
|
15
15
|
}
|
|
16
16
|
pen.formId = pen.id;
|
|
17
17
|
let wr = pen.calculative.borderRadius || 0, hr = wr;
|
|
@@ -62,7 +62,15 @@ function input(pen, text) {
|
|
|
62
62
|
// this.patchFlags = true;
|
|
63
63
|
// this.store.emitter.emit('valueUpdate', pen);
|
|
64
64
|
}
|
|
65
|
-
function destory(pen) {
|
|
65
|
+
function destory(pen) {
|
|
66
|
+
pen.followers.forEach((id) => {
|
|
67
|
+
let fpen = pen.calculative.canvas.store.pens[id];
|
|
68
|
+
fpen.formKey = undefined;
|
|
69
|
+
fpen.formValue = undefined;
|
|
70
|
+
fpen.formType = undefined;
|
|
71
|
+
fpen.formId = undefined;
|
|
72
|
+
});
|
|
73
|
+
}
|
|
66
74
|
function move(pen) { }
|
|
67
75
|
function mouseEnter(pen) {
|
|
68
76
|
// const activePens = pen.calculative.canvas.store.active;
|
|
@@ -99,6 +107,9 @@ function mouseLeave(pen) {
|
|
|
99
107
|
let isIn = rectInRect(movingPen.calculative.worldRect, pen.calculative.worldRect, true);
|
|
100
108
|
if (!isIn) {
|
|
101
109
|
pen.followers.splice(idx, 1);
|
|
110
|
+
delete activePen.formKey;
|
|
111
|
+
delete activePen.formValue;
|
|
112
|
+
delete activePen.formType;
|
|
102
113
|
delete activePen.formId;
|
|
103
114
|
}
|
|
104
115
|
}
|
|
@@ -111,7 +122,10 @@ function mouseUp(pen) {
|
|
|
111
122
|
const activePens = pen.calculative.canvas.store.active;
|
|
112
123
|
if (activePens && activePens.length) {
|
|
113
124
|
activePens.forEach((activePen) => {
|
|
114
|
-
|
|
125
|
+
let movingPen = pen.calculative.canvas.store.pens[activePen.id + movingSuffix];
|
|
126
|
+
if (!movingPen) {
|
|
127
|
+
movingPen = pen.calculative.canvas.store.pens[activePen.id];
|
|
128
|
+
}
|
|
115
129
|
if (movingPen && movingPen.calculative) {
|
|
116
130
|
let inRect = deepClone(pen.calculative.worldRect);
|
|
117
131
|
inRect.x -= 1;
|
|
@@ -126,6 +140,7 @@ function mouseUp(pen) {
|
|
|
126
140
|
pen.followers.push(activePen.id);
|
|
127
141
|
}
|
|
128
142
|
activePen.formId = pen.id;
|
|
143
|
+
predictFormValue(activePen);
|
|
129
144
|
}
|
|
130
145
|
}
|
|
131
146
|
});
|
|
@@ -148,14 +163,18 @@ export function updateFormData(pen, key) {
|
|
|
148
163
|
}
|
|
149
164
|
}
|
|
150
165
|
//提交表单
|
|
151
|
-
export function submit(pen) {
|
|
152
|
-
}
|
|
166
|
+
export function submit(pen) { }
|
|
153
167
|
//重置表单
|
|
154
168
|
export function reset(pen) {
|
|
155
169
|
const formPen = pen.calculative.canvas.store.pens[pen.formId];
|
|
156
|
-
formPen.followers.forEach((id)
|
|
170
|
+
// formPen.followers.forEach((id:string,index:number)=>{
|
|
171
|
+
for (let i = formPen.followers.length - 1; i >= 0; i--) {
|
|
172
|
+
let id = formPen.followers[i];
|
|
157
173
|
const follower = pen.calculative.canvas.store.pens[id];
|
|
158
|
-
if (follower
|
|
174
|
+
if (follower &&
|
|
175
|
+
follower.formId &&
|
|
176
|
+
follower.formKey &&
|
|
177
|
+
formPen.formData[follower.formKey]) {
|
|
159
178
|
const value = follower[follower.formValue];
|
|
160
179
|
let data = '';
|
|
161
180
|
if (Array.isArray(value)) {
|
|
@@ -165,8 +184,32 @@ export function reset(pen) {
|
|
|
165
184
|
// follower.calculative[follower.formValue] = data;
|
|
166
185
|
pen.calculative.canvas.parent.setValue({ id: follower.id, [follower.formValue]: data }, { render: false, doEvent: false, history: false });
|
|
167
186
|
}
|
|
168
|
-
|
|
187
|
+
if (!follower) {
|
|
188
|
+
formPen.followers.splice(i, 1);
|
|
189
|
+
}
|
|
190
|
+
}
|
|
169
191
|
formPen.formData = {};
|
|
170
192
|
pen.calculative.canvas.parent.render();
|
|
171
193
|
}
|
|
194
|
+
const formValueMap = {
|
|
195
|
+
progress: 'progress',
|
|
196
|
+
cascadeFilterDom: 'checked',
|
|
197
|
+
treeFilterDom: 'checked',
|
|
198
|
+
dateRangePickerDom: 'pickerTimes',
|
|
199
|
+
datePickerDom: 'pickerTimes',
|
|
200
|
+
slider: 'value',
|
|
201
|
+
switch: 'checked',
|
|
202
|
+
inputDom: 'text',
|
|
203
|
+
checkbox: 'selectedKeys',
|
|
204
|
+
radio: 'selectKey',
|
|
205
|
+
rectangle: 'text',
|
|
206
|
+
};
|
|
207
|
+
function predictFormValue(pen) {
|
|
208
|
+
if (pen.name === 'rectangle') {
|
|
209
|
+
if (!pen.input && !pen.dropdownList) {
|
|
210
|
+
return;
|
|
211
|
+
}
|
|
212
|
+
}
|
|
213
|
+
pen.formValue = formValueMap[pen.name];
|
|
214
|
+
}
|
|
172
215
|
//# sourceMappingURL=form.js.map
|
package/src/diagrams/form.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"form.js","sourceRoot":"","sources":["../../../../packages/core/src/diagrams/form.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAGzC,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,MAAM,UAAU,IAAI,CAAC,GAAQ,EAAE,GAA8B;IAC3D,MAAM,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,MAAM,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;IACvC,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;QACnB,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC;QACxB,
|
|
1
|
+
{"version":3,"file":"form.js","sourceRoot":"","sources":["../../../../packages/core/src/diagrams/form.ts"],"names":[],"mappings":"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"}
|
package/src/diagrams/index.d.ts
CHANGED
|
@@ -16,6 +16,7 @@ export * from './line';
|
|
|
16
16
|
export * from './iframe';
|
|
17
17
|
export * from './video';
|
|
18
18
|
export * from './form';
|
|
19
|
+
export * from './sceneContainer';
|
|
19
20
|
import { rectangle } from './rectangle';
|
|
20
21
|
import { circle } from './circle';
|
|
21
22
|
import { svgPath } from './svgPath';
|
|
@@ -36,6 +37,7 @@ import { gif } from './gif';
|
|
|
36
37
|
import { mindNode, mindNodeAnchors } from './mindNode';
|
|
37
38
|
import { mindLine, mindLineAnchors } from './mindLine';
|
|
38
39
|
import { form } from './form';
|
|
40
|
+
import { sceneContainer } from './sceneContainer';
|
|
39
41
|
export declare function commonPens(): {
|
|
40
42
|
rectangle: typeof rectangle;
|
|
41
43
|
square: typeof rectangle;
|
|
@@ -62,6 +64,7 @@ export declare function commonPens(): {
|
|
|
62
64
|
mindNode2: typeof rectangle;
|
|
63
65
|
form: typeof form;
|
|
64
66
|
combine: typeof rectangle;
|
|
67
|
+
sceneContainer: typeof sceneContainer;
|
|
65
68
|
};
|
|
66
69
|
export declare function commonAnchors(): {
|
|
67
70
|
triangle: typeof triangleAnchors;
|
package/src/diagrams/index.js
CHANGED
|
@@ -16,6 +16,7 @@ export * from './line';
|
|
|
16
16
|
export * from './iframe';
|
|
17
17
|
export * from './video';
|
|
18
18
|
export * from './form';
|
|
19
|
+
export * from './sceneContainer';
|
|
19
20
|
import { rectangle, square } from './rectangle';
|
|
20
21
|
import { circle } from './circle';
|
|
21
22
|
import { svgPath } from './svgPath';
|
|
@@ -37,6 +38,7 @@ import { gif } from './gif';
|
|
|
37
38
|
import { mindNode, mindNodeAnchors } from './mindNode';
|
|
38
39
|
import { mindLine, mindLineAnchors } from './mindLine';
|
|
39
40
|
import { form } from './form';
|
|
41
|
+
import { sceneContainer } from './sceneContainer';
|
|
40
42
|
export function commonPens() {
|
|
41
43
|
return {
|
|
42
44
|
rectangle,
|
|
@@ -64,6 +66,7 @@ export function commonPens() {
|
|
|
64
66
|
mindNode2: rectangle,
|
|
65
67
|
form,
|
|
66
68
|
combine: rectangle,
|
|
69
|
+
sceneContainer
|
|
67
70
|
};
|
|
68
71
|
}
|
|
69
72
|
export function commonAnchors() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/core/src/diagrams/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/core/src/diagrams/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,kBAAkB,CAAC;AAEjC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,iCAAiC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,MAAM,UAAU,UAAU;IACxB,OAAO;QACL,SAAS;QACT,MAAM;QACN,MAAM;QACN,OAAO;QACP,OAAO;QACP,QAAQ;QACR,QAAQ;QACR,SAAS;QACT,OAAO;QACP,SAAS;QACT,UAAU;QACV,WAAW;QACX,OAAO;QACP,KAAK;QACL,IAAI;QACJ,MAAM;QACN,IAAI;QACJ,MAAM;QACN,KAAK;QACL,GAAG;QACH,QAAQ;QACR,QAAQ;QACR,SAAS,EAAC,SAAS;QACnB,IAAI;QACJ,OAAO,EAAC,SAAS;QACjB,cAAc;KACf,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,aAAa;IAC3B,OAAO;QACL,QAAQ,EAAE,eAAe;QACzB,QAAQ,EAAE,eAAe;QACzB,SAAS,EAAE,gBAAgB;QAC3B,QAAQ,EAAE,eAAe;QACzB,QAAQ,EAAE,eAAe;KAC1B,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,112 @@
|
|
|
1
|
+
import { getMeta2dData, s8, debounce } from '../utils';
|
|
2
|
+
export function sceneContainer(pen, ctx) {
|
|
3
|
+
if (!pen.onDestroy) {
|
|
4
|
+
pen.onAdd = add;
|
|
5
|
+
pen.onDestroy = destory;
|
|
6
|
+
pen.onMove = move;
|
|
7
|
+
pen.onBeforeValue = beforeValue;
|
|
8
|
+
pen.onMouseDown = onMousedown;
|
|
9
|
+
pen.onMouseUp = onMouseUp;
|
|
10
|
+
}
|
|
11
|
+
const path = !ctx ? new Path2D() : ctx;
|
|
12
|
+
if (path instanceof Path2D)
|
|
13
|
+
return path;
|
|
14
|
+
}
|
|
15
|
+
async function add(pen) {
|
|
16
|
+
if (!pen.sceneId) {
|
|
17
|
+
pen.sceneId = s8();
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
const getContainerPens = async (pen, vId) => {
|
|
21
|
+
const store = pen.calculative.canvas.store;
|
|
22
|
+
const origin = store.data.origin;
|
|
23
|
+
const scale = store.data.scale;
|
|
24
|
+
const _vId = vId || pen.vId;
|
|
25
|
+
const data = await getMeta2dData(store, _vId);
|
|
26
|
+
if (data && data.pens?.length) {
|
|
27
|
+
const c_scale = data.scale;
|
|
28
|
+
const c_origin = data.origin;
|
|
29
|
+
data.pens.forEach((cpen) => {
|
|
30
|
+
if (!cpen.parentId) {
|
|
31
|
+
cpen.width = cpen.width / c_scale;
|
|
32
|
+
cpen.height = cpen.height / c_scale;
|
|
33
|
+
cpen.x = (cpen.x - c_origin.x) / c_scale + (pen.x - origin.x) / scale;
|
|
34
|
+
cpen.y = (cpen.y - c_origin.y) / c_scale + (pen.y - origin.y) / scale;
|
|
35
|
+
}
|
|
36
|
+
if (!cpen.p_sceneId) {
|
|
37
|
+
cpen.p_sceneId = pen.sceneId;
|
|
38
|
+
if (cpen.name !== 'sceneContainer') {
|
|
39
|
+
cpen.p_vId = _vId;
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
});
|
|
43
|
+
const meta2d = pen.calculative.canvas.parent;
|
|
44
|
+
meta2d.addPens(data.pens, false, true);
|
|
45
|
+
}
|
|
46
|
+
moveToLast(pen);
|
|
47
|
+
};
|
|
48
|
+
const deleteContainerPens = (pen) => {
|
|
49
|
+
const meta2d = pen.calculative.canvas.parent;
|
|
50
|
+
let pens = collectContainerPens(pen);
|
|
51
|
+
pens.forEach((cpen) => {
|
|
52
|
+
meta2d.canvas.delForce(cpen);
|
|
53
|
+
});
|
|
54
|
+
meta2d.canvas.canvasTemplate.init();
|
|
55
|
+
meta2d.canvas.canvasImage.init();
|
|
56
|
+
meta2d.canvas.canvasImageBottom.init();
|
|
57
|
+
meta2d.render();
|
|
58
|
+
};
|
|
59
|
+
const collectContainerPens = (pen) => {
|
|
60
|
+
let pens = [];
|
|
61
|
+
const meta2d = pen.calculative.canvas.parent;
|
|
62
|
+
meta2d.store.data.pens.forEach((cpen) => {
|
|
63
|
+
if (cpen.p_sceneId &&
|
|
64
|
+
pen.sceneId &&
|
|
65
|
+
cpen.p_sceneId === pen.sceneId &&
|
|
66
|
+
cpen.id !== pen.id) {
|
|
67
|
+
cpen.calculative.locked = 0;
|
|
68
|
+
cpen.locked = 0;
|
|
69
|
+
pens.push(cpen);
|
|
70
|
+
}
|
|
71
|
+
});
|
|
72
|
+
return pens;
|
|
73
|
+
};
|
|
74
|
+
const translateContainerPens = async (pen) => {
|
|
75
|
+
if (pen.calculative.drag && pen.calculative.active && !(pen.locked > 1)) {
|
|
76
|
+
pen.calculative.drag = false;
|
|
77
|
+
deleteContainerPens(pen);
|
|
78
|
+
getContainerPens(pen);
|
|
79
|
+
}
|
|
80
|
+
};
|
|
81
|
+
function destory(pen) {
|
|
82
|
+
deleteContainerPens(pen);
|
|
83
|
+
}
|
|
84
|
+
function beforeValue(pen, value) {
|
|
85
|
+
if (value.vId) {
|
|
86
|
+
deleteContainerPens(pen);
|
|
87
|
+
getContainerPens(pen, value.vId);
|
|
88
|
+
}
|
|
89
|
+
if (value.x !== undefined || value.y !== undefined) {
|
|
90
|
+
deleteContainerPens(pen);
|
|
91
|
+
getContainerPens(pen);
|
|
92
|
+
}
|
|
93
|
+
return value;
|
|
94
|
+
}
|
|
95
|
+
function move(pen) {
|
|
96
|
+
debounce(translateContainerPens, 500, pen);
|
|
97
|
+
}
|
|
98
|
+
function onMousedown(pen, e) {
|
|
99
|
+
pen.calculative.drag = true;
|
|
100
|
+
}
|
|
101
|
+
function onMouseUp(pen, e) {
|
|
102
|
+
pen.calculative.drag = false;
|
|
103
|
+
}
|
|
104
|
+
function moveToLast(pen) {
|
|
105
|
+
let array = pen.calculative.canvas.store.data.pens;
|
|
106
|
+
let index = array.findIndex((item) => item.id === pen.id);
|
|
107
|
+
if (index < 0 || index >= array.length)
|
|
108
|
+
return array;
|
|
109
|
+
const element = array.splice(index, 1)[0];
|
|
110
|
+
array.push(element);
|
|
111
|
+
}
|
|
112
|
+
//# sourceMappingURL=sceneContainer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sceneContainer.js","sourceRoot":"","sources":["../../../../packages/core/src/diagrams/sceneContainer.ts"],"names":[],"mappings":"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"}
|
package/src/pen/model.d.ts
CHANGED
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;IACb,eAAe;CAChB,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;AAE3E,MAAM,CAAC,MAAM,4BAA4B,GAAI,CAAC,aAAa,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAC,WAAW,EAAE,YAAY,EAAE,YAAY,EAAE,UAAU,EAAC,SAAS,EAAE,WAAW,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;AAoB5M,MAAM,CAAN,IAAY,eAOX;AAPD,WAAY,eAAe;IACzB,yDAAM,CAAA;IACN,uDAAK,CAAA;IACL,mDAAG,CAAA;IACH,uDAAK,CAAA;IACL,+DAAS,CAAA;IACT,yDAAM,CAAA,CAAC,QAAQ;AACjB,CAAC,EAPW,eAAe,KAAf,eAAe,QAO1B;AAED,MAAM,CAAN,IAAY,qBAKX;AALD,WAAY,qBAAqB;IAC/B,mEAAK,CAAA;IACL,iEAAI,CAAA;IACJ,+DAAG,CAAA;IACH,uEAAO,CAAA,CAAC,OAAO;AACjB,CAAC,EALW,qBAAqB,KAArB,qBAAqB,QAKhC;
|
|
1
|
+
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../../packages/core/src/pen/model.ts"],"names":[],"mappings":"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"}
|
package/src/pen/plugin.js
CHANGED
package/src/pen/plugin.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../packages/core/src/pen/plugin.ts"],"names":[],"mappings":"AAAA,qBAAqB;AAIrB;;;;GAIG;AACH,SAAS,mBAAmB;IAC1B,IAAI,OAAO,GAAG,IAAI,CAAC;IACnB,IAAI,UAAU,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../../packages/core/src/pen/plugin.ts"],"names":[],"mappings":"AAAA,qBAAqB;AAIrB;;;;GAIG;AACH,SAAS,mBAAmB;IAC1B,IAAI,OAAO,GAAG,IAAI,CAAC;IACnB,IAAI,UAAU,GAAG,IAAI,OAAO,EAAE,CAAC;IAC/B,OAAO,CAAC,GAAQ,EAAE,SAAS,EAAE,IAAc,EAAE,GAAG,GAAE,KAAK,EAAE,EAAE;QACzD,IAAG,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,EAAC,CAAC;YAC7C,OAAO,GAAG,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAChC,CAAC;aAAK,CAAC;YACL,UAAU,CAAC,GAAG,CAAC,GAAG,EAAC,OAAO,GAAG,IAAI,GAAG,EAAE,CAAC,CAAC;QAC1C,CAAC;QACD,IAAG,OAAO,IAAI,KAAK,UAAU;YAAC,OAAO,GAAE,EAAE;gBACvC,OAAO,CAAC,IAAI,CAAC,6CAA6C,CAAC,CAAC;YAC9D,CAAC,CAAC;QACF,IAAI,WAAW,GAAG,IAAI,GAAG,EAAE,CAAC;QAC5B,IAAI,aAAa,GAAG,IAAI,GAAG,EAAE,CAAC,CAAC,YAAY;QAC3C,IAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,EAAC,CAAC;YACnD,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACvC,CAAC;aAAK,CAAC;YACL,aAAa,CAAC,GAAG,CAAC,SAAS,EAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;YAC5C,OAAO,CAAC,GAAG,CAAC,SAAS,EAAC,WAAW,CAAC,CAAC;QACrC,CAAC;QACD,IAAG,GAAG,EAAC,CAAC;YACN,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC3B,CAAC;aAAK,CAAC;YACL,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACxB,CAAC;QACD,IAAI,eAAe,GAAG,aAAa,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ;QAC5D,IAAI,WAAW,GAAG,CAAC,GAAG,IAAI,EAAC,EAAE;YAC3B,eAAe,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;YAC3B,WAAW,CAAC,OAAO,CAAC,CAAC,CAAA,EAAE;gBACrB,aAAa;gBACb,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;YACb,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;QACF,GAAG,CAAC,SAAS,CAAC,GAAG,WAAW,CAAC;IAC/B,CAAC,CAAC;AACJ,CAAC;AACD,MAAM,CAAC,IAAI,gBAAgB,GAAG,mBAAmB,EAAE,CAAC;AAEpD;sBACsB;AACtB,MAAM,UAAU,gBAAgB,CAAC,MAAM;IACrC,cAAc;IACd,IAAG,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,EAAC,CAAC;QAClC,OAAO,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;QAC3D,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAQ,IAAI,CAAC;AACf,CAAC"}
|
package/src/pen/render.js
CHANGED
|
@@ -775,7 +775,8 @@ function drawText(ctx, pen) {
|
|
|
775
775
|
const { fontStyle, fontWeight, fontSize, fontFamily, lineHeight, text, hiddenText, canvas, textHasShadow, textBackground, textType, } = pen.calculative;
|
|
776
776
|
if (pen.input &&
|
|
777
777
|
!pen.text &&
|
|
778
|
-
!(pen.calculative.canvas.inputDiv.dataset.penId === pen.id)
|
|
778
|
+
!(pen.calculative.canvas.inputDiv.dataset.penId === pen.id) &&
|
|
779
|
+
!pen.onShowInput) {
|
|
779
780
|
ctx.save();
|
|
780
781
|
ctx.font = getFont({
|
|
781
782
|
fontStyle,
|