@meta2d/core 1.0.35 → 1.0.36
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 +92 -23
- package/src/canvas/canvas.js.map +1 -1
- package/src/canvas/canvasImage.js +10 -5
- package/src/canvas/canvasImage.js.map +1 -1
- package/src/canvas/canvasTemplate.js +12 -8
- package/src/canvas/canvasTemplate.js.map +1 -1
- package/src/core.js +28 -13
- package/src/core.js.map +1 -1
- package/src/diagrams/iframe.js +8 -9
- package/src/diagrams/iframe.js.map +1 -1
- package/src/diagrams/line/polyline.js +14 -0
- package/src/diagrams/line/polyline.js.map +1 -1
- package/src/pen/model.d.ts +17 -0
- package/src/pen/model.js +8 -0
- package/src/pen/model.js.map +1 -1
- package/src/pen/render.js +15 -5
- package/src/pen/render.js.map +1 -1
- package/src/store/store.js +3 -1
- package/src/store/store.js.map +1 -1
- package/src/utils/clone.js +3 -0
- package/src/utils/clone.js.map +1 -1
|
@@ -9,7 +9,7 @@ var __values = (this && this.__values) || function(o) {
|
|
|
9
9
|
};
|
|
10
10
|
throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
|
|
11
11
|
};
|
|
12
|
-
import { ctxFlip, ctxRotate, drawImage, setGlobalAlpha, getParent, } from '../pen';
|
|
12
|
+
import { ctxFlip, ctxRotate, drawImage, setGlobalAlpha, getParent, CanvasLayer, } from '../pen';
|
|
13
13
|
import { rgba } from '../utils';
|
|
14
14
|
import { createOffscreen } from './offscreen';
|
|
15
15
|
var CanvasImage = /** @class */ (function () {
|
|
@@ -105,7 +105,9 @@ var CanvasImage = /** @class */ (function () {
|
|
|
105
105
|
pen.calculative.hasImage =
|
|
106
106
|
pen.calculative &&
|
|
107
107
|
pen.calculative.inView &&
|
|
108
|
-
!pen.isBottom == !this.isBottom && // undefined == false 结果 false
|
|
108
|
+
// !pen.isBottom == !this.isBottom && // undefined == false 结果 false
|
|
109
|
+
((this.isBottom && pen.canvasLayer === CanvasLayer.CanvasImageBottom) ||
|
|
110
|
+
(!this.isBottom && pen.canvasLayer === CanvasLayer.CanvasImage)) &&
|
|
109
111
|
pen.image &&
|
|
110
112
|
pen.calculative.img &&
|
|
111
113
|
pen.name !== 'gif';
|
|
@@ -203,7 +205,8 @@ var CanvasImage = /** @class */ (function () {
|
|
|
203
205
|
this.store.animates.has(getParent(pen, true))) {
|
|
204
206
|
continue;
|
|
205
207
|
}
|
|
206
|
-
if (pen.template) {
|
|
208
|
+
// if (pen.template) {
|
|
209
|
+
if (pen.canvasLayer === CanvasLayer.CanvasTemplate) {
|
|
207
210
|
continue;
|
|
208
211
|
}
|
|
209
212
|
pen.calculative.imageDrawed = true;
|
|
@@ -237,7 +240,8 @@ var CanvasImage = /** @class */ (function () {
|
|
|
237
240
|
if (!pen.calculative.hasImage) {
|
|
238
241
|
continue;
|
|
239
242
|
}
|
|
240
|
-
if (pen.template) {
|
|
243
|
+
// if (pen.template) {
|
|
244
|
+
if (pen.canvasLayer === CanvasLayer.CanvasTemplate) {
|
|
241
245
|
continue;
|
|
242
246
|
}
|
|
243
247
|
pen.calculative.imageDrawed = true;
|
|
@@ -265,7 +269,8 @@ var CanvasImage = /** @class */ (function () {
|
|
|
265
269
|
if (!pen.calculative.hasImage || !pen.parentId) {
|
|
266
270
|
continue;
|
|
267
271
|
}
|
|
268
|
-
if (pen.template) {
|
|
272
|
+
// if (pen.template) {
|
|
273
|
+
if (pen.canvasLayer === CanvasLayer.CanvasTemplate) {
|
|
269
274
|
continue;
|
|
270
275
|
}
|
|
271
276
|
if (this.store.animates.has(getParent(pen, true))) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"canvasImage.js","sourceRoot":"","sources":["../../../../packages/core/src/canvas/canvasImage.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"canvasImage.js","sourceRoot":"","sources":["../../../../packages/core/src/canvas/canvasImage.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ var __values = (this && this.__values) || function(o) {
|
|
|
9
9
|
};
|
|
10
10
|
throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
|
|
11
11
|
};
|
|
12
|
-
import { ctxFlip, ctxRotate, drawImage, setGlobalAlpha, renderPen, } from '../pen';
|
|
12
|
+
import { ctxFlip, ctxRotate, drawImage, setGlobalAlpha, renderPen, CanvasLayer, } from '../pen';
|
|
13
13
|
import { createOffscreen } from './offscreen';
|
|
14
14
|
var CanvasTemplate = /** @class */ (function () {
|
|
15
15
|
function CanvasTemplate(parentElement, store) {
|
|
@@ -91,14 +91,15 @@ var CanvasTemplate = /** @class */ (function () {
|
|
|
91
91
|
ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
|
|
92
92
|
var width = this.store.data.width || this.store.options.width;
|
|
93
93
|
var height = this.store.data.height || this.store.options.height;
|
|
94
|
-
var x = this.store.data.x || this.store.options.x;
|
|
95
|
-
var y = this.store.data.y || this.store.options.y;
|
|
94
|
+
var x = this.store.data.x || this.store.options.x || 0;
|
|
95
|
+
var y = this.store.data.y || this.store.options.y || 0;
|
|
96
96
|
var background = this.store.data.background || this.store.options.background;
|
|
97
97
|
if (background) {
|
|
98
98
|
ctx.save();
|
|
99
99
|
ctx.fillStyle = background;
|
|
100
|
-
if (width && height
|
|
101
|
-
ctx.globalAlpha =
|
|
100
|
+
if (width && height) {
|
|
101
|
+
ctx.globalAlpha =
|
|
102
|
+
(_b = this.store.data.globalAlpha) !== null && _b !== void 0 ? _b : this.store.options.globalAlpha;
|
|
102
103
|
ctx.shadowOffsetX = this.store.options.shadowOffsetX;
|
|
103
104
|
ctx.shadowOffsetY = this.store.options.shadowOffsetY;
|
|
104
105
|
ctx.shadowBlur = this.store.options.shadowBlur;
|
|
@@ -128,7 +129,10 @@ var CanvasTemplate = /** @class */ (function () {
|
|
|
128
129
|
if (!isFinite(pen.x)) {
|
|
129
130
|
continue;
|
|
130
131
|
}
|
|
131
|
-
if (
|
|
132
|
+
if (
|
|
133
|
+
// pen.template
|
|
134
|
+
pen.canvasLayer === CanvasLayer.CanvasTemplate
|
|
135
|
+
&& pen.calculative.inView) {
|
|
132
136
|
//非图片
|
|
133
137
|
renderPen(ctx, pen);
|
|
134
138
|
//图片
|
|
@@ -191,8 +195,8 @@ var CanvasTemplate = /** @class */ (function () {
|
|
|
191
195
|
var m = startX / size;
|
|
192
196
|
var n = startY / size;
|
|
193
197
|
var offset = size * 10; //补偿值
|
|
194
|
-
var newX =
|
|
195
|
-
var newY =
|
|
198
|
+
var newX = startX - Math.ceil(m) * size;
|
|
199
|
+
var newY = startY - Math.ceil(n) * size;
|
|
196
200
|
var endX = cW + newX + offset;
|
|
197
201
|
var endY = cH + newY + offset;
|
|
198
202
|
for (var i = newX; i <= endX; i += size) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"canvasTemplate.js","sourceRoot":"","sources":["../../../../packages/core/src/canvas/canvasTemplate.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,EACL,OAAO,EACP,SAAS,EACT,SAAS,EAET,cAAc,EAEd,SAAS,
|
|
1
|
+
{"version":3,"file":"canvasTemplate.js","sourceRoot":"","sources":["../../../../packages/core/src/canvas/canvasTemplate.ts"],"names":[],"mappings":"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"}
|
package/src/core.js
CHANGED
|
@@ -83,7 +83,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
|
83
83
|
};
|
|
84
84
|
import { commonAnchors, commonPens, cube } from './diagrams';
|
|
85
85
|
import { Canvas } from './canvas';
|
|
86
|
-
import { calcInView, calcTextDrawRect, calcTextLines, calcTextRect, facePen, formatAttrs, getAllChildren, getFromAnchor, getParent, getToAnchor, getWords, LockState, PenType, renderPenRaw, setElemPosition, connectLine, nearestAnchor, setChildValue, isAncestor, isShowChild, } from './pen';
|
|
86
|
+
import { calcInView, calcTextDrawRect, calcTextLines, calcTextRect, facePen, formatAttrs, getAllChildren, getFromAnchor, getParent, getToAnchor, getWords, LockState, PenType, renderPenRaw, setElemPosition, connectLine, nearestAnchor, setChildValue, isAncestor, isShowChild, CanvasLayer, } from './pen';
|
|
87
87
|
import { rotatePoint } from './point';
|
|
88
88
|
import { clearStore, EditType, globalStore, register, registerAnchors, registerCanvasDraw, useStore, } from './store';
|
|
89
89
|
import { formatPadding, loadCss, s8, valueInArray, valueInRange, } from './utils';
|
|
@@ -211,7 +211,6 @@ var Meta2d = /** @class */ (function () {
|
|
|
211
211
|
else {
|
|
212
212
|
flag = true;
|
|
213
213
|
}
|
|
214
|
-
console.log("flag", flag);
|
|
215
214
|
if (flag) {
|
|
216
215
|
event.actions.forEach(function (action) {
|
|
217
216
|
if (_this.events[action.action]) {
|
|
@@ -396,6 +395,9 @@ var Meta2d = /** @class */ (function () {
|
|
|
396
395
|
this.canvas.hotkeyType = HotkeyType.None;
|
|
397
396
|
}
|
|
398
397
|
}
|
|
398
|
+
if (opts.width !== undefined || opts.height !== undefined) {
|
|
399
|
+
this.canvas && (this.canvas.canvasTemplate.bgPatchFlags = true);
|
|
400
|
+
}
|
|
399
401
|
this.store.options = Object.assign(this.store.options, opts);
|
|
400
402
|
if (this.canvas && opts.scroll !== undefined) {
|
|
401
403
|
if (opts.scroll) {
|
|
@@ -551,7 +553,7 @@ var Meta2d = /** @class */ (function () {
|
|
|
551
553
|
if (value && typeof value === 'object') {
|
|
552
554
|
var _pen = e.params ? _this.findOne(e.params) : pen;
|
|
553
555
|
for (var key in value) {
|
|
554
|
-
if (value[key] === undefined) {
|
|
556
|
+
if (value[key] === undefined || value[key] === '') {
|
|
555
557
|
value[key] = _pen[key];
|
|
556
558
|
}
|
|
557
559
|
}
|
|
@@ -609,7 +611,7 @@ var Meta2d = /** @class */ (function () {
|
|
|
609
611
|
if (e.targetType === 'id') {
|
|
610
612
|
var _pen = e.params ? _this.findOne(e.params) : pen;
|
|
611
613
|
for (var key in value) {
|
|
612
|
-
if (value[key] === undefined) {
|
|
614
|
+
if (value[key] === undefined || value[key] === '') {
|
|
613
615
|
value[key] = _pen[key];
|
|
614
616
|
}
|
|
615
617
|
}
|
|
@@ -630,7 +632,6 @@ var Meta2d = /** @class */ (function () {
|
|
|
630
632
|
return;
|
|
631
633
|
}
|
|
632
634
|
var params = queryURLParams(_pen.iframe.split('?')[1]);
|
|
633
|
-
console.log('消息', e, params);
|
|
634
635
|
_pen.calculative.singleton.div.children[0].contentWindow.postMessage(JSON.stringify({
|
|
635
636
|
name: e.value,
|
|
636
637
|
id: params.id,
|
|
@@ -1718,7 +1719,6 @@ var Meta2d = /** @class */ (function () {
|
|
|
1718
1719
|
this.socketFn = null;
|
|
1719
1720
|
return false;
|
|
1720
1721
|
}
|
|
1721
|
-
console.log("进入");
|
|
1722
1722
|
this.socketFn = socketFn;
|
|
1723
1723
|
}
|
|
1724
1724
|
catch (e) {
|
|
@@ -2700,7 +2700,10 @@ var Meta2d = /** @class */ (function () {
|
|
|
2700
2700
|
Meta2d.prototype.lockTemplate = function (lock) {
|
|
2701
2701
|
//锁定
|
|
2702
2702
|
this.store.data.pens.forEach(function (pen) {
|
|
2703
|
-
if (pen.template) {
|
|
2703
|
+
// if (pen.template) {
|
|
2704
|
+
// pen.locked = lock;
|
|
2705
|
+
// }
|
|
2706
|
+
if (pen.canvasLayer === CanvasLayer.CanvasTemplate) {
|
|
2704
2707
|
pen.locked = lock;
|
|
2705
2708
|
}
|
|
2706
2709
|
});
|
|
@@ -3555,14 +3558,24 @@ var Meta2d = /** @class */ (function () {
|
|
|
3555
3558
|
Meta2d.prototype.specificLayerMove = function (pen, type) {
|
|
3556
3559
|
//image
|
|
3557
3560
|
if (pen.image && pen.name !== 'gif') {
|
|
3558
|
-
|
|
3559
|
-
if (type === 'bottom' || type === 'down') {
|
|
3560
|
-
|
|
3561
|
+
// let isBottom = false;
|
|
3562
|
+
// if (type === 'bottom' || type === 'down') {
|
|
3563
|
+
// isBottom = true;
|
|
3564
|
+
// }
|
|
3565
|
+
// this.setValue(
|
|
3566
|
+
// { id: pen.id, isBottom },
|
|
3567
|
+
// { render: false, doEvent: false, history: false }
|
|
3568
|
+
// );
|
|
3569
|
+
var layer = CanvasLayer.CanvasImageBottom;
|
|
3570
|
+
if (type === 'top') {
|
|
3571
|
+
layer = CanvasLayer.CanvasImage;
|
|
3572
|
+
}
|
|
3573
|
+
else if (type === 'up' || type === 'down') {
|
|
3574
|
+
layer = CanvasLayer.CanvasMain;
|
|
3561
3575
|
}
|
|
3562
|
-
this.setValue({ id: pen.id,
|
|
3576
|
+
this.setValue({ id: pen.id, canvasLayer: layer }, { render: false, doEvent: false, history: false });
|
|
3563
3577
|
}
|
|
3564
|
-
|
|
3565
|
-
if (pen.externElement || pen.name === 'gif') {
|
|
3578
|
+
else if (pen.externElement || pen.name === 'gif') {
|
|
3566
3579
|
var zIndex = 1;
|
|
3567
3580
|
// let zIndex = pen.calculative.zIndex === undefined ? 5 : pen.calculative.zIndex + 1;
|
|
3568
3581
|
if (type === 'top') {
|
|
@@ -3581,6 +3594,8 @@ var Meta2d = /** @class */ (function () {
|
|
|
3581
3594
|
}
|
|
3582
3595
|
}
|
|
3583
3596
|
this.setValue({ id: pen.id, zIndex: zIndex }, { render: false, doEvent: false, history: false });
|
|
3597
|
+
pen.calculative.singleton.div &&
|
|
3598
|
+
setElemPosition(pen, pen.calculative.singleton.div);
|
|
3584
3599
|
}
|
|
3585
3600
|
};
|
|
3586
3601
|
/**
|