@meta2d/core 1.1.20 → 1.1.22

package/src/core.d.ts

@@ -270,10 +270,10 @@ export declare class Meta2d {
     iotAggregatePublish(item: any): void;
     closeIot(): void;
     connectSqls(): void;
-    connectSSE(net: Network): void;
+    connectSSE(net: Network): Promise<void>;
     closeSSE(): void;
-    connectNetMqtt(net: Network): void;
-    connectNetWebSocket(net: Network): void;
+    connectNetMqtt(net: Network): Promise<void>;
+    connectNetWebSocket(net: Network): Promise<void>;
     getMqttUrl(): Promise<{
         username: any;
         password: any;

package/src/core.js

@@ -695,6 +695,8 @@ export class Meta2d {
         //图纸更新
         const data = await getMeta2dData(this.store, id);
         if (data) {
+            data.locked = 1;
+            data.fits?.length && (globalThis.meta2dData = JSON.stringify(data));
             this.canvas.opening = true;
             this.open(data);
             this.lock(1);
@@ -1694,6 +1696,9 @@ export class Meta2d {
                 }
                 if (index !== -1 && index !== undefined) {
                     const animate = deepClone(pen.animations[index]);
+                    if (!animate.animateCycle) {
+                        animate.animateCycle = 0;
+                    }
                     animate.animateName = animate.name;
                     delete animate.name;
                     animate.currentAnimation = index;
@@ -2681,10 +2686,19 @@ export class Meta2d {
             });
         }
     }
-    connectSSE(net) {
+    async connectSSE(net) {
         if (net.enable === false) {
             return;
         }
+        if (net.preJs) {
+            if (!net.preFn) {
+                const AsyncFunction = Object.getPrototypeOf(async function () { }).constructor;
+                net.preFn = new AsyncFunction('network', net.preJs);
+            }
+            if (net.preFn) {
+                net = await net.preFn(net);
+            }
+        }
         this.eventSources[net.index] = new EventSource(net.url, { withCredentials: net.withCredentials });
         this.eventSources[net.index].onmessage = (e) => {
             this.socketCallback(e.data, { type: 'SSE', url: net.url, name: net.name, net });
@@ -2702,10 +2716,19 @@ export class Meta2d {
                 }
             });
     }
-    connectNetMqtt(net) {
+    async connectNetMqtt(net) {
         if (net.enable === false) {
             return;
         }
+        if (net.preJs) {
+            if (!net.preFn) {
+                const AsyncFunction = Object.getPrototypeOf(async function () { }).constructor;
+                net.preFn = new AsyncFunction('network', net.preJs);
+            }
+            if (net.preFn) {
+                net = await net.preFn(net);
+            }
+        }
         if (net.options.clientId && !net.options.customClientId) {
             net.options.clientId = s8();
         }
@@ -2806,7 +2829,7 @@ export class Meta2d {
             }
         });
     }
-    connectNetWebSocket(net) {
+    async connectNetWebSocket(net) {
         if (this.websockets[net.index]) {
             this.websockets[net.index].onclose = undefined;
             this.websockets[net.index]?.close();
@@ -2815,6 +2838,15 @@ export class Meta2d {
         if (net.enable === false) {
             return;
         }
+        if (net.preJs) {
+            if (!net.preFn) {
+                const AsyncFunction = Object.getPrototypeOf(async function () { }).constructor;
+                net.preFn = new AsyncFunction('network', net.preJs);
+            }
+            if (net.preFn) {
+                net = await net.preFn(net);
+            }
+        }
         let url = net.url;
         if (url.indexOf('${') > -1) {
             let keys = url.match(/\$\{([^}]+)\}/g)?.map(m => m.slice(2, -1));
@@ -3144,6 +3176,9 @@ export class Meta2d {
         }
     }
     penNetwork(pen) {
+        if (!pen.apiUrl) {
+            return;
+        }
         const penNetwork = {
             url: pen.apiUrl,
             method: pen.apiMethod,
@@ -3239,6 +3274,16 @@ export class Meta2d {
     }
     async requestHttp(_req) {
         let req = deepClone(_req);
+        const net = this.store.data.networks?.filter((item) => item.protocol === 'http')[req.index];
+        if (net?.preJs) {
+            if (!net.preFn) {
+                const AsyncFunction = Object.getPrototypeOf(async function () { }).constructor;
+                net.preFn = new AsyncFunction('network', net.preJs);
+            }
+            if (net.preFn) {
+                req = await net.preFn(req);
+            }
+        }
         if (req.url) {
             if (req.url.indexOf('${') > -1) {
                 let keys = req.url.match(/\$\{([^}]+)\}/g)?.map(m => m.slice(2, -1));
@@ -3298,7 +3343,6 @@ export class Meta2d {
             });
             if (res.ok) {
                 const data = await res.text();
-                const net = this.store.data.networks.filter(item => item.protocol === 'http')[req.index];
                 this.socketCallback(data, { type: 'http', method: req.method, url: req.url, name: req.name, net });
             }
             else {
@@ -3874,11 +3918,9 @@ export class Meta2d {
                     }
                     event.actions.forEach((action) => {
                         if (action.timeout) {
-                            let timer = setTimeout(() => {
+                            setTimeout(() => {
                                 if (this.events[action.action]) {
                                     this.events[action.action](pen, action);
-                                    clearTimeout(timer);
-                                    timer = null;
                                 }
                             }, action.timeout);
                         }
@@ -3924,11 +3966,9 @@ export class Meta2d {
                     if (indexArr.includes(index)) {
                         trigger.actions?.forEach((event) => {
                             if (event.timeout) {
-                                let timer = setTimeout(() => {
+                                setTimeout(() => {
                                     if (this.events[event.action]) {
                                         this.events[event.action](pen, event);
-                                        clearTimeout(timer);
-                                        timer = null;
                                     }
                                 }, event.timeout);
                             }
@@ -3967,11 +4007,9 @@ export class Meta2d {
                 if (indexArr.includes(index)) {
                     trigger.actions?.forEach((event) => {
                         if (event.timeout) {
-                            let timer = setTimeout(() => {
+                            setTimeout(() => {
                                 if (this.events[event.action]) {
                                     this.events[event.action](pen, event);
-                                    clearTimeout(timer);
-                                    timer = null;
                                 }
                             }, event.timeout);
                         }
@@ -4006,11 +4044,9 @@ export class Meta2d {
                             if (flag) {
                                 state.actions?.forEach((event) => {
                                     if (event.timeout) {
-                                        let timer = setTimeout(() => {
+                                        setTimeout(() => {
                                             if (this.events[event.action]) {
                                                 this.events[event.action](pen, event);
-                                                clearTimeout(timer);
-                                                timer = null;
                                             }
                                         }, event.timeout);
                                     }
@@ -4049,7 +4085,14 @@ export class Meta2d {
                 }
                 if (flag) {
                     item.event.actions.forEach((action) => {
-                        this.events[action.action](item.pen, action, data);
+                        if (action.timeout) {
+                            setTimeout(() => {
+                                this.events[action.action](item.pen, action, data);
+                            }, action.timeout);
+                        }
+                        else {
+                            this.events[action.action](item.pen, action, data);
+                        }
                     });
                 }
             });
@@ -5653,7 +5696,11 @@ export class Meta2d {
             }
             this.setValue({ id: pen.id, canvasLayer: layer }, { render: false, doEvent: false, history: false });
         }
-        else if (pen.externElement || pen.name === 'gif') {
+        else if (pen.name.endsWith('Dom') ||
+            isDomShapes.includes(pen.name) ||
+            this.store.options.domShapes.includes(pen.name) ||
+            pen.externElement ||
+            pen.name === 'gif') {
             let zIndex = 0;
             // let zIndex = pen.calculative.zIndex === undefined ? 5 : pen.calculative.zIndex + 1;
             if (type === 'top') {