@meta2d/core 1.0.34 → 1.0.35
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.d.ts +8 -0
- package/src/canvas/canvas.js +251 -90
- package/src/canvas/canvas.js.map +1 -1
- package/src/canvas/canvasTemplate.js +45 -14
- package/src/canvas/canvasTemplate.js.map +1 -1
- package/src/core.d.ts +3 -1
- package/src/core.js +60 -21
- package/src/core.js.map +1 -1
- package/src/diagrams/iframe.js +16 -4
- package/src/diagrams/iframe.js.map +1 -1
- package/src/options.d.ts +6 -0
- package/src/options.js +6 -0
- package/src/options.js.map +1 -1
- package/src/pen/model.d.ts +3 -0
- package/src/pen/model.js.map +1 -1
- package/src/pen/render.d.ts +2 -2
- package/src/pen/render.js +33 -18
- package/src/pen/render.js.map +1 -1
- package/src/store/store.d.ts +3 -0
- package/src/store/store.js.map +1 -1
|
@@ -85,6 +85,7 @@ var CanvasTemplate = /** @class */ (function () {
|
|
|
85
85
|
};
|
|
86
86
|
CanvasTemplate.prototype.render = function () {
|
|
87
87
|
var e_1, _a;
|
|
88
|
+
var _b;
|
|
88
89
|
if (this.bgPatchFlags) {
|
|
89
90
|
var ctx = this.bgOffscreen.getContext('2d');
|
|
90
91
|
ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
|
|
@@ -96,7 +97,12 @@ var CanvasTemplate = /** @class */ (function () {
|
|
|
96
97
|
if (background) {
|
|
97
98
|
ctx.save();
|
|
98
99
|
ctx.fillStyle = background;
|
|
99
|
-
if (width && height) {
|
|
100
|
+
if (width && height && x && y) {
|
|
101
|
+
ctx.globalAlpha = (_b = this.store.data.globalAlpha) !== null && _b !== void 0 ? _b : this.store.options.globalAlpha;
|
|
102
|
+
ctx.shadowOffsetX = this.store.options.shadowOffsetX;
|
|
103
|
+
ctx.shadowOffsetY = this.store.options.shadowOffsetY;
|
|
104
|
+
ctx.shadowBlur = this.store.options.shadowBlur;
|
|
105
|
+
ctx.shadowColor = this.store.options.shadowColor;
|
|
100
106
|
ctx.fillRect(this.store.data.origin.x + x, this.store.data.origin.y + y, width * this.store.data.scale, height * this.store.data.scale);
|
|
101
107
|
}
|
|
102
108
|
else {
|
|
@@ -117,8 +123,8 @@ var CanvasTemplate = /** @class */ (function () {
|
|
|
117
123
|
ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
|
|
118
124
|
ctx.translate(this.store.data.x, this.store.data.y);
|
|
119
125
|
try {
|
|
120
|
-
for (var
|
|
121
|
-
var pen =
|
|
126
|
+
for (var _c = __values(this.store.data.pens), _d = _c.next(); !_d.done; _d = _c.next()) {
|
|
127
|
+
var pen = _d.value;
|
|
122
128
|
if (!isFinite(pen.x)) {
|
|
123
129
|
continue;
|
|
124
130
|
}
|
|
@@ -142,7 +148,7 @@ var CanvasTemplate = /** @class */ (function () {
|
|
|
142
148
|
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
143
149
|
finally {
|
|
144
150
|
try {
|
|
145
|
-
if (
|
|
151
|
+
if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
|
|
146
152
|
}
|
|
147
153
|
finally { if (e_1) throw e_1.error; }
|
|
148
154
|
}
|
|
@@ -159,13 +165,16 @@ var CanvasTemplate = /** @class */ (function () {
|
|
|
159
165
|
};
|
|
160
166
|
CanvasTemplate.prototype.renderGrid = function (ctx) {
|
|
161
167
|
var _a = this.store, data = _a.data, options = _a.options;
|
|
162
|
-
var grid = data.grid, gridRotate = data.gridRotate, gridColor = data.gridColor, gridSize = data.gridSize, scale = data.scale;
|
|
168
|
+
var grid = data.grid, gridRotate = data.gridRotate, gridColor = data.gridColor, gridSize = data.gridSize, scale = data.scale, origin = data.origin;
|
|
163
169
|
if (!(grid !== null && grid !== void 0 ? grid : options.grid)) {
|
|
164
170
|
// grid false 时不绘制, undefined 时看 options.grid
|
|
165
171
|
return;
|
|
166
172
|
}
|
|
167
173
|
ctx.save();
|
|
168
|
-
var
|
|
174
|
+
var width = (data.width || options.width) * scale;
|
|
175
|
+
var height = (data.height || options.height) * scale;
|
|
176
|
+
var startX = (data.x || options.x || 0) + origin.x;
|
|
177
|
+
var startY = (data.y || options.y || 0) + origin.y;
|
|
169
178
|
if (gridRotate) {
|
|
170
179
|
ctx.translate(width / 2, height / 2);
|
|
171
180
|
ctx.rotate((gridRotate * Math.PI) / 180);
|
|
@@ -175,15 +184,37 @@ var CanvasTemplate = /** @class */ (function () {
|
|
|
175
184
|
ctx.strokeStyle = gridColor || options.gridColor;
|
|
176
185
|
ctx.beginPath();
|
|
177
186
|
var size = (gridSize || options.gridSize) * scale;
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
187
|
+
if (!width || !height) {
|
|
188
|
+
var ratio = this.store.dpiRatio;
|
|
189
|
+
var cW = this.canvas.width / ratio;
|
|
190
|
+
var cH = this.canvas.height / ratio;
|
|
191
|
+
var m = startX / size;
|
|
192
|
+
var n = startY / size;
|
|
193
|
+
var offset = size * 10; //补偿值
|
|
194
|
+
var newX = (startX - Math.ceil(m) * size);
|
|
195
|
+
var newY = (startY - Math.ceil(n) * size);
|
|
196
|
+
var endX = cW + newX + offset;
|
|
197
|
+
var endY = cH + newY + offset;
|
|
198
|
+
for (var i = newX; i <= endX; i += size) {
|
|
199
|
+
ctx.moveTo(i, newY);
|
|
200
|
+
ctx.lineTo(i, cH + newY + offset);
|
|
201
|
+
}
|
|
202
|
+
for (var i = newY; i <= endY; i += size) {
|
|
203
|
+
ctx.moveTo(newX, i);
|
|
204
|
+
ctx.lineTo(cW + newX + offset, i);
|
|
205
|
+
}
|
|
183
206
|
}
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
207
|
+
else {
|
|
208
|
+
var endX = width + startX;
|
|
209
|
+
var endY = height + startY;
|
|
210
|
+
for (var i = startX; i <= endX; i += size) {
|
|
211
|
+
ctx.moveTo(i, startY);
|
|
212
|
+
ctx.lineTo(i, height + startY);
|
|
213
|
+
}
|
|
214
|
+
for (var i = startY; i <= endY; i += size) {
|
|
215
|
+
ctx.moveTo(startX, i);
|
|
216
|
+
ctx.lineTo(width + startX, i);
|
|
217
|
+
}
|
|
187
218
|
}
|
|
188
219
|
ctx.stroke();
|
|
189
220
|
ctx.restore();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"canvasTemplate.js","sourceRoot":"","sources":["../../../../packages/core/src/canvas/canvasTemplate.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"canvasTemplate.js","sourceRoot":"","sources":["../../../../packages/core/src/canvas/canvasTemplate.ts"],"names":[],"mappings":"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"}
|
package/src/core.d.ts
CHANGED
|
@@ -3,7 +3,7 @@ import { Canvas } from './canvas';
|
|
|
3
3
|
import { Options } from './options';
|
|
4
4
|
import { calcTextDrawRect, calcTextLines, calcTextRect, facePen, getWords, LockState, Pen, renderPenRaw, IValue, setElemPosition } from './pen';
|
|
5
5
|
import { Point } from './point';
|
|
6
|
-
import { EditAction, register, registerAnchors, registerCanvasDraw, Meta2dData, Meta2dStore, Network } from './store';
|
|
6
|
+
import { EditAction, register, registerAnchors, registerCanvasDraw, Meta2dData, Meta2dStore, Network, HttpOptions } from './store';
|
|
7
7
|
import { Padding } from './utils';
|
|
8
8
|
import { Rect } from './rect';
|
|
9
9
|
import { Event, TriggerCondition } from './event';
|
|
@@ -86,6 +86,7 @@ export declare class Meta2d {
|
|
|
86
86
|
*/
|
|
87
87
|
private doInitJS;
|
|
88
88
|
drawLine(lineName?: string): void;
|
|
89
|
+
alignPenToGrid(pen: Pen): void;
|
|
89
90
|
drawingPencil(): void;
|
|
90
91
|
stopPencil(): void;
|
|
91
92
|
lock(lock: LockState): void;
|
|
@@ -190,6 +191,7 @@ export declare class Meta2d {
|
|
|
190
191
|
httpTimer: any;
|
|
191
192
|
httpTimerList: any[];
|
|
192
193
|
connectHttp(): void;
|
|
194
|
+
oldRequestHttp(_req: HttpOptions): Promise<void>;
|
|
193
195
|
sendDatabyHttp(data: string): Promise<void>;
|
|
194
196
|
closeHttp(): void;
|
|
195
197
|
updateTimer: any;
|
package/src/core.js
CHANGED
|
@@ -211,6 +211,7 @@ var Meta2d = /** @class */ (function () {
|
|
|
211
211
|
else {
|
|
212
212
|
flag = true;
|
|
213
213
|
}
|
|
214
|
+
console.log("flag", flag);
|
|
214
215
|
if (flag) {
|
|
215
216
|
event.actions.forEach(function (action) {
|
|
216
217
|
if (_this.events[action.action]) {
|
|
@@ -550,7 +551,7 @@ var Meta2d = /** @class */ (function () {
|
|
|
550
551
|
if (value && typeof value === 'object') {
|
|
551
552
|
var _pen = e.params ? _this.findOne(e.params) : pen;
|
|
552
553
|
for (var key in value) {
|
|
553
|
-
if (
|
|
554
|
+
if (value[key] === undefined) {
|
|
554
555
|
value[key] = _pen[key];
|
|
555
556
|
}
|
|
556
557
|
}
|
|
@@ -608,7 +609,7 @@ var Meta2d = /** @class */ (function () {
|
|
|
608
609
|
if (e.targetType === 'id') {
|
|
609
610
|
var _pen = e.params ? _this.findOne(e.params) : pen;
|
|
610
611
|
for (var key in value) {
|
|
611
|
-
if (
|
|
612
|
+
if (value[key] === undefined) {
|
|
612
613
|
value[key] = _pen[key];
|
|
613
614
|
}
|
|
614
615
|
}
|
|
@@ -629,6 +630,7 @@ var Meta2d = /** @class */ (function () {
|
|
|
629
630
|
return;
|
|
630
631
|
}
|
|
631
632
|
var params = queryURLParams(_pen.iframe.split('?')[1]);
|
|
633
|
+
console.log('消息', e, params);
|
|
632
634
|
_pen.calculative.singleton.div.children[0].contentWindow.postMessage(JSON.stringify({
|
|
633
635
|
name: e.value,
|
|
634
636
|
id: params.id,
|
|
@@ -1104,6 +1106,9 @@ var Meta2d = /** @class */ (function () {
|
|
|
1104
1106
|
lineName && lockedError(this.store);
|
|
1105
1107
|
this.canvas.drawingLineName = lineName;
|
|
1106
1108
|
};
|
|
1109
|
+
Meta2d.prototype.alignPenToGrid = function (pen) {
|
|
1110
|
+
this.canvas.alignPenToGrid(pen);
|
|
1111
|
+
};
|
|
1107
1112
|
Meta2d.prototype.drawingPencil = function () {
|
|
1108
1113
|
this.canvas.drawingPencil();
|
|
1109
1114
|
};
|
|
@@ -1313,7 +1318,7 @@ var Meta2d = /** @class */ (function () {
|
|
|
1313
1318
|
pens = idOrTagOrPens;
|
|
1314
1319
|
}
|
|
1315
1320
|
pens.forEach(function (pen) {
|
|
1316
|
-
var _a;
|
|
1321
|
+
var _a, _b;
|
|
1317
1322
|
if (pen.calculative.pause) {
|
|
1318
1323
|
var d = Date.now() - pen.calculative.pause;
|
|
1319
1324
|
pen.calculative.pause = undefined;
|
|
@@ -1340,6 +1345,10 @@ var Meta2d = /** @class */ (function () {
|
|
|
1340
1345
|
}
|
|
1341
1346
|
else if (params === undefined) {
|
|
1342
1347
|
index = (_a = pen.animations) === null || _a === void 0 ? void 0 : _a.findIndex(function (i) { return i.autoPlay; });
|
|
1348
|
+
if (index === -1 && ((_b = pen.animations) === null || _b === void 0 ? void 0 : _b.length)) {
|
|
1349
|
+
//默认执行第0个动画
|
|
1350
|
+
index = 0;
|
|
1351
|
+
}
|
|
1343
1352
|
}
|
|
1344
1353
|
if (index !== -1 && index !== undefined) {
|
|
1345
1354
|
var animate = deepClone(pen.animations[index]);
|
|
@@ -1706,8 +1715,10 @@ var Meta2d = /** @class */ (function () {
|
|
|
1706
1715
|
socketFn = new Function('e', 'context', socketCbJs);
|
|
1707
1716
|
}
|
|
1708
1717
|
if (!socketFn) {
|
|
1718
|
+
this.socketFn = null;
|
|
1709
1719
|
return false;
|
|
1710
1720
|
}
|
|
1721
|
+
console.log("进入");
|
|
1711
1722
|
this.socketFn = socketFn;
|
|
1712
1723
|
}
|
|
1713
1724
|
catch (e) {
|
|
@@ -1778,27 +1789,21 @@ var Meta2d = /** @class */ (function () {
|
|
|
1778
1789
|
this.closeHttp();
|
|
1779
1790
|
var https = this.store.data.https;
|
|
1780
1791
|
if (https) {
|
|
1792
|
+
if (!this.store.data.cancelFirstConnect) {
|
|
1793
|
+
https.forEach(function (item) { return __awaiter(_this, void 0, void 0, function () {
|
|
1794
|
+
return __generator(this, function (_a) {
|
|
1795
|
+
this.oldRequestHttp(item);
|
|
1796
|
+
return [2 /*return*/];
|
|
1797
|
+
});
|
|
1798
|
+
}); });
|
|
1799
|
+
}
|
|
1781
1800
|
https.forEach(function (item, index) {
|
|
1782
1801
|
if (item.http) {
|
|
1783
1802
|
_this.httpTimerList[index] = setInterval(function () { return __awaiter(_this, void 0, void 0, function () {
|
|
1784
|
-
var res, data;
|
|
1785
1803
|
return __generator(this, function (_a) {
|
|
1786
|
-
|
|
1787
|
-
|
|
1788
|
-
|
|
1789
|
-
headers: item.httpHeaders,
|
|
1790
|
-
body: item.method === 'POST' ? JSON.stringify(item.body) : undefined,
|
|
1791
|
-
})];
|
|
1792
|
-
case 1:
|
|
1793
|
-
res = _a.sent();
|
|
1794
|
-
if (!res.ok) return [3 /*break*/, 3];
|
|
1795
|
-
return [4 /*yield*/, res.text()];
|
|
1796
|
-
case 2:
|
|
1797
|
-
data = _a.sent();
|
|
1798
|
-
this.socketCallback(data, { type: 'http', url: item.http });
|
|
1799
|
-
_a.label = 3;
|
|
1800
|
-
case 3: return [2 /*return*/];
|
|
1801
|
-
}
|
|
1804
|
+
// 默认每一秒请求一次
|
|
1805
|
+
this.oldRequestHttp(item);
|
|
1806
|
+
return [2 /*return*/];
|
|
1802
1807
|
});
|
|
1803
1808
|
}); }, item.httpTimeInterval || 1000);
|
|
1804
1809
|
}
|
|
@@ -1829,6 +1834,32 @@ var Meta2d = /** @class */ (function () {
|
|
|
1829
1834
|
}
|
|
1830
1835
|
}
|
|
1831
1836
|
};
|
|
1837
|
+
Meta2d.prototype.oldRequestHttp = function (_req) {
|
|
1838
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
1839
|
+
var req, res, data;
|
|
1840
|
+
return __generator(this, function (_a) {
|
|
1841
|
+
switch (_a.label) {
|
|
1842
|
+
case 0:
|
|
1843
|
+
req = deepClone(_req);
|
|
1844
|
+
if (!req.http) return [3 /*break*/, 3];
|
|
1845
|
+
return [4 /*yield*/, fetch(req.http, {
|
|
1846
|
+
headers: req.httpHeaders,
|
|
1847
|
+
method: req.method || 'GET',
|
|
1848
|
+
body: req.method === 'POST' ? JSON.stringify(req.body) : undefined,
|
|
1849
|
+
})];
|
|
1850
|
+
case 1:
|
|
1851
|
+
res = _a.sent();
|
|
1852
|
+
if (!res.ok) return [3 /*break*/, 3];
|
|
1853
|
+
return [4 /*yield*/, res.text()];
|
|
1854
|
+
case 2:
|
|
1855
|
+
data = _a.sent();
|
|
1856
|
+
this.socketCallback(data, { type: 'http', url: req.http });
|
|
1857
|
+
_a.label = 3;
|
|
1858
|
+
case 3: return [2 /*return*/];
|
|
1859
|
+
}
|
|
1860
|
+
});
|
|
1861
|
+
});
|
|
1862
|
+
};
|
|
1832
1863
|
Meta2d.prototype.sendDatabyHttp = function (data) {
|
|
1833
1864
|
return __awaiter(this, void 0, void 0, function () {
|
|
1834
1865
|
var https, _a, http, httpHeaders, res;
|
|
@@ -2116,6 +2147,14 @@ var Meta2d = /** @class */ (function () {
|
|
|
2116
2147
|
https.push(this.store.pensNetwork[key]);
|
|
2117
2148
|
}
|
|
2118
2149
|
}
|
|
2150
|
+
if (!this.store.data.cancelFirstConnect) {
|
|
2151
|
+
https.forEach(function (_item) { return __awaiter(_this, void 0, void 0, function () {
|
|
2152
|
+
return __generator(this, function (_a) {
|
|
2153
|
+
this.requestHttp(_item);
|
|
2154
|
+
return [2 /*return*/];
|
|
2155
|
+
});
|
|
2156
|
+
}); });
|
|
2157
|
+
}
|
|
2119
2158
|
this.updateTimer = setInterval(function () {
|
|
2120
2159
|
//模拟数据
|
|
2121
2160
|
enable &&
|
|
@@ -2618,7 +2657,7 @@ var Meta2d = /** @class */ (function () {
|
|
|
2618
2657
|
if (pen.visible == false || !isShowChild(pen, this.store)) {
|
|
2619
2658
|
continue;
|
|
2620
2659
|
}
|
|
2621
|
-
renderPenRaw(ctx, pen, rect);
|
|
2660
|
+
renderPenRaw(ctx, pen, rect, true);
|
|
2622
2661
|
}
|
|
2623
2662
|
}
|
|
2624
2663
|
catch (e_7_1) { e_7 = { error: e_7_1 }; }
|