@meta2d/core 1.0.50 → 1.0.52

package/src/core.js

@@ -212,13 +212,14 @@ var Meta2d = /** @class */ (function () {
             }
         };
         this.doEvent = function (pen, eventName) {
-            var _a, _b, _c, _e, _f, _g;
+            var e_1, _a, e_2, _b;
+            var _c, _e, _f, _g, _h, _j, _k, _l, _m, _o;
             if (!pen) {
                 return;
             }
             var old = false; //是否是旧的事件
             var indexArr = []; //事件条件成立的索引
-            (_a = pen.events) === null || _a === void 0 ? void 0 : _a.forEach(function (event, index) {
+            (_c = pen.events) === null || _c === void 0 ? void 0 : _c.forEach(function (event, index) {
                 var _a;
                 if (event.actions && event.actions.length) {
                     if (event.name === eventName) {
@@ -318,14 +319,14 @@ var Meta2d = /** @class */ (function () {
             });
             //所有的条件判断后，再统一执行条件成立的事件
             if (old) {
-                (_b = pen.events) === null || _b === void 0 ? void 0 : _b.forEach(function (event, index) {
+                (_e = pen.events) === null || _e === void 0 ? void 0 : _e.forEach(function (event, index) {
                     if (indexArr.includes(index)) {
                         _this.events[event.action](pen, event);
                     }
                 });
             }
             else {
-                (_c = pen.events) === null || _c === void 0 ? void 0 : _c.forEach(function (event, index) {
+                (_f = pen.events) === null || _f === void 0 ? void 0 : _f.forEach(function (event, index) {
                     if (indexArr.includes(index)) {
                         event.actions.forEach(function (action) {
                             if (_this.events[action.action]) {
@@ -336,20 +337,27 @@ var Meta2d = /** @class */ (function () {
                 });
             }
             if (eventName === 'valueUpdate') {
-                (_e = pen.realTimes) === null || _e === void 0 ? void 0 : _e.forEach(function (realTime) {
+                (_g = pen.realTimes) === null || _g === void 0 ? void 0 : _g.forEach(function (realTime) {
                     var _a, _b;
                     var indexArr = [];
                     (_a = realTime.triggers) === null || _a === void 0 ? void 0 : _a.forEach(function (trigger, index) {
+                        var _a;
                         var flag = false;
-                        if (trigger.conditionType === 'and') {
-                            flag = trigger.conditions.every(function (condition) {
-                                return _this.judgeCondition(pen, realTime.key, condition);
-                            });
+                        if ((_a = trigger.conditions) === null || _a === void 0 ? void 0 : _a.length) {
+                            if (trigger.conditionType === 'and') {
+                                flag = trigger.conditions.every(function (condition) {
+                                    return _this.judgeCondition(pen, realTime.key, condition);
+                                });
+                            }
+                            else if (trigger.conditionType === 'or') {
+                                flag = trigger.conditions.some(function (condition) {
+                                    return _this.judgeCondition(pen, realTime.key, condition);
+                                });
+                            }
                         }
-                        else if (trigger.conditionType === 'or') {
-                            flag = trigger.conditions.some(function (condition) {
-                                return _this.judgeCondition(pen, realTime.key, condition);
-                            });
+                        else {
+                            //无条件
+                            flag = true;
                         }
                         if (flag) {
                             indexArr.push(index);
@@ -370,23 +378,30 @@ var Meta2d = /** @class */ (function () {
                 });
                 //全局
                 var indexArr_1 = [];
-                (_f = _this.store.globalTriggers[pen.id]) === null || _f === void 0 ? void 0 : _f.forEach(function (trigger, index) {
+                (_h = _this.store.globalTriggers[pen.id]) === null || _h === void 0 ? void 0 : _h.forEach(function (trigger, index) {
+                    var _a;
                     var flag = false;
-                    if (trigger.conditionType === 'and') {
-                        flag = trigger.conditions.every(function (condition) {
-                            return _this.judgeCondition(_this.store.pens[condition.source], condition.key, condition);
-                        });
+                    if ((_a = trigger.conditions) === null || _a === void 0 ? void 0 : _a.length) {
+                        if (trigger.conditionType === 'and') {
+                            flag = trigger.conditions.every(function (condition) {
+                                return _this.judgeCondition(_this.store.pens[condition.source], condition.key, condition);
+                            });
+                        }
+                        else if (trigger.conditionType === 'or') {
+                            flag = trigger.conditions.some(function (condition) {
+                                return _this.judgeCondition(_this.store.pens[condition.source], condition.key, condition);
+                            });
+                        }
                     }
-                    else if (trigger.conditionType === 'or') {
-                        flag = trigger.conditions.some(function (condition) {
-                            return _this.judgeCondition(_this.store.pens[condition.source], condition.key, condition);
-                        });
+                    else {
+                        //无条件
+                        flag = true;
                     }
                     if (flag) {
                         indexArr_1.push(index);
                     }
                 });
-                (_g = _this.store.globalTriggers[pen.id]) === null || _g === void 0 ? void 0 : _g.forEach(function (trigger, index) {
+                (_j = _this.store.globalTriggers[pen.id]) === null || _j === void 0 ? void 0 : _j.forEach(function (trigger, index) {
                     var _a;
                     if (indexArr_1.includes(index)) {
                         (_a = trigger.actions) === null || _a === void 0 ? void 0 : _a.forEach(function (event) {
@@ -394,6 +409,58 @@ var Meta2d = /** @class */ (function () {
                         });
                     }
                 });
+                //triggers
+                if ((_k = pen.triggers) === null || _k === void 0 ? void 0 : _k.length) {
+                    try {
+                        for (var _p = __values(pen.triggers), _q = _p.next(); !_q.done; _q = _p.next()) {
+                            var trigger = _q.value;
+                            if ((_l = trigger.status) === null || _l === void 0 ? void 0 : _l.length) {
+                                try {
+                                    for (var _r = (e_2 = void 0, __values(trigger.status)), _s = _r.next(); !_s.done; _s = _r.next()) {
+                                        var state = _s.value;
+                                        var flag = false;
+                                        if ((_m = state.conditions) === null || _m === void 0 ? void 0 : _m.length) {
+                                            if (state.conditionType === 'and') {
+                                                flag = state.conditions.every(function (condition) {
+                                                    return _this.judgeCondition(pen, condition.key, condition);
+                                                });
+                                            }
+                                            else if (trigger.conditionType === 'or') {
+                                                flag = state.conditions.some(function (condition) {
+                                                    return _this.judgeCondition(pen, condition.key, condition);
+                                                });
+                                            }
+                                        }
+                                        else {
+                                            //无条件
+                                            flag = true;
+                                        }
+                                        if (flag) {
+                                            (_o = state.actions) === null || _o === void 0 ? void 0 : _o.forEach(function (event) {
+                                                _this.events[event.action](pen, event);
+                                            });
+                                            break;
+                                        }
+                                    }
+                                }
+                                catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                                finally {
+                                    try {
+                                        if (_s && !_s.done && (_b = _r.return)) _b.call(_r);
+                                    }
+                                    finally { if (e_2) throw e_2.error; }
+                                }
+                            }
+                        }
+                    }
+                    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                    finally {
+                        try {
+                            if (_q && !_q.done && (_a = _p.return)) _a.call(_p);
+                        }
+                        finally { if (e_1) throw e_1.error; }
+                    }
+                }
             }
             // 事件冒泡，子执行完，父执行
             _this.doEvent(_this.store.pens[pen.parentId], eventName);
@@ -794,11 +861,11 @@ var Meta2d = /** @class */ (function () {
                             value[key] = _pen[key];
                         }
                     }
-                    value.id = _pen.id;
+                    // value.id = _pen.id;
                     if (_pen.deviceId) {
                         value.deviceId = _pen.deviceId;
                     }
-                    _this.sendDataToNetWork(value, e.network);
+                    _this.sendDataToNetWork(value, pen, e);
                     return;
                 }
             }
@@ -869,13 +936,15 @@ var Meta2d = /** @class */ (function () {
         }
         this.store.emitter.emit('sendData', data);
     };
-    Meta2d.prototype.sendDataToNetWork = function (value, _network) {
+    Meta2d.prototype.sendDataToNetWork = function (value, pen, e) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var network, i, keys, params, res, clients_1, mqttClient_1, websockets, websocket_1;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var network, i, keys, params, url_1, keys, res, data, fnJs, clients_1, mqttClient_1, websockets, websocket_1;
+            var _this = this;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
-                        network = deepClone(_network);
+                        network = deepClone(e.network);
                         if (network.data) {
                             Object.assign(network, network.data);
                             delete network.data;
@@ -883,16 +952,19 @@ var Meta2d = /** @class */ (function () {
                         if (!network.url) {
                             return [2 /*return*/];
                         }
-                        if (!(network.protocol === 'http')) return [3 /*break*/, 2];
+                        if (!(network.protocol === 'http')) return [3 /*break*/, 5];
                         if (typeof network.headers === 'object') {
                             for (i in network.headers) {
-                                keys = network.headers[i].match(/(?<=\$\{).*?(?=\})/g);
-                                if (keys) {
-                                    network.headers[i] = network.headers[i].replace("${" + keys[0] + "}", this.getDynamicParam(keys[0]));
+                                if (typeof network.headers[i] === 'string') {
+                                    keys = network.headers[i].match(/(?<=\$\{).*?(?=\})/g);
+                                    if (keys) {
+                                        network.headers[i] = network.headers[i].replace("${" + keys[0] + "}", this.getDynamicParam(keys[0]));
+                                    }
                                 }
                             }
                         }
                         params = undefined;
+                        url_1 = network.url;
                         if (network.method === 'GET') {
                             params =
                                 '?' +
@@ -900,18 +972,47 @@ var Meta2d = /** @class */ (function () {
                                         .map(function (key) { return key + '=' + value[key]; })
                                         .join('&');
                         }
-                        return [4 /*yield*/, fetch(network.url + (params ? params : ''), {
+                        if (network.method === 'POST') {
+                            if (url_1.indexOf('${') > -1) {
+                                keys = url_1.match(/(?<=\$\{).*?(?=\})/g);
+                                if (keys) {
+                                    keys.forEach(function (key) {
+                                        url_1 = url_1.replace("${" + key + "}", getter(pen, key) || _this.getDynamicParam(key));
+                                    });
+                                }
+                            }
+                        }
+                        return [4 /*yield*/, fetch(url_1 + (params ? params : ''), {
                                 headers: network.headers || {},
                                 method: network.method,
                                 body: network.method === 'POST' ? JSON.stringify(value) : undefined,
                             })];
                     case 1:
-                        res = _a.sent();
-                        if (res.ok) {
-                            console.info('http消息发送成功');
-                        }
-                        return [3 /*break*/, 3];
+                        res = _b.sent();
+                        if (!res.ok) return [3 /*break*/, 4];
+                        if (!e.callback) return [3 /*break*/, 3];
+                        return [4 /*yield*/, res.text()];
                     case 2:
+                        data = _b.sent();
+                        if (!e.fn) {
+                            try {
+                                if (typeof e.callback !== 'string') {
+                                    throw new Error('[meta2d] Function callback must be string');
+                                }
+                                fnJs = e.callback;
+                                e.fn = new Function('pen', 'data', 'context', fnJs);
+                            }
+                            catch (err) {
+                                console.error('[meta2d]: Error on make a function:', err);
+                            }
+                        }
+                        (_a = e.fn) === null || _a === void 0 ? void 0 : _a.call(e, pen, data, { meta2d: this, e: e });
+                        _b.label = 3;
+                    case 3:
+                        console.info('http消息发送成功');
+                        _b.label = 4;
+                    case 4: return [3 /*break*/, 6];
+                    case 5:
                         if (network.protocol === 'mqtt') {
                             clients_1 = this.mqttClients.filter(function (client) { return client.options.href === network.url; });
                             if (clients_1 && clients_1.length) {
@@ -950,8 +1051,8 @@ var Meta2d = /** @class */ (function () {
                                 };
                             }
                         }
-                        _a.label = 3;
-                    case 3: return [2 /*return*/];
+                        _b.label = 6;
+                    case 6: return [2 /*return*/];
                 }
             });
         });
@@ -1076,7 +1177,7 @@ var Meta2d = /** @class */ (function () {
         this.store.patchFlagsTop = true;
     };
     Meta2d.prototype.open = function (data, render) {
-        var e_1, _a, e_2, _b, e_3, _c, e_4, _e;
+        var e_3, _a, e_4, _b, e_5, _c, e_6, _e;
         var _this = this;
         if (render === void 0) { render = true; }
         this.clear(false, data === null || data === void 0 ? void 0 : data.template);
@@ -1096,12 +1197,12 @@ var Meta2d = /** @class */ (function () {
                     this.store.pens[pen.id] = pen;
                 }
             }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            catch (e_3_1) { e_3 = { error: e_3_1 }; }
             finally {
                 try {
                     if (_g && !_g.done && (_a = _f.return)) _a.call(_f);
                 }
-                finally { if (e_1) throw e_1.error; }
+                finally { if (e_3) throw e_3.error; }
             }
             try {
                 for (var _h = __values(data.pens), _j = _h.next(); !_j.done; _j = _h.next()) {
@@ -1109,12 +1210,12 @@ var Meta2d = /** @class */ (function () {
                     this.canvas.makePen(pen);
                 }
             }
-            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+            catch (e_4_1) { e_4 = { error: e_4_1 }; }
             finally {
                 try {
                     if (_j && !_j.done && (_b = _h.return)) _b.call(_h);
                 }
-                finally { if (e_2) throw e_2.error; }
+                finally { if (e_4) throw e_4.error; }
             }
             try {
                 for (var _k = __values(data.pens), _l = _k.next(); !_l.done; _l = _k.next()) {
@@ -1122,12 +1223,12 @@ var Meta2d = /** @class */ (function () {
                     this.canvas.updateLines(pen);
                 }
             }
-            catch (e_3_1) { e_3 = { error: e_3_1 }; }
+            catch (e_5_1) { e_5 = { error: e_5_1 }; }
             finally {
                 try {
                     if (_l && !_l.done && (_c = _k.return)) _c.call(_k);
                 }
-                finally { if (e_3) throw e_3.error; }
+                finally { if (e_5) throw e_5.error; }
             }
         }
         this.canvas.patchFlagsLines.forEach(function (pen) {
@@ -1162,12 +1263,12 @@ var Meta2d = /** @class */ (function () {
                     });
                 }
             }
-            catch (e_4_1) { e_4 = { error: e_4_1 }; }
+            catch (e_6_1) { e_6 = { error: e_6_1 }; }
             finally {
                 try {
                     if (_o && !_o.done && (_e = _m.return)) _e.call(_m);
                 }
-                finally { if (e_4) throw e_4.error; }
+                finally { if (e_6) throw e_6.error; }
             }
         }
         this.canvas.autoPolylineFlag = false;
@@ -1408,7 +1509,7 @@ var Meta2d = /** @class */ (function () {
      * @param render 是否重绘
      */
     Meta2d.prototype.clear = function (render, template) {
-        var e_5, _a;
+        var e_7, _a;
         var _b;
         if (render === void 0) { render = true; }
         try {
@@ -1417,12 +1518,12 @@ var Meta2d = /** @class */ (function () {
                 (_b = pen.onDestroy) === null || _b === void 0 ? void 0 : _b.call(pen, pen);
             }
         }
-        catch (e_5_1) { e_5 = { error: e_5_1 }; }
+        catch (e_7_1) { e_7 = { error: e_7_1 }; }
         finally {
             try {
                 if (_e && !_e.done && (_a = _c.return)) _a.call(_c);
             }
-            finally { if (e_5) throw e_5.error; }
+            finally { if (e_7) throw e_7.error; }
         }
         clearStore(this.store, template);
         this.hideInput();
@@ -1777,6 +1878,7 @@ var Meta2d = /** @class */ (function () {
         }
         this.store.emitter.emit('combine', [parent]);
         this.render();
+        return parent;
     };
     Meta2d.prototype.uncombine = function (pen) {
         var _this = this;
@@ -2579,7 +2681,7 @@ var Meta2d = /** @class */ (function () {
                     return;
                 }
                 var penValue = penValues.get(pen);
-                if (typeof pen.onBinds === 'function') {
+                if (!pen.noOnBinds && typeof pen.onBinds === 'function') {
                     // 已经计算了
                     if (penValue) {
                         return;
@@ -2654,6 +2756,9 @@ var Meta2d = /** @class */ (function () {
         var _this = this;
         var _b = _a === void 0 ? {} : _a, _c = _b.render, render = _c === void 0 ? true : _c, _e = _b.doEvent, doEvent = _e === void 0 ? true : _e, history = _b.history;
         var pens = [];
+        if (!data) {
+            return;
+        }
         if (data.id) {
             if (data.id === this.store.data.id) {
                 this.setDatabyOptions(data);
@@ -3000,12 +3105,12 @@ var Meta2d = /** @class */ (function () {
         if (containBkImg === void 0) { containBkImg = false; }
         return this.canvas.toPng(padding, callback, containBkImg, maxWidth);
     };
-    Meta2d.prototype.activeToPng = function (padding) {
-        return this.canvas.activeToPng(padding);
+    Meta2d.prototype.activeToPng = function (padding, maxWidth) {
+        return this.canvas.activeToPng(padding, maxWidth);
     };
-    Meta2d.prototype.pensToPng = function (pens, padding) {
+    Meta2d.prototype.pensToPng = function (pens, padding, maxWidth) {
         if (pens === void 0) { pens = this.store.active; }
-        return this.canvas.pensToPng(pens, padding);
+        return this.canvas.pensToPng(pens, padding, maxWidth);
     };
     /**
      * 下载 png
@@ -3013,7 +3118,7 @@ var Meta2d = /** @class */ (function () {
      * @param padding 上右下左的内边距
      */
     Meta2d.prototype.downloadPng = function (name, padding, maxWidth) {
-        var e_6, _a;
+        var e_8, _a;
         var _this = this;
         var _b;
         try {
@@ -3025,12 +3130,12 @@ var Meta2d = /** @class */ (function () {
                 }
             }
         }
-        catch (e_6_1) { e_6 = { error: e_6_1 }; }
+        catch (e_8_1) { e_8 = { error: e_8_1 }; }
         finally {
             try {
                 if (_e && !_e.done && (_a = _c.return)) _a.call(_c);
             }
-            finally { if (e_6) throw e_6.error; }
+            finally { if (e_8) throw e_8.error; }
         }
         setTimeout(function () {
             var a = document.createElement('a');
@@ -3042,7 +3147,7 @@ var Meta2d = /** @class */ (function () {
         }, 1000);
     };
     Meta2d.prototype.downloadSvg = function () {
-        var e_7, _a;
+        var e_9, _a;
         if (!window.C2S) {
             console.error('请先加载乐吾乐官网下的canvas2svg.js', 'https://assets.le5lecdn.com/2d/canvas2svg.js');
             throw new Error('请先加载乐吾乐官网下的canvas2svg.js');
@@ -3061,12 +3166,12 @@ var Meta2d = /** @class */ (function () {
                 renderPenRaw(ctx, pen, rect, true);
             }
         }
-        catch (e_7_1) { e_7 = { error: e_7_1 }; }
+        catch (e_9_1) { e_9 = { error: e_9_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_7) throw e_7.error; }
+            finally { if (e_9) throw e_9.error; }
         }
         var mySerializedSVG = ctx.getSerializedSvg();
         if (this.store.data.background) {
@@ -3525,7 +3630,7 @@ var Meta2d = /** @class */ (function () {
         });
     };
     Meta2d.prototype.alignNodes = function (align, pens, rect) {
-        var e_8, _a;
+        var e_10, _a;
         if (pens === void 0) { pens = this.store.data.pens; }
         !rect && (rect = this.getPenRect(this.getRect(pens)));
         var initPens = deepClone(pens); // 原 pens ，深拷贝一下
@@ -3535,12 +3640,12 @@ var Meta2d = /** @class */ (function () {
                 this.alignPen(align, item, rect);
             }
         }
-        catch (e_8_1) { e_8 = { error: e_8_1 }; }
+        catch (e_10_1) { e_10 = { error: e_10_1 }; }
         finally {
             try {
                 if (pens_1_1 && !pens_1_1.done && (_a = pens_1.return)) _a.call(pens_1);
             }
-            finally { if (e_8) throw e_8.error; }
+            finally { if (e_10) throw e_10.error; }
         }
         this.initImageCanvas(pens);
         this.initTemplateCanvas(pens);
@@ -3553,7 +3658,7 @@ var Meta2d = /** @class */ (function () {
     };
     //对齐大屏
     Meta2d.prototype.alignNodesV = function (align, pens) {
-        var e_9, _a;
+        var e_11, _a;
         if (pens === void 0) { pens = this.store.data.pens; }
         var width = this.store.data.width || this.store.options.width;
         var height = this.store.data.height || this.store.options.height;
@@ -3570,12 +3675,12 @@ var Meta2d = /** @class */ (function () {
                 this.alignPen(align, item, rect);
             }
         }
-        catch (e_9_1) { e_9 = { error: e_9_1 }; }
+        catch (e_11_1) { e_11 = { error: e_11_1 }; }
         finally {
             try {
                 if (pens_2_1 && !pens_2_1.done && (_a = pens_2.return)) _a.call(pens_2);
             }
-            finally { if (e_9) throw e_9.error; }
+            finally { if (e_11) throw e_11.error; }
         }
         this.initImageCanvas(pens);
         this.initTemplateCanvas(pens);
@@ -3670,7 +3775,7 @@ var Meta2d = /** @class */ (function () {
      * @param distance 总的宽 or 高
      */
     Meta2d.prototype.spaceBetweenByDirection = function (direction, pens, distance) {
-        var e_10, _a;
+        var e_12, _a;
         var _this = this;
         if (pens === void 0) { pens = this.store.data.pens; }
         !distance && (distance = this.getPenRect(this.getRect(pens))[direction]);
@@ -3704,12 +3809,12 @@ var Meta2d = /** @class */ (function () {
                 this.setValue(__assign({ id: pen.id }, penRect), { render: false, doEvent: false });
             }
         }
-        catch (e_10_1) { e_10 = { error: e_10_1 }; }
+        catch (e_12_1) { e_12 = { error: e_12_1 }; }
         finally {
             try {
                 if (pens_3_1 && !pens_3_1.done && (_a = pens_3.return)) _a.call(pens_3);
             }
-            finally { if (e_10) throw e_10.error; }
+            finally { if (e_12) throw e_12.error; }
         }
         this.initImageCanvas(pens);
         this.initTemplateCanvas(pens);
@@ -3773,6 +3878,7 @@ var Meta2d = /** @class */ (function () {
         });
     };
     Meta2d.prototype.gotoView = function (pen) {
+        var e_13, _a;
         var center = this.getViewCenter();
         var x = center.x -
             pen.calculative.worldRect.x -
@@ -3785,6 +3891,19 @@ var Meta2d = /** @class */ (function () {
         }
         this.store.data.x = x;
         this.store.data.y = y;
+        try {
+            for (var _b = __values(this.store.data.pens), _c = _b.next(); !_c.done; _c = _b.next()) {
+                var pen_1 = _c.value;
+                calcInView(pen_1);
+            }
+        }
+        catch (e_13_1) { e_13 = { error: e_13_1 }; }
+        finally {
+            try {
+                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+            }
+            finally { if (e_13) throw e_13.error; }
+        }
         this.canvas.canvasImage.init();
         this.canvas.canvasImageBottom.init();
         this.render();
@@ -3830,7 +3949,7 @@ var Meta2d = /** @class */ (function () {
      * @param pens pen 置顶的画笔
      */
     Meta2d.prototype.top = function (pens) {
-        var e_11, _a;
+        var e_14, _a;
         var _this = this;
         if (!pens)
             pens = this.store.active;
@@ -3859,12 +3978,12 @@ var Meta2d = /** @class */ (function () {
                 _loop_3(pen);
             }
         }
-        catch (e_11_1) { e_11 = { error: e_11_1 }; }
+        catch (e_14_1) { e_14 = { error: e_14_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_11) throw e_11.error; }
+            finally { if (e_14) throw e_14.error; }
         }
         this.store.emitter.emit('layer', { type: 'top', pens: pens });
     };
@@ -3888,7 +4007,7 @@ var Meta2d = /** @class */ (function () {
      * @param pens 画笔们，注意 pen 必须在该数组内才有效
      */
     Meta2d.prototype.bottom = function (pens) {
-        var e_12, _a;
+        var e_15, _a;
         if (!pens)
             pens = this.store.active;
         if (!Array.isArray(pens))
@@ -3898,15 +4017,15 @@ var Meta2d = /** @class */ (function () {
             var allIds = __spreadArray(__spreadArray([], __read(getAllChildren(pen, this_2.store)), false), [pen], false).map(function (p) { return p.id; });
             var allPens = _pens.filter(function (p) { return allIds.includes(p.id); });
             var _loop_5 = function (i) {
-                var pen_1 = allPens[i];
-                var index = _pens.findIndex(function (p) { return p.id === pen_1.id; });
+                var pen_2 = allPens[i];
+                var index = _pens.findIndex(function (p) { return p.id === pen_2.id; });
                 if (index > -1) {
                     _pens.unshift(_pens[index]);
                     _pens.splice(index + 1, 1);
-                    this_2.initTemplateCanvas([pen_1]);
-                    this_2.initImageCanvas([pen_1]);
+                    this_2.initTemplateCanvas([pen_2]);
+                    this_2.initImageCanvas([pen_2]);
                 }
-                this_2.specificLayerMove(pen_1, 'bottom');
+                this_2.specificLayerMove(pen_2, 'bottom');
             };
             // 从后往前，保证 allPens 顺序不变
             for (var i = allPens.length - 1; i >= 0; i--) {
@@ -3920,12 +4039,12 @@ var Meta2d = /** @class */ (function () {
                 _loop_4(pen);
             }
         }
-        catch (e_12_1) { e_12 = { error: e_12_1 }; }
+        catch (e_15_1) { e_15 = { error: e_15_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_12) throw e_12.error; }
+            finally { if (e_15) throw e_15.error; }
         }
         this.store.emitter.emit('layer', { type: 'bottom', pens: pens });
     };
@@ -3935,7 +4054,7 @@ var Meta2d = /** @class */ (function () {
      * @param pen 画笔
      */
     Meta2d.prototype.upByArea = function (pen) {
-        var _a, e_13, _b;
+        var _a, e_16, _b;
         var _this = this;
         var index = this.store.data.pens.findIndex(function (p) { return p.id === pen.id; });
         if (index === -1) {
@@ -3971,8 +4090,8 @@ var Meta2d = /** @class */ (function () {
             return;
         }
         (_a = this.store.data.pens).splice.apply(_a, __spreadArray([nextHitIndex + 1, 0], __read(allPens), false));
-        var _loop_6 = function (pen_2) {
-            var index_1 = this_3.store.data.pens.findIndex(function (p) { return p.id === pen_2.id; });
+        var _loop_6 = function (pen_3) {
+            var index_1 = this_3.store.data.pens.findIndex(function (p) { return p.id === pen_3.id; });
             if (index_1 > -1) {
                 this_3.store.data.pens.splice(index_1, 1);
             }
@@ -3981,16 +4100,16 @@ var Meta2d = /** @class */ (function () {
         try {
             // 删除靠前的 allPens
             for (var allPens_1 = __values(allPens), allPens_1_1 = allPens_1.next(); !allPens_1_1.done; allPens_1_1 = allPens_1.next()) {
-                var pen_2 = allPens_1_1.value;
-                _loop_6(pen_2);
+                var pen_3 = allPens_1_1.value;
+                _loop_6(pen_3);
             }
         }
-        catch (e_13_1) { e_13 = { error: e_13_1 }; }
+        catch (e_16_1) { e_16 = { error: e_16_1 }; }
         finally {
             try {
                 if (allPens_1_1 && !allPens_1_1.done && (_b = allPens_1.return)) _b.call(allPens_1);
             }
-            finally { if (e_13) throw e_13.error; }
+            finally { if (e_16) throw e_16.error; }
         }
         this.initImageCanvas([pen]);
     };
@@ -4044,7 +4163,7 @@ var Meta2d = /** @class */ (function () {
      * @param pens 画笔
      */
     Meta2d.prototype.up = function (pens) {
-        var e_14, _a;
+        var e_17, _a;
         var _this = this;
         if (!pens)
             pens = this.store.active;
@@ -4099,12 +4218,12 @@ var Meta2d = /** @class */ (function () {
                 _loop_7(pen);
             }
         }
-        catch (e_14_1) { e_14 = { error: e_14_1 }; }
+        catch (e_17_1) { e_17 = { error: e_17_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_14) throw e_14.error; }
+            finally { if (e_17) throw e_17.error; }
         }
         this.store.emitter.emit('layer', { type: 'up', pens: pens });
     };
@@ -4113,7 +4232,7 @@ var Meta2d = /** @class */ (function () {
      * @param pen 画笔
      */
     Meta2d.prototype.down = function (pens) {
-        var e_15, _a;
+        var e_18, _a;
         var _this = this;
         if (!pens)
             pens = this.store.active;
@@ -4170,12 +4289,12 @@ var Meta2d = /** @class */ (function () {
                 _loop_9(pen);
             }
         }
-        catch (e_15_1) { e_15 = { error: e_15_1 }; }
+        catch (e_18_1) { e_18 = { error: e_18_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_15) throw e_15.error; }
+            finally { if (e_18) throw e_18.error; }
         }
         this.store.emitter.emit('layer', { type: 'down', pens: pens });
     };
@@ -4255,7 +4374,7 @@ var Meta2d = /** @class */ (function () {
             var nextNodes_1 = [];
             // 2. 遍历出线的 nextNode
             lines.forEach(function (line) {
-                var e_16, _a;
+                var e_19, _a;
                 var lineNextNode = _this.nextNode(line);
                 var _loop_11 = function (node) {
                     var have = nextNodes_1.find(function (next) { return next.id === node.id; });
@@ -4268,12 +4387,12 @@ var Meta2d = /** @class */ (function () {
                         _loop_11(node);
                     }
                 }
-                catch (e_16_1) { e_16 = { error: e_16_1 }; }
+                catch (e_19_1) { e_19 = { error: e_19_1 }; }
                 finally {
                     try {
                         if (lineNextNode_1_1 && !lineNextNode_1_1.done && (_a = lineNextNode_1.return)) _a.call(lineNextNode_1);
                     }
-                    finally { if (e_16) throw e_16.error; }
+                    finally { if (e_19) throw e_19.error; }
                 }
             });
             return nextNodes_1;
@@ -4296,7 +4415,7 @@ var Meta2d = /** @class */ (function () {
             var preNodes_1 = [];
             // 2. 遍历入线的 preNode
             lines.forEach(function (line) {
-                var e_17, _a;
+                var e_20, _a;
                 var linePreNode = _this.previousNode(line);
                 var _loop_12 = function (node) {
                     var have = preNodes_1.find(function (pre) { return pre.id === node.id; });
@@ -4309,12 +4428,12 @@ var Meta2d = /** @class */ (function () {
                         _loop_12(node);
                     }
                 }
-                catch (e_17_1) { e_17 = { error: e_17_1 }; }
+                catch (e_20_1) { e_20 = { error: e_20_1 }; }
                 finally {
                     try {
                         if (linePreNode_1_1 && !linePreNode_1_1.done && (_a = linePreNode_1.return)) _a.call(linePreNode_1);
                     }
-                    finally { if (e_17) throw e_17.error; }
+                    finally { if (e_20) throw e_20.error; }
                 }
             });
             return preNodes_1;
@@ -4661,7 +4780,7 @@ var Meta2d = /** @class */ (function () {
         });
     };
     Meta2d.prototype.setVisible = function (pen, visible, render) {
-        var e_18, _a;
+        var e_21, _a;
         if (render === void 0) { render = true; }
         this.onSizeUpdate();
         this.setValue({ id: pen.id, visible: visible }, { render: false, doEvent: false });
@@ -4673,12 +4792,12 @@ var Meta2d = /** @class */ (function () {
                     child && this.setVisible(child, visible, false);
                 }
             }
-            catch (e_18_1) { e_18 = { error: e_18_1 }; }
+            catch (e_21_1) { e_21 = { error: e_21_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_18) throw e_18.error; }
+                finally { if (e_21) throw e_21.error; }
             }
         }
         var allPens = getAllChildren(pen, this.store);