@meta2d/core 1.0.42 → 1.0.43

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@meta2d/core",
-    "version": "1.0.42",
+    "version": "1.0.43",
     "description": "@meta2d/core: Powerful, Beautiful, Simple, Open - Web-Based 2D At Its Best .",
     "main": "index.js",
     "types": "index.d.ts",

package/src/core.d.ts

@@ -55,6 +55,7 @@ export declare class Meta2d {
     set beforeRemoveAnchor(fn: (pen: Pen, anchor: Point) => Promise<boolean>);
     setOptions(opts?: Options): void;
     getOptions(): Options;
+    setTheme(theme: string): void;
     setDatabyOptions(options?: Options): void;
     private init;
     initEventFns(): void;
@@ -201,6 +202,7 @@ export declare class Meta2d {
     sendDatabyHttp(data: string): Promise<void>;
     closeHttp(): void;
     updateTimer: any;
+    updateTimerList: any[];
     connectNetwork(): void;
     randomString(e: number): string;
     penMock(pen: Pen): void;

package/src/core.js

@@ -113,6 +113,7 @@ var Meta2d = /** @class */ (function () {
         this.registerCanvasDraw = registerCanvasDraw;
         this.registerAnchors = registerAnchors;
         this.httpTimerList = [];
+        this.updateTimerList = [];
         this.onEvent = function (eventName, e) {
             switch (eventName) {
                 case 'add':
@@ -187,11 +188,13 @@ var Meta2d = /** @class */ (function () {
             }
         };
         this.doEvent = function (pen, eventName) {
-            var _a, _b;
+            var _a, _b, _c, _e;
             if (!pen) {
                 return;
             }
-            (_a = pen.events) === null || _a === void 0 ? void 0 : _a.forEach(function (event) {
+            var old = false; //是否是旧的事件
+            var indexArr = []; //事件条件成立的索引
+            (_a = pen.events) === null || _a === void 0 ? void 0 : _a.forEach(function (event, index) {
                 var _a;
                 if (event.actions && event.actions.length) {
                     if (event.name === eventName) {
@@ -213,15 +216,17 @@ var Meta2d = /** @class */ (function () {
                             flag = true;
                         }
                         if (flag) {
-                            event.actions.forEach(function (action) {
-                                if (_this.events[action.action]) {
-                                    _this.events[action.action](pen, action);
-                                }
-                            });
+                            // event.actions.forEach((action) => {
+                            //   if (this.events[action.action]) {
+                            //     this.events[action.action](pen, action);
+                            //   }
+                            // });
+                            indexArr.push(index);
                         }
                     }
                 }
                 else {
+                    old = true;
                     if (_this.events[event.action] && event.name === eventName) {
                         var can = !((_a = event.where) === null || _a === void 0 ? void 0 : _a.type);
                         if (event.where) {
@@ -276,15 +281,37 @@ var Meta2d = /** @class */ (function () {
                                 }
                             }
                         }
-                        can && _this.events[event.action](pen, event);
+                        // can && this.events[event.action](pen, event);
+                        if (can) {
+                            indexArr.push(index);
+                        }
                     }
                 }
             });
+            //所有的条件判断后，再统一执行条件成立的事件
+            if (old) {
+                (_b = pen.events) === null || _b === void 0 ? void 0 : _b.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) {
+                    if (indexArr.includes(index)) {
+                        event.actions.forEach(function (action) {
+                            if (_this.events[action.action]) {
+                                _this.events[action.action](pen, action);
+                            }
+                        });
+                    }
+                });
+            }
             if (eventName === 'valueUpdate') {
-                (_b = pen.realTimes) === null || _b === void 0 ? void 0 : _b.forEach(function (realTime) {
-                    var _a;
-                    (_a = realTime.triggers) === null || _a === void 0 ? void 0 : _a.forEach(function (trigger) {
-                        var _a;
+                (_e = pen.realTimes) === null || _e === void 0 ? void 0 : _e.forEach(function (realTime) {
+                    var _a, _b;
+                    var indexArr = [];
+                    (_a = realTime.triggers) === null || _a === void 0 ? void 0 : _a.forEach(function (trigger, index) {
                         var flag = false;
                         if (trigger.conditionType === 'and') {
                             flag = trigger.conditions.every(function (condition) {
@@ -297,6 +324,16 @@ var Meta2d = /** @class */ (function () {
                             });
                         }
                         if (flag) {
+                            indexArr.push(index);
+                            // trigger.actions?.forEach((event) => {
+                            //   this.events[event.action](pen, event);
+                            // });
+                        }
+                    });
+                    //执行
+                    (_b = realTime.triggers) === null || _b === void 0 ? void 0 : _b.forEach(function (trigger, index) {
+                        var _a;
+                        if (indexArr.includes(index)) {
                             (_a = trigger.actions) === null || _a === void 0 ? void 0 : _a.forEach(function (event) {
                                 _this.events[event.action](pen, event);
                             });
@@ -428,6 +465,17 @@ var Meta2d = /** @class */ (function () {
     Meta2d.prototype.getOptions = function () {
         return this.store.options;
     };
+    Meta2d.prototype.setTheme = function (theme) {
+        this.store.data.theme = theme;
+        this.setBackgroundColor(this.store.theme[theme].background);
+        this.canvas.parentElement.style.background = this.store.theme[theme].parentBackground;
+        this.store.data.color = this.store.theme[theme].color;
+        this.setOptions({
+            ruleColor: this.store.theme[theme].ruleColor,
+            ruleOptions: this.store.theme[theme].ruleOptions
+        });
+        this.render();
+    };
     Meta2d.prototype.setDatabyOptions = function (options) {
         if (options === void 0) { options = {}; }
         var color = options.color, activeColor = options.activeColor, activeBackground = options.activeBackground, grid = options.grid, gridColor = options.gridColor, gridSize = options.gridSize, fromArrow = options.fromArrow, toArrow = options.toArrow, rule = options.rule, ruleColor = options.ruleColor, textColor = options.textColor;
@@ -1985,6 +2033,7 @@ var Meta2d = /** @class */ (function () {
                     else if (net.protocol === 'http') {
                         https.push({
                             url: net.url,
+                            interval: net.interval,
                             headers: net.headers || undefined,
                             method: net.method,
                             body: net.body,
@@ -2185,20 +2234,26 @@ var Meta2d = /** @class */ (function () {
                 });
             }); });
         }
-        this.updateTimer = setInterval(function () {
-            //模拟数据
-            enable &&
+        if (enable) {
+            this.updateTimer = setInterval(function () {
+                //模拟数据
                 _this.store.data.pens.forEach(function (pen) {
                     _this.penMock(pen);
                 });
-            https.forEach(function (_item) { return __awaiter(_this, void 0, void 0, function () {
+                // https.forEach(async (_item) => {
+                //   this.requestHttp(_item);
+                // });
+                // this.render();
+            }, this.store.data.networkInterval || 1000);
+        }
+        https.forEach(function (_item, index) {
+            _this.updateTimerList[index] = setInterval(function () { return __awaiter(_this, void 0, void 0, function () {
                 return __generator(this, function (_a) {
                     this.requestHttp(_item);
                     return [2 /*return*/];
                 });
-            }); });
-            _this.render();
-        }, this.store.data.networkInterval || 1000);
+            }); }, _item.interval || 1000);
+        });
     };
     Meta2d.prototype.requestHttp = function (_req) {
         return __awaiter(this, void 0, void 0, function () {
@@ -2255,6 +2310,11 @@ var Meta2d = /** @class */ (function () {
         this.websockets = undefined;
         clearInterval(this.updateTimer);
         this.updateTimer = undefined;
+        this.updateTimerList &&
+            this.updateTimerList.forEach(function (_updateTimer) {
+                clearInterval(_updateTimer);
+                _updateTimer = undefined;
+            });
     };
     Meta2d.prototype.socketCallback = function (message, context) {
         var _this = this;