@meta2d/core 1.0.54 → 1.0.55

package/src/core.d.ts

@@ -92,6 +92,7 @@ export declare class Meta2d {
      * open 后执行初始化 Js ，每个图纸可配置一个初始化 js
      */
     private doInitJS;
+    doInitFn(): void;
     drawLine(lineName?: string): void;
     alignPenToGrid(pen: Pen): void;
     drawingPencil(): void;
@@ -251,6 +252,7 @@ export declare class Meta2d {
     clearRuleLines(): void;
     private onEvent;
     private doEvent;
+    doMessageEvent(eventName: string): void;
     doDataEvent: (datas: {
         dataId?: string;
         id?: string;

package/src/core.js

@@ -193,31 +193,7 @@ var Meta2d = /** @class */ (function () {
                     _this.store.data.locked && e && (!e.disabled) && _this.doEvent(e, eventName);
                     break;
             }
-            if (_this.store.messageEvents[eventName]) {
-                _this.store.messageEvents[eventName].forEach(function (item) {
-                    var flag = false;
-                    if (item.event.conditions && item.event.conditions.length) {
-                        if (item.event.conditionType === 'and') {
-                            flag = item.event.conditions.every(function (condition) {
-                                return _this.judgeCondition(item.pen, condition.key, condition);
-                            });
-                        }
-                        else if (item.event.conditionType === 'or') {
-                            flag = item.event.conditions.some(function (condition) {
-                                return _this.judgeCondition(item.pen, condition.key, condition);
-                            });
-                        }
-                    }
-                    else {
-                        flag = true;
-                    }
-                    if (flag) {
-                        item.event.actions.forEach(function (action) {
-                            _this.events[action.action](item.pen, action);
-                        });
-                    }
-                });
-            }
+            _this.doMessageEvent(eventName);
         };
         this.doEvent = function (pen, eventName) {
             var e_1, _a, e_2, _b;
@@ -856,10 +832,17 @@ var Meta2d = /** @class */ (function () {
         };
         this.events[EventAction.Dialog] = function (pen, e) {
             if (e.params &&
-                typeof e.params === 'string' &&
-                e.value &&
-                typeof e.value === 'string') {
-                _this.canvas.dialog.show(e.value, e.params);
+                typeof e.params === 'string') {
+                var url_1 = e.params;
+                if (e.params.includes('${')) {
+                    var keys = e.params.match(/(?<=\$\{).*?(?=\})/g);
+                    if (keys) {
+                        keys === null || keys === void 0 ? void 0 : keys.forEach(function (key) {
+                            url_1 = url_1.replace("${" + key + "}", pen[key]);
+                        });
+                    }
+                }
+                _this.canvas.dialog.show(e.value, url_1, e.extend);
             }
         };
         this.events[EventAction.SendData] = function (pen, e) {
@@ -950,7 +933,7 @@ var Meta2d = /** @class */ (function () {
     Meta2d.prototype.sendDataToNetWork = function (value, pen, e) {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var network, i, keys, params, url_1, keys, res, data, fnJs, clients_1, mqttClient_1, websockets, websocket_1;
+            var network, i, keys, params, url_2, keys, res, data, fnJs, clients_1, mqttClient_1, websockets, websocket_1;
             var _this = this;
             return __generator(this, function (_b) {
                 switch (_b.label) {
@@ -975,7 +958,7 @@ var Meta2d = /** @class */ (function () {
                             }
                         }
                         params = undefined;
-                        url_1 = network.url;
+                        url_2 = network.url;
                         if (network.method === 'GET') {
                             params =
                                 '?' +
@@ -984,16 +967,16 @@ var Meta2d = /** @class */ (function () {
                                         .join('&');
                         }
                         if (network.method === 'POST') {
-                            if (url_1.indexOf('${') > -1) {
-                                keys = url_1.match(/(?<=\$\{).*?(?=\})/g);
+                            if (url_2.indexOf('${') > -1) {
+                                keys = url_2.match(/(?<=\$\{).*?(?=\})/g);
                                 if (keys) {
                                     keys.forEach(function (key) {
-                                        url_1 = url_1.replace("${" + key + "}", getter(pen, key) || _this.getDynamicParam(key));
+                                        url_2 = url_2.replace("${" + key + "}", getter(pen, key) || _this.getDynamicParam(key));
                                     });
                                 }
                             }
                         }
-                        return [4 /*yield*/, fetch(url_1 + (params ? params : ''), {
+                        return [4 /*yield*/, fetch(url_2 + (params ? params : ''), {
                                 headers: network.headers || {},
                                 method: network.method,
                                 body: network.method === 'POST' ? JSON.stringify(value) : undefined,
@@ -1256,6 +1239,7 @@ var Meta2d = /** @class */ (function () {
         this.startAnimate();
         this.startVideo();
         this.doInitJS();
+        this.doInitFn();
         if (this.store.data.iconUrls) {
             try {
                 for (var _j = __values(this.store.data.iconUrls), _k = _j.next(); !_k.done; _k = _j.next()) {
@@ -1394,6 +1378,24 @@ var Meta2d = /** @class */ (function () {
             }
         }
     };
+    Meta2d.prototype.doInitFn = function () {
+        var params = queryURLParams();
+        var binds = [];
+        for (var key in params) {
+            if (params.hasOwnProperty(key)) {
+                if (key.startsWith('bind-')) {
+                    binds.push({
+                        id: key.replace('bind-', ''),
+                        dataId: key.replace('bind-', ''),
+                        value: params[key]
+                    });
+                }
+            }
+        }
+        if (binds.length) {
+            this.setDatas(binds, { history: false });
+        }
+    };
     Meta2d.prototype.drawLine = function (lineName) {
         lineName && lockedError(this.store);
         this.canvas.drawingLineName = lineName;
@@ -3023,6 +3025,34 @@ var Meta2d = /** @class */ (function () {
     Meta2d.prototype.clearRuleLines = function () {
         this.canvas.clearRuleLines();
     };
+    Meta2d.prototype.doMessageEvent = function (eventName) {
+        var _this = this;
+        if (this.store.messageEvents[eventName]) {
+            this.store.messageEvents[eventName].forEach(function (item) {
+                var flag = false;
+                if (item.event.conditions && item.event.conditions.length) {
+                    if (item.event.conditionType === 'and') {
+                        flag = item.event.conditions.every(function (condition) {
+                            return _this.judgeCondition(item.pen, condition.key, condition);
+                        });
+                    }
+                    else if (item.event.conditionType === 'or') {
+                        flag = item.event.conditions.some(function (condition) {
+                            return _this.judgeCondition(item.pen, condition.key, condition);
+                        });
+                    }
+                }
+                else {
+                    flag = true;
+                }
+                if (flag) {
+                    item.event.actions.forEach(function (action) {
+                        _this.events[action.action](item.pen, action);
+                    });
+                }
+            });
+        }
+    };
     Meta2d.prototype.initGlobalTriggers = function () {
         var _this = this;
         var _a;
@@ -3215,6 +3245,7 @@ var Meta2d = /** @class */ (function () {
             var childRect = calcRelativeRect(pen.calculative.worldRect, parent.calculative.worldRect);
             Object.assign(pen, childRect);
             pen.locked = (_a = pen.lockedOnCombine) !== null && _a !== void 0 ? _a : LockState.DisableMove;
+            pen.locked = (pen.interaction || isInteraction.includes(pen.name)) ? 0 : pen.locked;
             if (!oldPen) {
                 addPens.push(deepClone(pen, true));
             }