@meta2d/core 1.0.66 → 1.0.68
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/index.d.ts +1 -0
- package/index.js +1 -0
- package/index.js.map +1 -1
- package/package.json +1 -1
- package/src/canvas/canvas.js +30 -9
- package/src/canvas/canvas.js.map +1 -1
- package/src/canvas/magnifierCanvas.js +1 -0
- package/src/canvas/magnifierCanvas.js.map +1 -1
- package/src/core.js +98 -14
- package/src/core.js.map +1 -1
- package/src/diagrams/form.d.ts +5 -0
- package/src/diagrams/{panel.js → form.js} +47 -6
- package/src/diagrams/form.js.map +1 -0
- package/src/diagrams/gif.js +30 -19
- package/src/diagrams/gif.js.map +1 -1
- package/src/diagrams/index.d.ts +3 -3
- package/src/diagrams/index.js +3 -3
- package/src/diagrams/index.js.map +1 -1
- package/src/diagrams/line/line.js +2 -1
- package/src/diagrams/line/line.js.map +1 -1
- package/src/event/event.d.ts +1 -1
- package/src/event/event.js.map +1 -1
- package/src/map/map.d.ts +1 -0
- package/src/map/map.js +10 -1
- package/src/map/map.js.map +1 -1
- package/src/pen/model.d.ts +6 -0
- package/src/pen/model.js.map +1 -1
- package/src/pen/render.js +82 -2
- package/src/pen/render.js.map +1 -1
- package/src/theme.d.ts +55 -0
- package/src/theme.js +183 -0
- package/src/theme.js.map +1 -1
- package/src/diagrams/panel.d.ts +0 -2
- package/src/diagrams/panel.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"magnifierCanvas.js","sourceRoot":"","sources":["../../../../packages/core/src/canvas/magnifierCanvas.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,MAAM,OAAO,eAAe;IASjB;IACA;IACA;IAVT,MAAM,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;IAC1C,eAAe,GAAG,eAAe,EAAE,CAAC;IACpC,SAAS,GAAG,eAAe,EAAE,CAAC;IAC9B,YAAY,GAAG,eAAe,EAAE,CAAC;IACzB,aAAa,GAAW,GAAG,CAAC;IACpC,SAAS,CAAU;IAEnB,YACS,YAAoB,EACpB,aAA0B,EAC1B,KAAkB;QAFlB,iBAAY,GAAZ,YAAY,CAAQ;QACpB,kBAAa,GAAb,aAAa,CAAa;QAC1B,UAAK,GAAL,KAAK,CAAa;QAEzB,aAAa,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACvC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,GAAG,WAAW,CAAC;QACjD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,GAAG,WAAW,CAAC;QAC/C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,GAAG,UAAU,CAAC;QACxC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC;QAC5B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,GAAG,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"magnifierCanvas.js","sourceRoot":"","sources":["../../../../packages/core/src/canvas/magnifierCanvas.ts"],"names":[],"mappings":"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"}
|
package/src/core.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { commonAnchors, commonPens, cube } from './diagrams';
|
|
1
|
+
import { commonAnchors, commonPens, cube, reset, updateFormData } from './diagrams';
|
|
2
2
|
import { Canvas } from './canvas';
|
|
3
3
|
import { calcInView, calcTextDrawRect, calcTextLines, calcTextRect, facePen, formatAttrs, getAllChildren, getFromAnchor, getParent, getToAnchor, getWords, LockState, PenType, renderPenRaw, setElemPosition, connectLine, nearestAnchor, setChildValue, isAncestor, isShowChild, CanvasLayer, validationPlugin, setLifeCycleFunc, getAllFollowers, isInteraction, calcWorldAnchors, getGlobalColor, isDomShapes, } from './pen';
|
|
4
4
|
import { rotatePoint } from './point';
|
|
@@ -16,6 +16,7 @@ import { getter } from './utils/object';
|
|
|
16
16
|
import { getCookie, getMeta2dData, queryURLParams } from './utils/url';
|
|
17
17
|
import { HotkeyType } from './data';
|
|
18
18
|
import { Message, messageList } from './message';
|
|
19
|
+
import { le5leTheme } from './theme';
|
|
19
20
|
export class Meta2d {
|
|
20
21
|
store;
|
|
21
22
|
canvas;
|
|
@@ -146,6 +147,8 @@ export class Meta2d {
|
|
|
146
147
|
ruleColor: this.store.theme[theme].ruleColor,
|
|
147
148
|
ruleOptions: this.store.theme[theme].ruleOptions,
|
|
148
149
|
});
|
|
150
|
+
// 更新全局的主题css变量
|
|
151
|
+
le5leTheme.updateCssRule(this.store.id, theme);
|
|
149
152
|
this.render();
|
|
150
153
|
}
|
|
151
154
|
setDatabyOptions(options = {}) {
|
|
@@ -176,6 +179,10 @@ export class Meta2d {
|
|
|
176
179
|
}
|
|
177
180
|
this.resize();
|
|
178
181
|
this.canvas.listen();
|
|
182
|
+
// 创建主题样式表
|
|
183
|
+
if (this.store.data.theme) {
|
|
184
|
+
le5leTheme.createThemeSheet(this.store.data.theme, this.store.id);
|
|
185
|
+
}
|
|
179
186
|
}
|
|
180
187
|
initEventFns() {
|
|
181
188
|
this.events[EventAction.Link] = (pen, e) => {
|
|
@@ -352,7 +359,7 @@ export class Meta2d {
|
|
|
352
359
|
if (e.params && typeof e.params === 'string') {
|
|
353
360
|
let url = e.params;
|
|
354
361
|
if (e.params.includes('${')) {
|
|
355
|
-
let keys = e.params.match(
|
|
362
|
+
let keys = e.params.match(/\$\{([^}]+)\}/g)?.map(m => m.slice(2, -1));
|
|
356
363
|
if (keys) {
|
|
357
364
|
keys?.forEach((key) => {
|
|
358
365
|
url = url.replace(`\${${key}}`, pen[key]);
|
|
@@ -385,7 +392,7 @@ export class Meta2d {
|
|
|
385
392
|
}
|
|
386
393
|
else if (typeof item.value[key] === 'string' &&
|
|
387
394
|
item.value[key]?.indexOf('${') > -1) {
|
|
388
|
-
let keys = item.value[key].match(
|
|
395
|
+
let keys = item.value[key].match(/\$\{([^}]+)\}/g)?.map(m => m.slice(2, -1));
|
|
389
396
|
if (keys?.length) {
|
|
390
397
|
list[index].properties[key] =
|
|
391
398
|
_pen[keys[0]] ?? this.getDynamicParam(keys[0]);
|
|
@@ -418,6 +425,10 @@ export class Meta2d {
|
|
|
418
425
|
if (pen.deviceId) {
|
|
419
426
|
value.deviceId = pen.deviceId;
|
|
420
427
|
}
|
|
428
|
+
if (pen.formId && pen.formData) {
|
|
429
|
+
//表单数据
|
|
430
|
+
Object.assign(value, pen.formData);
|
|
431
|
+
}
|
|
421
432
|
this.sendDataToNetWork(value, pen, e);
|
|
422
433
|
return;
|
|
423
434
|
// }
|
|
@@ -432,7 +443,7 @@ export class Meta2d {
|
|
|
432
443
|
}
|
|
433
444
|
else if (typeof value[key] === 'string' &&
|
|
434
445
|
value[key]?.indexOf('${') > -1) {
|
|
435
|
-
let keys = value[key].match(
|
|
446
|
+
let keys = value[key].match(/\$\{([^}]+)\}/g)?.map(m => m.slice(2, -1));
|
|
436
447
|
if (keys?.length) {
|
|
437
448
|
value[key] = _pen[keys[0]] ?? this.getDynamicParam(keys[0]);
|
|
438
449
|
}
|
|
@@ -494,7 +505,7 @@ export class Meta2d {
|
|
|
494
505
|
}
|
|
495
506
|
else if (typeof item.value[key] === 'string' &&
|
|
496
507
|
item.value[key]?.indexOf('${') > -1) {
|
|
497
|
-
let keys = item.value[key].match(
|
|
508
|
+
let keys = item.value[key].match(/\$\{([^}]+)\}/g)?.map(m => m.slice(2, -1));
|
|
498
509
|
if (keys?.length) {
|
|
499
510
|
value[key] = _pen[keys[0]] ?? this.getDynamicParam(keys[0]);
|
|
500
511
|
}
|
|
@@ -509,7 +520,7 @@ export class Meta2d {
|
|
|
509
520
|
return value;
|
|
510
521
|
}
|
|
511
522
|
else
|
|
512
|
-
return
|
|
523
|
+
return {};
|
|
513
524
|
}
|
|
514
525
|
message(options) {
|
|
515
526
|
const message = new Message(this.canvas.parentElement, options);
|
|
@@ -583,7 +594,7 @@ export class Meta2d {
|
|
|
583
594
|
if (typeof network.headers === 'object') {
|
|
584
595
|
for (let i in network.headers) {
|
|
585
596
|
if (typeof network.headers[i] === 'string') {
|
|
586
|
-
let keys = network.headers[i].match(
|
|
597
|
+
let keys = network.headers[i].match(/\$\{([^}]+)\}/g)?.map(m => m.slice(2, -1));
|
|
587
598
|
if (keys) {
|
|
588
599
|
network.headers[i] = network.headers[i].replace(`\${${keys[0]}}`, this.getDynamicParam(keys[0]));
|
|
589
600
|
}
|
|
@@ -601,7 +612,7 @@ export class Meta2d {
|
|
|
601
612
|
}
|
|
602
613
|
if (network.method === 'POST') {
|
|
603
614
|
if (url.indexOf('${') > -1) {
|
|
604
|
-
let keys = url.match(
|
|
615
|
+
let keys = url.match(/\$\{([^}]+)\}/g)?.map(m => m.slice(2, -1));
|
|
605
616
|
if (keys) {
|
|
606
617
|
keys.forEach((key) => {
|
|
607
618
|
url = url.replace(`\${${key}}`, getter(pen, key) || this.getDynamicParam(key));
|
|
@@ -765,6 +776,10 @@ export class Meta2d {
|
|
|
765
776
|
this.clear(false, data?.template);
|
|
766
777
|
this.canvas.autoPolylineFlag = true;
|
|
767
778
|
if (data) {
|
|
779
|
+
// 根据图纸的主题设置主题
|
|
780
|
+
if (data.theme) {
|
|
781
|
+
this.setTheme(data.theme);
|
|
782
|
+
}
|
|
768
783
|
this.setBackgroundImage(data.bkImage, data);
|
|
769
784
|
Object.assign(this.store.data, data);
|
|
770
785
|
this.store.data.pens = [];
|
|
@@ -2383,7 +2398,7 @@ export class Meta2d {
|
|
|
2383
2398
|
let req = deepClone(_req);
|
|
2384
2399
|
if (req.url) {
|
|
2385
2400
|
if (req.url.indexOf('${') > -1) {
|
|
2386
|
-
let keys = req.url.match(
|
|
2401
|
+
let keys = req.url.match(/\$\{([^}]+)\}/g)?.map(m => m.slice(2, -1));
|
|
2387
2402
|
if (keys) {
|
|
2388
2403
|
keys.forEach((key) => {
|
|
2389
2404
|
req.url = req.url.replace(`\${${key}}`, this.getDynamicParam(key));
|
|
@@ -2393,7 +2408,7 @@ export class Meta2d {
|
|
|
2393
2408
|
if (typeof req.headers === 'object') {
|
|
2394
2409
|
for (let i in req.headers) {
|
|
2395
2410
|
if (typeof req.headers[i] === 'string') {
|
|
2396
|
-
let keys = req.headers[i].match(
|
|
2411
|
+
let keys = req.headers[i].match(/\$\{([^}]+)\}/g)?.map(m => m.slice(2, -1));
|
|
2397
2412
|
if (keys) {
|
|
2398
2413
|
req.headers[i] = req.headers[i].replace(`\${${keys[0]}}`, this.getDynamicParam(keys[0]));
|
|
2399
2414
|
}
|
|
@@ -2403,7 +2418,7 @@ export class Meta2d {
|
|
|
2403
2418
|
if (typeof req.body === 'object') {
|
|
2404
2419
|
for (let i in req.body) {
|
|
2405
2420
|
if (typeof req.body[i] === 'string') {
|
|
2406
|
-
let keys = req.body[i].match(
|
|
2421
|
+
let keys = req.body[i].match(/\$\{([^}]+)\}/g)?.map(m => m.slice(2, -1));
|
|
2407
2422
|
if (keys) {
|
|
2408
2423
|
req.body[i] = req.body[i].replace(`\${${keys[0]}}`, this.getDynamicParam(keys[0]));
|
|
2409
2424
|
}
|
|
@@ -2747,6 +2762,16 @@ export class Meta2d {
|
|
|
2747
2762
|
e.pen.calculative.radialGradient = undefined;
|
|
2748
2763
|
}
|
|
2749
2764
|
}
|
|
2765
|
+
if (e.pen && e.pen.formId) {
|
|
2766
|
+
const formPen = this.store.pens[e.pen.formId];
|
|
2767
|
+
if (e.pen.formType === 'submit') {
|
|
2768
|
+
this.store.data.locked && formPen && !formPen.disabled && this.doEvent(formPen, 'submit');
|
|
2769
|
+
}
|
|
2770
|
+
else if (e.pen.formType === 'reset') {
|
|
2771
|
+
reset(e.pen);
|
|
2772
|
+
this.store.data.locked && formPen && !formPen.disabled && this.doEvent(formPen, 'reset');
|
|
2773
|
+
}
|
|
2774
|
+
}
|
|
2750
2775
|
e.pen &&
|
|
2751
2776
|
e.pen.onClick &&
|
|
2752
2777
|
!e.pen.disabled &&
|
|
@@ -2793,6 +2818,7 @@ export class Meta2d {
|
|
|
2793
2818
|
this.doEvent(e.pen, eventName);
|
|
2794
2819
|
break;
|
|
2795
2820
|
case 'valueUpdate':
|
|
2821
|
+
e && updateFormData(e, e.formValue);
|
|
2796
2822
|
this.store.data.locked && this.doEvent(e, eventName);
|
|
2797
2823
|
this.canvas.tooltip.updateText(e);
|
|
2798
2824
|
break;
|
|
@@ -2816,6 +2842,7 @@ export class Meta2d {
|
|
|
2816
2842
|
this.doEvent(e, eventName);
|
|
2817
2843
|
break;
|
|
2818
2844
|
case 'change':
|
|
2845
|
+
e.pen && updateFormData(e.pen);
|
|
2819
2846
|
this.store.data.locked &&
|
|
2820
2847
|
e &&
|
|
2821
2848
|
!e.disabled &&
|
|
@@ -3413,12 +3440,68 @@ export class Meta2d {
|
|
|
3413
3440
|
console.error('请先加载乐吾乐官网下的canvas2svg.js', 'https://assets.le5lecdn.com/2d/canvas2svg.js');
|
|
3414
3441
|
throw new Error('请先加载乐吾乐官网下的canvas2svg.js');
|
|
3415
3442
|
}
|
|
3443
|
+
let isV = false;
|
|
3444
|
+
const width = this.store.data.width || this.store.options.width;
|
|
3445
|
+
const height = this.store.data.height || this.store.options.height;
|
|
3446
|
+
if (width && height && !this.store.data.component) {
|
|
3447
|
+
isV = true;
|
|
3448
|
+
}
|
|
3416
3449
|
const rect = this.getRect();
|
|
3450
|
+
if (isV) {
|
|
3451
|
+
rect.x = this.store.data.origin.x;
|
|
3452
|
+
rect.y = this.store.data.origin.y;
|
|
3453
|
+
rect.width = width * this.store.data.scale;
|
|
3454
|
+
rect.height = height * this.store.data.scale;
|
|
3455
|
+
}
|
|
3456
|
+
//TODO 不考虑无画布尺寸时背景图片
|
|
3457
|
+
// if(this.store.bkImg&&!isV){
|
|
3458
|
+
// rect.x = rect.x < 0 ? -rect.x : 0;
|
|
3459
|
+
// rect.y = rect.y < 0 ? -rect.y : 0;
|
|
3460
|
+
// rect.width = this.canvas.canvasRect.width;
|
|
3461
|
+
// rect.height = this.canvas.canvasRect.height;
|
|
3462
|
+
// }
|
|
3417
3463
|
rect.x -= 10;
|
|
3418
3464
|
rect.y -= 10;
|
|
3419
3465
|
const ctx = new window.C2S(rect.width + 20, rect.height + 20);
|
|
3420
3466
|
ctx.textBaseline = 'middle';
|
|
3421
3467
|
ctx.strokeStyle = getGlobalColor(this.store);
|
|
3468
|
+
const background = this.store.data.background || this.store.options.background;
|
|
3469
|
+
if (background && isV) {
|
|
3470
|
+
// 绘制背景颜色
|
|
3471
|
+
ctx.save();
|
|
3472
|
+
ctx.fillStyle = background;
|
|
3473
|
+
ctx.fillRect(0, 0, rect.width, rect.height);
|
|
3474
|
+
ctx.restore();
|
|
3475
|
+
}
|
|
3476
|
+
if (this.store.bkImg) {
|
|
3477
|
+
if (isV) {
|
|
3478
|
+
ctx.drawImage(this.store.bkImg, 0, 0, rect.width, rect.height);
|
|
3479
|
+
}
|
|
3480
|
+
else {
|
|
3481
|
+
// const x = rect.x < 0 ? -rect.x : 0;
|
|
3482
|
+
// const y = rect.y < 0 ? -rect.y : 0;
|
|
3483
|
+
// ctx.drawImage(
|
|
3484
|
+
// this.store.bkImg,
|
|
3485
|
+
// x,
|
|
3486
|
+
// y,
|
|
3487
|
+
// this.canvas.canvasRect.width,
|
|
3488
|
+
// this.canvas.canvasRect.height
|
|
3489
|
+
// );
|
|
3490
|
+
}
|
|
3491
|
+
}
|
|
3492
|
+
if (background && !isV) {
|
|
3493
|
+
// 绘制背景颜色
|
|
3494
|
+
ctx.save();
|
|
3495
|
+
ctx.fillStyle = background;
|
|
3496
|
+
ctx.fillRect(0, 0, rect.width + 20, rect.height + 20);
|
|
3497
|
+
ctx.restore();
|
|
3498
|
+
}
|
|
3499
|
+
// if(this.store.bkImg&&!isV){
|
|
3500
|
+
// ctx.translate(
|
|
3501
|
+
// this.store.data.x,
|
|
3502
|
+
// this.store.data.y
|
|
3503
|
+
// );
|
|
3504
|
+
// }
|
|
3422
3505
|
for (const pen of this.store.data.pens) {
|
|
3423
3506
|
if (pen.visible == false || !isShowChild(pen, this.store)) {
|
|
3424
3507
|
continue;
|
|
@@ -4362,7 +4445,7 @@ export class Meta2d {
|
|
|
4362
4445
|
if (this.map && this.map.isShow) {
|
|
4363
4446
|
this.map.show();
|
|
4364
4447
|
}
|
|
4365
|
-
if (this.canvas.scroll && this.canvas.scroll.isShow) {
|
|
4448
|
+
if (this.canvas && this.canvas.scroll && this.canvas.scroll.isShow) {
|
|
4366
4449
|
this.canvas.scroll.resize();
|
|
4367
4450
|
}
|
|
4368
4451
|
}, 500);
|
|
@@ -4412,14 +4495,14 @@ export class Meta2d {
|
|
|
4412
4495
|
* @param pens 本次改变的 pens
|
|
4413
4496
|
*/
|
|
4414
4497
|
initImageCanvas(pens) {
|
|
4415
|
-
this.canvas.initImageCanvas(pens);
|
|
4498
|
+
this.canvas && this.canvas.initImageCanvas(pens);
|
|
4416
4499
|
}
|
|
4417
4500
|
/**
|
|
4418
4501
|
* 模版图元图层改变
|
|
4419
4502
|
* @param pens 本次改变的 pens
|
|
4420
4503
|
*/
|
|
4421
4504
|
initTemplateCanvas(pens) {
|
|
4422
|
-
this.canvas.initTemplateCanvas(pens);
|
|
4505
|
+
this.canvas && this.canvas.initTemplateCanvas(pens);
|
|
4423
4506
|
}
|
|
4424
4507
|
/**
|
|
4425
4508
|
* 该画笔置底，即放到数组最前，最后绘制即在底部
|
|
@@ -5122,6 +5205,7 @@ export class Meta2d {
|
|
|
5122
5205
|
this.closeSocket();
|
|
5123
5206
|
this.closeNetwork();
|
|
5124
5207
|
this.closeAll();
|
|
5208
|
+
le5leTheme.destroyThemeSheet(this.store.id);
|
|
5125
5209
|
this.store.emitter.all.clear(); // 内存释放
|
|
5126
5210
|
this.canvas.destroy();
|
|
5127
5211
|
this.canvas = undefined;
|