@meta2d/core 1.0.66 → 1.0.67
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 +23 -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 +64 -3
- package/src/core.js.map +1 -1
- package/src/diagrams/line/line.js +2 -1
- package/src/diagrams/line/line.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 +1 -0
- package/src/pen/model.js.map +1 -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
|
@@ -147,6 +147,11 @@ export class Meta2d {
|
|
|
147
147
|
ruleOptions: this.store.theme[theme].ruleOptions,
|
|
148
148
|
});
|
|
149
149
|
this.render();
|
|
150
|
+
// 更新pen的主题
|
|
151
|
+
for (let i = 0; i < this.store.data.pens.length; i++) {
|
|
152
|
+
const pen = this.store.data.pens[i];
|
|
153
|
+
pen.onSetTheme?.(theme, this.store.theme[theme]);
|
|
154
|
+
}
|
|
150
155
|
}
|
|
151
156
|
setDatabyOptions(options = {}) {
|
|
152
157
|
const { color, activeColor, activeBackground, grid, gridColor, gridSize, fromArrow, toArrow, rule, ruleColor, textColor, x = 0, y = 0, } = options;
|
|
@@ -3413,12 +3418,68 @@ export class Meta2d {
|
|
|
3413
3418
|
console.error('请先加载乐吾乐官网下的canvas2svg.js', 'https://assets.le5lecdn.com/2d/canvas2svg.js');
|
|
3414
3419
|
throw new Error('请先加载乐吾乐官网下的canvas2svg.js');
|
|
3415
3420
|
}
|
|
3421
|
+
let isV = false;
|
|
3422
|
+
const width = this.store.data.width || this.store.options.width;
|
|
3423
|
+
const height = this.store.data.height || this.store.options.height;
|
|
3424
|
+
if (width && height && !this.store.data.component) {
|
|
3425
|
+
isV = true;
|
|
3426
|
+
}
|
|
3416
3427
|
const rect = this.getRect();
|
|
3428
|
+
if (isV) {
|
|
3429
|
+
rect.x = this.store.data.origin.x;
|
|
3430
|
+
rect.y = this.store.data.origin.y;
|
|
3431
|
+
rect.width = width * this.store.data.scale;
|
|
3432
|
+
rect.height = height * this.store.data.scale;
|
|
3433
|
+
}
|
|
3434
|
+
//TODO 不考虑无画布尺寸时背景图片
|
|
3435
|
+
// if(this.store.bkImg&&!isV){
|
|
3436
|
+
// rect.x = rect.x < 0 ? -rect.x : 0;
|
|
3437
|
+
// rect.y = rect.y < 0 ? -rect.y : 0;
|
|
3438
|
+
// rect.width = this.canvas.canvasRect.width;
|
|
3439
|
+
// rect.height = this.canvas.canvasRect.height;
|
|
3440
|
+
// }
|
|
3417
3441
|
rect.x -= 10;
|
|
3418
3442
|
rect.y -= 10;
|
|
3419
3443
|
const ctx = new window.C2S(rect.width + 20, rect.height + 20);
|
|
3420
3444
|
ctx.textBaseline = 'middle';
|
|
3421
3445
|
ctx.strokeStyle = getGlobalColor(this.store);
|
|
3446
|
+
const background = this.store.data.background || this.store.options.background;
|
|
3447
|
+
if (background && isV) {
|
|
3448
|
+
// 绘制背景颜色
|
|
3449
|
+
ctx.save();
|
|
3450
|
+
ctx.fillStyle = background;
|
|
3451
|
+
ctx.fillRect(0, 0, rect.width, rect.height);
|
|
3452
|
+
ctx.restore();
|
|
3453
|
+
}
|
|
3454
|
+
if (this.store.bkImg) {
|
|
3455
|
+
if (isV) {
|
|
3456
|
+
ctx.drawImage(this.store.bkImg, 0, 0, rect.width, rect.height);
|
|
3457
|
+
}
|
|
3458
|
+
else {
|
|
3459
|
+
// const x = rect.x < 0 ? -rect.x : 0;
|
|
3460
|
+
// const y = rect.y < 0 ? -rect.y : 0;
|
|
3461
|
+
// ctx.drawImage(
|
|
3462
|
+
// this.store.bkImg,
|
|
3463
|
+
// x,
|
|
3464
|
+
// y,
|
|
3465
|
+
// this.canvas.canvasRect.width,
|
|
3466
|
+
// this.canvas.canvasRect.height
|
|
3467
|
+
// );
|
|
3468
|
+
}
|
|
3469
|
+
}
|
|
3470
|
+
if (background && !isV) {
|
|
3471
|
+
// 绘制背景颜色
|
|
3472
|
+
ctx.save();
|
|
3473
|
+
ctx.fillStyle = background;
|
|
3474
|
+
ctx.fillRect(0, 0, rect.width + 20, rect.height + 20);
|
|
3475
|
+
ctx.restore();
|
|
3476
|
+
}
|
|
3477
|
+
// if(this.store.bkImg&&!isV){
|
|
3478
|
+
// ctx.translate(
|
|
3479
|
+
// this.store.data.x,
|
|
3480
|
+
// this.store.data.y
|
|
3481
|
+
// );
|
|
3482
|
+
// }
|
|
3422
3483
|
for (const pen of this.store.data.pens) {
|
|
3423
3484
|
if (pen.visible == false || !isShowChild(pen, this.store)) {
|
|
3424
3485
|
continue;
|
|
@@ -4362,7 +4423,7 @@ export class Meta2d {
|
|
|
4362
4423
|
if (this.map && this.map.isShow) {
|
|
4363
4424
|
this.map.show();
|
|
4364
4425
|
}
|
|
4365
|
-
if (this.canvas.scroll && this.canvas.scroll.isShow) {
|
|
4426
|
+
if (this.canvas && this.canvas.scroll && this.canvas.scroll.isShow) {
|
|
4366
4427
|
this.canvas.scroll.resize();
|
|
4367
4428
|
}
|
|
4368
4429
|
}, 500);
|
|
@@ -4412,14 +4473,14 @@ export class Meta2d {
|
|
|
4412
4473
|
* @param pens 本次改变的 pens
|
|
4413
4474
|
*/
|
|
4414
4475
|
initImageCanvas(pens) {
|
|
4415
|
-
this.canvas.initImageCanvas(pens);
|
|
4476
|
+
this.canvas && this.canvas.initImageCanvas(pens);
|
|
4416
4477
|
}
|
|
4417
4478
|
/**
|
|
4418
4479
|
* 模版图元图层改变
|
|
4419
4480
|
* @param pens 本次改变的 pens
|
|
4420
4481
|
*/
|
|
4421
4482
|
initTemplateCanvas(pens) {
|
|
4422
|
-
this.canvas.initTemplateCanvas(pens);
|
|
4483
|
+
this.canvas && this.canvas.initTemplateCanvas(pens);
|
|
4423
4484
|
}
|
|
4424
4485
|
/**
|
|
4425
4486
|
* 该画笔置底，即放到数组最前，最后绘制即在底部
|