@meta2d/core 1.0.32 → 1.0.34

package/src/core.d.ts

@@ -196,8 +196,10 @@ export declare class Meta2d {
     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;
@@ -232,14 +234,14 @@ export declare class Meta2d {
     judgeCondition(pen: Pen, key: string, condition: TriggerCondition): boolean;
     pushChildren(parent: Pen, children: Pen[]): void;
     renderPenRaw: typeof renderPenRaw;
-    toPng(padding?: Padding, callback?: BlobCallback, containBkImg?: boolean): string;
+    toPng(padding?: Padding, callback?: BlobCallback, containBkImg?: boolean, maxWidth?: number): string;
     activeToPng(padding?: Padding): string;
     /**
      * 下载 png
      * @param name 传入参数自带文件后缀名 例如：'test.png'
      * @param padding 上右下左的内边距
      */
-    downloadPng(name?: string, padding?: Padding): void;
+    downloadPng(name?: string, padding?: Padding, maxWidth?: number): void;
     downloadSvg(): void;
     getRect(pens?: Pen[]): Rect;
     hiddenTemplate(): void;

package/src/core.js

@@ -97,6 +97,7 @@ import { lockedError } from './utils/error';
 import { Scroll } from './scroll';
 import { getter } from './utils/object';
 import { queryURLParams } from './utils/url';
+import { HotkeyType } from './data';
 var Meta2d = /** @class */ (function () {
     function Meta2d(parent, opts) {
         var _this = this;
@@ -143,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 &&
@@ -186,11 +193,32 @@ var Meta2d = /** @class */ (function () {
             (_a = pen.events) === null || _a === void 0 ? void 0 : _a.forEach(function (event) {
                 var _a;
                 if (event.actions && event.actions.length) {
-                    event.actions.forEach(function (action) {
-                        if (_this.events[action.action] && event.name === eventName) {
-                            _this.events[action.action](pen, action);
+                    if (event.name === eventName) {
+                        //条件成立
+                        var flag = false;
+                        if (event.conditions && event.conditions.length) {
+                            if (event.conditionType === 'and') {
+                                flag = event.conditions.every(function (condition) {
+                                    return _this.judgeCondition(pen, condition.key, condition);
+                                });
+                            }
+                            else if (event.conditionType === 'or') {
+                                flag = event.conditions.some(function (condition) {
+                                    return _this.judgeCondition(pen, condition.key, condition);
+                                });
+                            }
                         }
-                    });
+                        else {
+                            flag = true;
+                        }
+                        if (flag) {
+                            event.actions.forEach(function (action) {
+                                if (_this.events[action.action]) {
+                                    _this.events[action.action](pen, action);
+                                }
+                            });
+                        }
+                    }
                 }
                 else {
                     if (_this.events[event.action] && event.name === eventName) {
@@ -362,6 +390,11 @@ var Meta2d = /** @class */ (function () {
                 ruleColor: opts.ruleColor,
             });
         }
+        if (opts.resizeMode !== undefined) {
+            if (!opts.resizeMode) {
+                this.canvas.hotkeyType = HotkeyType.None;
+            }
+        }
         this.store.options = Object.assign(this.store.options, opts);
         if (this.canvas && opts.scroll !== undefined) {
             if (opts.scroll) {
@@ -623,7 +656,7 @@ var Meta2d = /** @class */ (function () {
                 window.location.href = arr[0] + 'id=' + id;
             }
             else {
-                window.location.href = arr[0] + 'id=' + id + arr[1].slice(idx + 1);
+                window.location.href = arr[0] + 'id=' + id + arr[1].slice(idx);
             }
         }
     };
@@ -718,7 +751,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);
@@ -1268,7 +1301,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') {
@@ -1304,9 +1339,9 @@ 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) {
+                if (index !== -1 && index !== undefined) {
                     var animate = deepClone(pen.animations[index]);
                     delete animate.name;
                     animate.currentAnimation = index;
@@ -1688,7 +1723,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',
@@ -1883,7 +1918,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 });
                         };
@@ -2038,6 +2073,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) {
@@ -2060,6 +2111,11 @@ 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]);
+            }
+        }
         this.updateTimer = setInterval(function () {
             //模拟数据
             enable &&
@@ -2067,48 +2123,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) {
@@ -2331,10 +2395,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 &&
@@ -2495,9 +2560,9 @@ var Meta2d = /** @class */ (function () {
             step: step,
         });
     };
-    Meta2d.prototype.toPng = function (padding, callback, containBkImg) {
+    Meta2d.prototype.toPng = function (padding, callback, containBkImg, maxWidth) {
         if (containBkImg === void 0) { containBkImg = false; }
-        return this.canvas.toPng(padding, callback, containBkImg);
+        return this.canvas.toPng(padding, callback, containBkImg, maxWidth);
     };
     Meta2d.prototype.activeToPng = function (padding) {
         return this.canvas.activeToPng(padding);
@@ -2507,7 +2572,7 @@ var Meta2d = /** @class */ (function () {
      * @param name 传入参数自带文件后缀名 例如：'test.png'
      * @param padding 上右下左的内边距
      */
-    Meta2d.prototype.downloadPng = function (name, padding) {
+    Meta2d.prototype.downloadPng = function (name, padding, maxWidth) {
         var e_6, _a;
         var _this = this;
         var _b;
@@ -2530,7 +2595,7 @@ var Meta2d = /** @class */ (function () {
         setTimeout(function () {
             var a = document.createElement('a');
             a.setAttribute('download', (name || _this.store.data.name || 'le5le.meta2d') + '.png');
-            a.setAttribute('href', _this.toPng(padding, undefined, true));
+            a.setAttribute('href', _this.toPng(padding, undefined, true, maxWidth));
             var evt = document.createEvent('MouseEvents');
             evt.initEvent('click', true, true);
             a.dispatchEvent(evt);
@@ -3459,7 +3524,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;
@@ -3472,8 +3537,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 });