@meta2d/core 1.0.33 → 1.0.35

package/src/canvas/canvasTemplate.js

@@ -85,6 +85,7 @@ var CanvasTemplate = /** @class */ (function () {
     };
     CanvasTemplate.prototype.render = function () {
         var e_1, _a;
+        var _b;
         if (this.bgPatchFlags) {
             var ctx = this.bgOffscreen.getContext('2d');
             ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
@@ -96,7 +97,12 @@ var CanvasTemplate = /** @class */ (function () {
             if (background) {
                 ctx.save();
                 ctx.fillStyle = background;
-                if (width && height) {
+                if (width && height && x && y) {
+                    ctx.globalAlpha = (_b = this.store.data.globalAlpha) !== null && _b !== void 0 ? _b : this.store.options.globalAlpha;
+                    ctx.shadowOffsetX = this.store.options.shadowOffsetX;
+                    ctx.shadowOffsetY = this.store.options.shadowOffsetY;
+                    ctx.shadowBlur = this.store.options.shadowBlur;
+                    ctx.shadowColor = this.store.options.shadowColor;
                     ctx.fillRect(this.store.data.origin.x + x, this.store.data.origin.y + y, width * this.store.data.scale, height * this.store.data.scale);
                 }
                 else {
@@ -117,8 +123,8 @@ var CanvasTemplate = /** @class */ (function () {
             ctx.clearRect(0, 0, this.canvas.width, this.canvas.height);
             ctx.translate(this.store.data.x, this.store.data.y);
             try {
-                for (var _b = __values(this.store.data.pens), _c = _b.next(); !_c.done; _c = _b.next()) {
-                    var pen = _c.value;
+                for (var _c = __values(this.store.data.pens), _d = _c.next(); !_d.done; _d = _c.next()) {
+                    var pen = _d.value;
                     if (!isFinite(pen.x)) {
                         continue;
                     }
@@ -142,7 +148,7 @@ var CanvasTemplate = /** @class */ (function () {
             catch (e_1_1) { e_1 = { error: e_1_1 }; }
             finally {
                 try {
-                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                    if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
                 }
                 finally { if (e_1) throw e_1.error; }
             }
@@ -159,13 +165,16 @@ var CanvasTemplate = /** @class */ (function () {
     };
     CanvasTemplate.prototype.renderGrid = function (ctx) {
         var _a = this.store, data = _a.data, options = _a.options;
-        var grid = data.grid, gridRotate = data.gridRotate, gridColor = data.gridColor, gridSize = data.gridSize, scale = data.scale;
+        var grid = data.grid, gridRotate = data.gridRotate, gridColor = data.gridColor, gridSize = data.gridSize, scale = data.scale, origin = data.origin;
         if (!(grid !== null && grid !== void 0 ? grid : options.grid)) {
             // grid false 时不绘制, undefined 时看 options.grid
             return;
         }
         ctx.save();
-        var _b = this.canvas, width = _b.width, height = _b.height;
+        var width = (data.width || options.width) * scale;
+        var height = (data.height || options.height) * scale;
+        var startX = (data.x || options.x || 0) + origin.x;
+        var startY = (data.y || options.y || 0) + origin.y;
         if (gridRotate) {
             ctx.translate(width / 2, height / 2);
             ctx.rotate((gridRotate * Math.PI) / 180);
@@ -175,15 +184,37 @@ var CanvasTemplate = /** @class */ (function () {
         ctx.strokeStyle = gridColor || options.gridColor;
         ctx.beginPath();
         var size = (gridSize || options.gridSize) * scale;
-        var longSide = Math.max(width, height);
-        var count = Math.ceil(longSide / size);
-        for (var i = -size * count; i < longSide * 2; i += size) {
-            ctx.moveTo(i, -longSide);
-            ctx.lineTo(i, longSide * 2);
+        if (!width || !height) {
+            var ratio = this.store.dpiRatio;
+            var cW = this.canvas.width / ratio;
+            var cH = this.canvas.height / ratio;
+            var m = startX / size;
+            var n = startY / size;
+            var offset = size * 10; //补偿值
+            var newX = (startX - Math.ceil(m) * size);
+            var newY = (startY - Math.ceil(n) * size);
+            var endX = cW + newX + offset;
+            var endY = cH + newY + offset;
+            for (var i = newX; i <= endX; i += size) {
+                ctx.moveTo(i, newY);
+                ctx.lineTo(i, cH + newY + offset);
+            }
+            for (var i = newY; i <= endY; i += size) {
+                ctx.moveTo(newX, i);
+                ctx.lineTo(cW + newX + offset, i);
+            }
         }
-        for (var i = -size * count; i < longSide * 2; i += size) {
-            ctx.moveTo(-longSide, i);
-            ctx.lineTo(longSide * 2, i);
+        else {
+            var endX = width + startX;
+            var endY = height + startY;
+            for (var i = startX; i <= endX; i += size) {
+                ctx.moveTo(i, startY);
+                ctx.lineTo(i, height + startY);
+            }
+            for (var i = startY; i <= endY; i += size) {
+                ctx.moveTo(startX, i);
+                ctx.lineTo(width + startX, i);
+            }
         }
         ctx.stroke();
         ctx.restore();

package/src/canvas/canvasTemplate.js.map

@@ -1 +1 @@
-{"version":3,"file":"canvasTemplate.js","sourceRoot":"","sources":["../../../../packages/core/src/canvas/canvasTemplate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"canvasTemplate.js","sourceRoot":"","sources":["../../../../packages/core/src/canvas/canvasTemplate.ts"],"names":[],"mappings":"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"}

package/src/core.d.ts

@@ -3,7 +3,7 @@ import { Canvas } from './canvas';
 import { Options } from './options';
 import { calcTextDrawRect, calcTextLines, calcTextRect, facePen, getWords, LockState, Pen, renderPenRaw, IValue, setElemPosition } from './pen';
 import { Point } from './point';
-import { EditAction, register, registerAnchors, registerCanvasDraw, Meta2dData, Meta2dStore, Network } from './store';
+import { EditAction, register, registerAnchors, registerCanvasDraw, Meta2dData, Meta2dStore, Network, HttpOptions } from './store';
 import { Padding } from './utils';
 import { Rect } from './rect';
 import { Event, TriggerCondition } from './event';
@@ -86,6 +86,7 @@ export declare class Meta2d {
      */
     private doInitJS;
     drawLine(lineName?: string): void;
+    alignPenToGrid(pen: Pen): void;
     drawingPencil(): void;
     stopPencil(): void;
     lock(lock: LockState): void;
@@ -190,14 +191,17 @@ export declare class Meta2d {
     httpTimer: any;
     httpTimerList: any[];
     connectHttp(): void;
+    oldRequestHttp(_req: HttpOptions): Promise<void>;
     sendDatabyHttp(data: string): Promise<void>;
     closeHttp(): void;
     updateTimer: any;
     connectNetwork(): void;
     randomString(e: number): string;
     penMock(pen: Pen): void;
+    penNetwork(pen: Pen): void;
     getDynamicParam(key: string): any;
     onNetworkConnect(https: Network[]): void;
+    requestHttp(_req: Network): Promise<void>;
     closeNetwork(): void;
     socketCallback(message: string, context?: {
         type?: string;

package/src/core.js

@@ -144,6 +144,12 @@ var Meta2d = /** @class */ (function () {
                     e.pen && e.pen.onClick && e.pen.onClick(e.pen, _this.canvas.mousePos);
                     _this.store.data.locked && e.pen && _this.doEvent(e.pen, eventName);
                     break;
+                case 'contextmenu':
+                    e.pen &&
+                        e.pen.onContextmenu &&
+                        e.pen.onContextmenu(e.pen, _this.canvas.mousePos);
+                    _this.store.data.locked && e.pen && _this.doEvent(e.pen, eventName);
+                    break;
                 case 'mousedown':
                     e.pen &&
                         e.pen.onMouseDown &&
@@ -205,6 +211,7 @@ var Meta2d = /** @class */ (function () {
                         else {
                             flag = true;
                         }
+                        console.log("flag", flag);
                         if (flag) {
                             event.actions.forEach(function (action) {
                                 if (_this.events[action.action]) {
@@ -544,7 +551,7 @@ var Meta2d = /** @class */ (function () {
             if (value && typeof value === 'object') {
                 var _pen = e.params ? _this.findOne(e.params) : pen;
                 for (var key in value) {
-                    if (!value[key]) {
+                    if (value[key] === undefined) {
                         value[key] = _pen[key];
                     }
                 }
@@ -602,7 +609,7 @@ var Meta2d = /** @class */ (function () {
                 if (e.targetType === 'id') {
                     var _pen = e.params ? _this.findOne(e.params) : pen;
                     for (var key in value) {
-                        if (!value[key]) {
+                        if (value[key] === undefined) {
                             value[key] = _pen[key];
                         }
                     }
@@ -623,6 +630,7 @@ var Meta2d = /** @class */ (function () {
                 return;
             }
             var params = queryURLParams(_pen.iframe.split('?')[1]);
+            console.log('消息', e, params);
             _pen.calculative.singleton.div.children[0].contentWindow.postMessage(JSON.stringify({
                 name: e.value,
                 id: params.id,
@@ -745,7 +753,7 @@ var Meta2d = /** @class */ (function () {
                                 }
                             }
                             else {
-                                websocket_1 = new WebSocket(network.url, network.protocols);
+                                websocket_1 = new WebSocket(network.url, network.protocols || undefined);
                                 websocket_1.onopen = function () {
                                     console.info('websocket连接成功');
                                     websocket_1.send(value);
@@ -1098,6 +1106,9 @@ var Meta2d = /** @class */ (function () {
         lineName && lockedError(this.store);
         this.canvas.drawingLineName = lineName;
     };
+    Meta2d.prototype.alignPenToGrid = function (pen) {
+        this.canvas.alignPenToGrid(pen);
+    };
     Meta2d.prototype.drawingPencil = function () {
         this.canvas.drawingPencil();
     };
@@ -1295,7 +1306,9 @@ var Meta2d = /** @class */ (function () {
         if (!idOrTagOrPens) {
             pens = this.store.data.pens.filter(function (pen) {
                 return (((pen.type || pen.frames) && pen.autoPlay) ||
-                    (pen.animations && pen.autoPlay));
+                    (pen.animations &&
+                        pen.animations.length &&
+                        pen.animations.findIndex(function (i) { return i.autoPlay; }) !== -1));
             });
         }
         else if (typeof idOrTagOrPens === 'string') {
@@ -1305,7 +1318,7 @@ var Meta2d = /** @class */ (function () {
             pens = idOrTagOrPens;
         }
         pens.forEach(function (pen) {
-            var _a;
+            var _a, _b;
             if (pen.calculative.pause) {
                 var d = Date.now() - pen.calculative.pause;
                 pen.calculative.pause = undefined;
@@ -1331,9 +1344,13 @@ var Meta2d = /** @class */ (function () {
                     }
                 }
                 else if (params === undefined) {
-                    index = ((_a = pen.animations) === null || _a === void 0 ? void 0 : _a.findIndex(function (i) { return i.autoPlay; })) || -1;
+                    index = (_a = pen.animations) === null || _a === void 0 ? void 0 : _a.findIndex(function (i) { return i.autoPlay; });
+                    if (index === -1 && ((_b = pen.animations) === null || _b === void 0 ? void 0 : _b.length)) {
+                        //默认执行第0个动画
+                        index = 0;
+                    }
                 }
-                if (index !== -1) {
+                if (index !== -1 && index !== undefined) {
                     var animate = deepClone(pen.animations[index]);
                     delete animate.name;
                     animate.currentAnimation = index;
@@ -1698,8 +1715,10 @@ var Meta2d = /** @class */ (function () {
                 socketFn = new Function('e', 'context', socketCbJs);
             }
             if (!socketFn) {
+                this.socketFn = null;
                 return false;
             }
+            console.log("进入");
             this.socketFn = socketFn;
         }
         catch (e) {
@@ -1715,7 +1734,7 @@ var Meta2d = /** @class */ (function () {
             this.store.data.websocket = websocket;
         }
         if (this.store.data.websocket) {
-            this.websocket = new WebSocket(this.store.data.websocket, this.store.data.websocketProtocols);
+            this.websocket = new WebSocket(this.store.data.websocket, this.store.data.websocketProtocols || undefined);
             this.websocket.onmessage = function (e) {
                 _this.socketCallback(e.data, {
                     type: 'websocket',
@@ -1770,27 +1789,21 @@ var Meta2d = /** @class */ (function () {
         this.closeHttp();
         var https = this.store.data.https;
         if (https) {
+            if (!this.store.data.cancelFirstConnect) {
+                https.forEach(function (item) { return __awaiter(_this, void 0, void 0, function () {
+                    return __generator(this, function (_a) {
+                        this.oldRequestHttp(item);
+                        return [2 /*return*/];
+                    });
+                }); });
+            }
             https.forEach(function (item, index) {
                 if (item.http) {
                     _this.httpTimerList[index] = setInterval(function () { return __awaiter(_this, void 0, void 0, function () {
-                        var res, data;
                         return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0: return [4 /*yield*/, fetch(item.http, {
-                                        method: item.method || 'GET',
-                                        headers: item.httpHeaders,
-                                        body: item.method === 'POST' ? JSON.stringify(item.body) : undefined,
-                                    })];
-                                case 1:
-                                    res = _a.sent();
-                                    if (!res.ok) return [3 /*break*/, 3];
-                                    return [4 /*yield*/, res.text()];
-                                case 2:
-                                    data = _a.sent();
-                                    this.socketCallback(data, { type: 'http', url: item.http });
-                                    _a.label = 3;
-                                case 3: return [2 /*return*/];
-                            }
+                            // 默认每一秒请求一次
+                            this.oldRequestHttp(item);
+                            return [2 /*return*/];
                         });
                     }); }, item.httpTimeInterval || 1000);
                 }
@@ -1821,6 +1834,32 @@ var Meta2d = /** @class */ (function () {
             }
         }
     };
+    Meta2d.prototype.oldRequestHttp = function (_req) {
+        return __awaiter(this, void 0, void 0, function () {
+            var req, res, data;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        req = deepClone(_req);
+                        if (!req.http) return [3 /*break*/, 3];
+                        return [4 /*yield*/, fetch(req.http, {
+                                headers: req.httpHeaders,
+                                method: req.method || 'GET',
+                                body: req.method === 'POST' ? JSON.stringify(req.body) : undefined,
+                            })];
+                    case 1:
+                        res = _a.sent();
+                        if (!res.ok) return [3 /*break*/, 3];
+                        return [4 /*yield*/, res.text()];
+                    case 2:
+                        data = _a.sent();
+                        this.socketCallback(data, { type: 'http', url: req.http });
+                        _a.label = 3;
+                    case 3: return [2 /*return*/];
+                }
+            });
+        });
+    };
     Meta2d.prototype.sendDatabyHttp = function (data) {
         return __awaiter(this, void 0, void 0, function () {
             var https, _a, http, httpHeaders, res;
@@ -1910,7 +1949,7 @@ var Meta2d = /** @class */ (function () {
                         mqttIndex_1 += 1;
                     }
                     else if (net.protocol === 'websocket') {
-                        _this.websockets[websocketIndex_1] = new WebSocket(net.url, net.protocols);
+                        _this.websockets[websocketIndex_1] = new WebSocket(net.url, net.protocols || undefined);
                         _this.websockets[websocketIndex_1].onmessage = function (e) {
                             _this.socketCallback(e.data, { type: 'websocket', url: net.url });
                         };
@@ -2065,6 +2104,22 @@ var Meta2d = /** @class */ (function () {
             }
         }
     };
+    Meta2d.prototype.penNetwork = function (pen) {
+        var penNetwork = {
+            url: pen.apiUrl,
+            method: pen.apiMethod,
+            headers: pen.apiHeaders,
+            body: pen.apiBody,
+        };
+        //临时请求一次
+        this.requestHttp(penNetwork);
+        if (pen.apiEnable) {
+            if (!this.store.pensNetwork) {
+                this.store.pensNetwork = {};
+            }
+            this.store.pensNetwork[pen.id] = penNetwork;
+        }
+    };
     //获取动态参数
     Meta2d.prototype.getDynamicParam = function (key) {
         function getCookie(name) {
@@ -2087,6 +2142,19 @@ var Meta2d = /** @class */ (function () {
         if (!(https && https.length) && !enable) {
             return;
         }
+        if (this.store.pensNetwork) {
+            for (var key in this.store.pensNetwork) {
+                https.push(this.store.pensNetwork[key]);
+            }
+        }
+        if (!this.store.data.cancelFirstConnect) {
+            https.forEach(function (_item) { return __awaiter(_this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    this.requestHttp(_item);
+                    return [2 /*return*/];
+                });
+            }); });
+        }
         this.updateTimer = setInterval(function () {
             //模拟数据
             enable &&
@@ -2094,48 +2162,56 @@ var Meta2d = /** @class */ (function () {
                     _this.penMock(pen);
                 });
             https.forEach(function (_item) { return __awaiter(_this, void 0, void 0, function () {
-                var item, i, keys, i, keys, res, data;
                 return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            item = deepClone(_item);
-                            if (!item.url) return [3 /*break*/, 3];
-                            if (typeof item.headers === 'object') {
-                                for (i in item.headers) {
-                                    keys = item.headers[i].match(/(?<=\$\{).*?(?=\})/g);
-                                    if (keys) {
-                                        item.headers[i] = item.headers[i].replace("${" + keys[0] + "}", this.getDynamicParam(keys[0]));
-                                    }
-                                }
-                            }
-                            if (typeof item.body === 'object') {
-                                for (i in item.body) {
-                                    keys = item.body[i].match(/(?<=\$\{).*?(?=\})/g);
-                                    if (keys) {
-                                        item.body[i] = item.body[i].replace("${" + keys[0] + "}", this.getDynamicParam(keys[0]));
-                                    }
-                                }
-                            }
-                            return [4 /*yield*/, fetch(item.url, {
-                                    headers: item.headers,
-                                    method: item.method,
-                                    body: item.method === 'GET' ? undefined : JSON.stringify(item.body),
-                                })];
-                        case 1:
-                            res = _a.sent();
-                            if (!res.ok) return [3 /*break*/, 3];
-                            return [4 /*yield*/, res.text()];
-                        case 2:
-                            data = _a.sent();
-                            this.socketCallback(data, { type: 'http', url: item.url });
-                            _a.label = 3;
-                        case 3: return [2 /*return*/];
-                    }
+                    this.requestHttp(_item);
+                    return [2 /*return*/];
                 });
             }); });
             _this.render();
         }, this.store.data.networkInterval || 1000);
     };
+    Meta2d.prototype.requestHttp = function (_req) {
+        return __awaiter(this, void 0, void 0, function () {
+            var req, i, keys, i, keys, res, data;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        req = deepClone(_req);
+                        if (!req.url) return [3 /*break*/, 3];
+                        if (typeof req.headers === 'object') {
+                            for (i in req.headers) {
+                                keys = req.headers[i].match(/(?<=\$\{).*?(?=\})/g);
+                                if (keys) {
+                                    req.headers[i] = req.headers[i].replace("${" + keys[0] + "}", this.getDynamicParam(keys[0]));
+                                }
+                            }
+                        }
+                        if (typeof req.body === 'object') {
+                            for (i in req.body) {
+                                keys = req.body[i].match(/(?<=\$\{).*?(?=\})/g);
+                                if (keys) {
+                                    req.body[i] = req.body[i].replace("${" + keys[0] + "}", this.getDynamicParam(keys[0]));
+                                }
+                            }
+                        }
+                        return [4 /*yield*/, fetch(req.url, {
+                                headers: req.headers,
+                                method: req.method,
+                                body: req.method === 'GET' ? undefined : JSON.stringify(req.body),
+                            })];
+                    case 1:
+                        res = _a.sent();
+                        if (!res.ok) return [3 /*break*/, 3];
+                        return [4 /*yield*/, res.text()];
+                    case 2:
+                        data = _a.sent();
+                        this.socketCallback(data, { type: 'http', url: req.url });
+                        _a.label = 3;
+                    case 3: return [2 /*return*/];
+                }
+            });
+        });
+    };
     Meta2d.prototype.closeNetwork = function () {
         this.mqttClients &&
             this.mqttClients.forEach(function (mqttClient) {
@@ -2358,10 +2434,11 @@ var Meta2d = /** @class */ (function () {
             this.canvas.calcActiveRect();
         }
         if (history) {
+            var _pens = deepClone(pens);
             this.pushHistory({
                 type: EditType.Update,
                 initPens: initPens,
-                pens: pens,
+                pens: _pens,
             });
         }
         doEvent &&
@@ -2580,7 +2657,7 @@ var Meta2d = /** @class */ (function () {
                 if (pen.visible == false || !isShowChild(pen, this.store)) {
                     continue;
                 }
-                renderPenRaw(ctx, pen, rect);
+                renderPenRaw(ctx, pen, rect, true);
             }
         }
         catch (e_7_1) { e_7 = { error: e_7_1 }; }
@@ -3486,7 +3563,7 @@ var Meta2d = /** @class */ (function () {
         }
         //dom
         if (pen.externElement || pen.name === 'gif') {
-            var zIndex = 0;
+            var zIndex = 1;
             // let zIndex = pen.calculative.zIndex === undefined ? 5 : pen.calculative.zIndex + 1;
             if (type === 'top') {
                 pen.calculative.canvas.maxZindex += 1;
@@ -3499,8 +3576,8 @@ var Meta2d = /** @class */ (function () {
             else if (type === 'down') {
                 zIndex =
                     pen.calculative.zIndex === undefined ? 3 : pen.calculative.zIndex - 1;
-                if (zIndex < 0) {
-                    zIndex = 0;
+                if (zIndex < 1) {
+                    zIndex = 1;
                 }
             }
             this.setValue({ id: pen.id, zIndex: zIndex }, { render: false, doEvent: false, history: false });