@meta2d/core 1.0.44 → 1.0.46

package/src/core.d.ts

@@ -27,7 +27,7 @@ export declare class Meta2d {
         type?: string;
         topic?: string;
         url?: string;
-    }) => boolean;
+    }) => boolean | string;
     events: Record<number, (pen: Pen, e: Event) => void>;
     map: ViewMap;
     mapTimer: any;
@@ -158,6 +158,7 @@ export declare class Meta2d {
      */
     combine(pens?: Pen[], showChild?: number): void;
     uncombine(pen?: Pen): void;
+    appendChild(pens?: Pen[]): void;
     isCombine(pen: Pen): boolean;
     active(pens: Pen[], emit?: boolean): void;
     inactive(): void;

package/src/core.js

@@ -187,9 +187,27 @@ var Meta2d = /** @class */ (function () {
             }
             if (_this.store.messageEvents[eventName]) {
                 _this.store.messageEvents[eventName].forEach(function (item) {
-                    item.event.actions.forEach(function (action) {
-                        _this.events[action.action](item.pen, action);
-                    });
+                    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);
+                        });
+                    }
                 });
             }
         };
@@ -553,7 +571,9 @@ var Meta2d = /** @class */ (function () {
                 var pens = e.params ? _this.find(e.params) : _this.find(pen.id);
                 pens.forEach(function (pen) {
                     if (value.hasOwnProperty('visible')) {
-                        _this.setVisible(pen, value.visible);
+                        if (pen.visible !== value.visible) {
+                            _this.setVisible(pen, value.visible);
+                        }
                     }
                     _this.setValue(__assign({ id: pen.id }, value), { render: false, doEvent: false });
                 });
@@ -589,6 +609,17 @@ var Meta2d = /** @class */ (function () {
         };
         this.events[EventAction.StopAnimate] = function (pen, e) {
             if (!e.value || typeof e.value === 'string') {
+                if (e.value) {
+                    var _pen = _this.findOne(e.value);
+                    if (!_this.store.animates.has(_pen)) {
+                        return;
+                    }
+                }
+                else {
+                    if (!_this.store.animates.has(pen)) {
+                        return;
+                    }
+                }
                 _this.stopAnimate(e.value || [pen]);
                 return;
             }
@@ -1425,6 +1456,9 @@ var Meta2d = /** @class */ (function () {
         else {
             pens = idOrTagOrPens;
         }
+        if (!pens.length) {
+            return;
+        }
         pens.forEach(function (pen) {
             var _a, _b;
             if (pen.calculative.pause) {
@@ -1477,8 +1511,9 @@ var Meta2d = /** @class */ (function () {
                 }
             }
         });
-        this.canvas.canvasImage.init();
-        this.canvas.canvasImageBottom.init();
+        // this.canvas.canvasImage.init();
+        // this.canvas.canvasImageBottom.init();
+        this.initImageCanvas(pens);
         this.canvas.animate();
     };
     Meta2d.prototype.pauseAnimate = function (idOrTagOrPens) {
@@ -1738,6 +1773,28 @@ var Meta2d = /** @class */ (function () {
         }
         this.inactive();
     };
+    Meta2d.prototype.appendChild = function (pens) {
+        if (pens === void 0) { pens = this.store.active; }
+        if (!pens) {
+            return;
+        }
+        if (pens.length < 2) {
+            return;
+        }
+        var pIdx = pens.findIndex(function (pen) { return pen.name === 'combine' && pen.showChild !== undefined; });
+        if (pIdx !== -1) {
+            var parent_1 = pens[pIdx];
+            this.pushChildren(parent_1, __spreadArray(__spreadArray([], __read(pens.slice(0, pIdx)), false), __read(pens.slice(pIdx + 1)), false));
+            pens.forEach(function (pen) {
+                calcInView(pen, true);
+            });
+            this.initImageCanvas(pens);
+            this.render();
+        }
+        else {
+            console.warn('Invalid operation!');
+        }
+    };
     Meta2d.prototype.isCombine = function (pen) {
         if (pen.name === 'combine') {
             return true;
@@ -2275,7 +2332,7 @@ var Meta2d = /** @class */ (function () {
                 // https.forEach(async (_item) => {
                 //   this.requestHttp(_item);
                 // });
-                // this.render();
+                _this.render();
             }, this.store.data.networkInterval || 1000);
         }
         https.forEach(function (_item, index) {
@@ -2297,17 +2354,21 @@ var Meta2d = /** @class */ (function () {
                         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.headers[i] === 'string') {
+                                    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]));
+                                if (typeof req.body[i] === 'string') {
+                                    keys = req.body[i].match(/(?<=\$\{).*?(?=\})/g);
+                                    if (keys) {
+                                        req.body[i] = req.body[i].replace("${" + keys[0] + "}", this.getDynamicParam(keys[0]));
+                                    }
                                 }
                             }
                         }
@@ -2351,22 +2412,28 @@ var Meta2d = /** @class */ (function () {
     Meta2d.prototype.socketCallback = function (message, context) {
         var _this = this;
         this.store.emitter.emit('socket', { message: message, context: context });
-        if (this.socketFn &&
-            !this.socketFn(message, {
+        var _message = message;
+        if (this.socketFn) {
+            _message = this.socketFn(message, {
                 meta2d: this,
                 type: context.type,
                 topic: context.topic,
                 url: context.url,
-            })) {
-            return;
+            });
+            if (!_message) {
+                return;
+            }
+        }
+        if (_message === true) {
+            _message = message;
         }
         var data;
-        if (message.constructor === Object || message.constructor === Array) {
-            data = message;
+        if (_message.constructor === Object || _message.constructor === Array) {
+            data = _message;
         }
-        else if (typeof message === 'string') {
+        else if (typeof _message === 'string') {
             try {
-                data = JSON.parse(message);
+                data = JSON.parse(_message);
             }
             catch (error) {
                 console.warn('Invalid socket data:', data, error);