@meta2d/core 1.0.74 → 1.0.76

package/src/core.d.ts

@@ -188,6 +188,7 @@ export declare class Meta2d {
      */
     combine(pens?: Pen[], showChild?: number, active?: boolean): any;
     uncombine(pen?: Pen): void;
+    clearCombine(pen?: Pen): void;
     appendChild(pens?: Pen[]): void;
     /***
      * 修改子图元大小，更新整个组合图元
@@ -248,6 +249,7 @@ export declare class Meta2d {
     updateTimerList: any[];
     sqlTimerList: any[];
     connectNetwork(): void;
+    reconnectNetwork(index: number): void;
     iotMqttClient: MqttClient;
     iotTimer: any;
     iotWebsocketClient: WebSocket;
@@ -255,6 +257,7 @@ export declare class Meta2d {
     connectSqls(): void;
     connectSSE(net: Network): void;
     closeSSE(): void;
+    connectNetMqtt(net: Network): void;
     connectNetWebSocket(net: Network): void;
     getMqttUrl(): Promise<string>;
     getIotToken(devices: any, type: number): Promise<any>;

package/src/core.js

@@ -182,7 +182,7 @@ export class Meta2d {
             ruleColor: this.store.theme[theme].ruleColor,
             ruleOptions: this.store.theme[theme].ruleOptions,
         });
-        // 更新全局的主题css变量 
+        // 更新全局的主题css变量
         le5leTheme.updateCssRule(this.store.id, theme);
         this.canvas.initGlobalStyle();
         for (let i = 0; i < this.store.data.pens.length; i++) {
@@ -418,7 +418,10 @@ export class Meta2d {
                         }
                     }
                 });
-                const data = this.getEventData(e.list, pen);
+                let data = this.getEventData(e.list, pen);
+                if (Object.keys(data).length) {
+                    data = null;
+                }
                 this.canvas.dialog.show(e.value, url, e.extend, data);
             }
         };
@@ -609,6 +612,7 @@ export class Meta2d {
         const data = await getMeta2dData(this.store, id);
         if (data) {
             this.open(data);
+            this.lock(1);
             this.fitView(true, 10);
         }
     }
@@ -834,7 +838,7 @@ export class Meta2d {
         this.clear(false, data?.template);
         this.canvas.autoPolylineFlag = true;
         if (data) {
-            // 根据图纸的主题设置主题 
+            // 根据图纸的主题设置主题
             if (data.theme) {
                 this.setTheme(data.theme);
             }
@@ -869,9 +873,9 @@ export class Meta2d {
             this.canvas.opening = true;
         }
         this.doInitJS();
-        this.doInitFn();
         this.initBindDatas();
         this.initBinds();
+        this.doInitFn();
         this.initMessageEvents();
         this.initGlobalTriggers();
         this.startAnimate();
@@ -1689,6 +1693,43 @@ export class Meta2d {
         }
         this.inactive();
     }
+    clearCombine(pen) {
+        if (!pen && this.store.active) {
+            pen = this.store.active[0];
+        }
+        if (!pen || !pen.children) {
+            return;
+        }
+        const children = getAllChildren(pen, this.store);
+        children.forEach((child) => {
+            child.parentId = undefined;
+            child.x = child.calculative.worldRect.x;
+            child.y = child.calculative.worldRect.y;
+            child.width = child.calculative.worldRect.width;
+            child.height = child.calculative.worldRect.height;
+            child.locked = LockState.None;
+            child.calculative.active = undefined;
+            child.calculative.hover = false;
+            if (child.showChild !== undefined) {
+                this.setVisible(child, true);
+            }
+            child.children = undefined;
+        });
+        const combineArr = [];
+        children.forEach((child, index) => {
+            if (child.name === 'combine') {
+                child.children = undefined;
+                combineArr.push(child);
+            }
+        });
+        this.delete(combineArr, true, false);
+        pen.children = undefined;
+        if (this.isCombine(pen)) {
+            this.delete([pen], true, false);
+        }
+        //未考虑历史记录
+        this.inactive();
+    }
     appendChild(pens = this.store.active) {
         if (!pens) {
             return;
@@ -2085,44 +2126,15 @@ export class Meta2d {
         const { networks } = this.store.data;
         const https = [];
         if (networks) {
-            let mqttIndex = 0;
+            let mqttIndex = 0, httpIndex = 0, websocketIndex = 0, sseIndex = 0;
             this.mqttClients = [];
-            let websocketIndex = 0;
-            let sseIndex = 0;
-            let sqlIndex = 0;
             this.websockets = [];
             this.eventSources = [];
             networks.forEach(async (net) => {
                 // if (net.type === 'subscribe') {
                 if (net.protocol === 'mqtt') {
                     net.index = mqttIndex;
-                    if (net.options.clientId && !net.options.customClientId) {
-                        net.options.clientId = s8();
-                    }
-                    net.times = 0;
-                    this.mqttClients[mqttIndex] = mqtt.connect(net.url, net.options);
-                    this.mqttClients[mqttIndex].on('message', (topic, message) => {
-                        this.socketCallback(message.toString(), {
-                            topic,
-                            type: 'mqtt',
-                            url: net.url,
-                        });
-                    });
-                    this.mqttClients[mqttIndex].on('error', (error) => {
-                        this.store.emitter.emit('error', { type: 'mqtt', error });
-                    });
-                    this.mqttClients[mqttIndex].on('close', () => {
-                        if (this.store.options.reconnetTimes) {
-                            net.times++;
-                            if (net.times >= this.store.options.reconnetTimes) {
-                                net.times = 0;
-                                this.mqttClients && this.mqttClients[net.index]?.end();
-                            }
-                        }
-                    });
-                    if (net.topics) {
-                        this.mqttClients[mqttIndex].subscribe(net.topics.split(','));
-                    }
+                    this.connectNetMqtt(net);
                     mqttIndex += 1;
                 }
                 else if (net.protocol === 'websocket') {
@@ -2152,6 +2164,7 @@ export class Meta2d {
                     websocketIndex += 1;
                 }
                 else if (net.protocol === 'http') {
+                    net.index = httpIndex;
                     https.push({
                         url: net.url,
                         interval: net.interval,
@@ -2159,6 +2172,7 @@ export class Meta2d {
                         method: net.method,
                         body: net.body,
                     });
+                    httpIndex += 1;
                 }
                 else if (net.protocol === 'ADIIOT') {
                     connectJetLinks(this, net);
@@ -2174,6 +2188,41 @@ export class Meta2d {
         this.connectIot();
         this.connectSqls();
     }
+    reconnectNetwork(index) {
+        const net = this.store.data.networks[index];
+        if (net.protocol === 'mqtt') {
+            this.mqttClients && this.mqttClients[net.index]?.end();
+            this.connectNetMqtt(net);
+        }
+        else if (net.protocol === 'websocket') {
+            if (this.websockets && this.websockets[net.index]) {
+                this.websockets[net.index].onclose = undefined;
+                this.websockets[net.index].close();
+                this.websockets[net.index] = undefined;
+            }
+            this.connectNetWebSocket(net);
+        }
+        else if (net.protocol === 'http') {
+            if (this.updateTimerList) {
+                clearInterval(this.updateTimerList[net.index]);
+                this.updateTimerList[net.index] = undefined;
+            }
+            const http = deepClone(net);
+            if (!this.store.data.cancelFirstConnect) {
+                this.requestHttp(http);
+            }
+            this.updateTimerList[net.index] = setInterval(async () => {
+                this.requestHttp(http);
+            }, http.interval || 1000);
+        }
+        else if (net.protocol === 'SSE') {
+            if (this.eventSources) {
+                this.eventSources[net.index]?.close();
+                this.eventSources[net.index] = undefined;
+            }
+            this.connectSSE(net);
+        }
+    }
     iotMqttClient;
     iotTimer;
     iotWebsocketClient;
@@ -2215,7 +2264,7 @@ export class Meta2d {
         //     token
         //   );
         //   this.iotWebsocketClient.onmessage = (e) => {
-        //     this.socketCallback(e.data, { type: 'iot', method: 'websocket' });   
+        //     this.socketCallback(e.data, { type: 'iot', method: 'websocket' });
         //   };
         //   this.iotWebsocketClient.onerror = (error) => {
         //     this.store.emitter.emit('error', { type: 'websocket', error });
@@ -2257,13 +2306,60 @@ export class Meta2d {
                 }
             });
     }
+    connectNetMqtt(net) {
+        if (net.options.clientId && !net.options.customClientId) {
+            net.options.clientId = s8();
+        }
+        let url = net.url;
+        if (url.indexOf('${') > -1) {
+            let keys = url.match(/\$\{([^}]+)\}/g)?.map(m => m.slice(2, -1));
+            if (keys) {
+                keys.forEach((key) => {
+                    url = url.replace(`\${${key}}`, this.getDynamicParam(key));
+                });
+            }
+        }
+        net.times = 0;
+        this.mqttClients[net.index] = mqtt.connect(url, net.options);
+        this.mqttClients[net.index].on('message', (topic, message) => {
+            this.socketCallback(message.toString(), {
+                topic,
+                type: 'mqtt',
+                url: net.url,
+            });
+        });
+        this.mqttClients[net.index].on('error', (error) => {
+            this.store.emitter.emit('error', { type: 'mqtt', error });
+        });
+        this.mqttClients[net.index].on('close', () => {
+            if (this.store.options.reconnetTimes) {
+                net.times++;
+                if (net.times >= this.store.options.reconnetTimes) {
+                    net.times = 0;
+                    this.mqttClients && this.mqttClients[net.index]?.end();
+                }
+            }
+        });
+        if (net.topics) {
+            this.mqttClients[net.index].subscribe(net.topics.split(','));
+        }
+    }
     connectNetWebSocket(net) {
         if (this.websockets[net.index]) {
             this.websockets[net.index].onclose = undefined;
             this.websockets[net.index]?.close();
             this.websockets[net.index] = undefined;
         }
-        this.websockets[net.index] = new WebSocket(net.url, net.protocols || undefined);
+        let url = net.url;
+        if (url.indexOf('${') > -1) {
+            let keys = url.match(/\$\{([^}]+)\}/g)?.map(m => m.slice(2, -1));
+            if (keys) {
+                keys.forEach((key) => {
+                    url = url.replace(`\${${key}}`, this.getDynamicParam(key));
+                });
+            }
+        }
+        this.websockets[net.index] = new WebSocket(url, net.protocols || undefined);
         this.websockets[net.index].onmessage = (e) => {
             this.socketCallback(e.data, { type: 'websocket', url: net.url });
         };
@@ -2553,7 +2649,7 @@ export class Meta2d {
     //获取动态参数
     getDynamicParam(key) {
         let params = queryURLParams();
-        let value = params[key] || localStorage[key] || getCookie(key) || '';
+        let value = params[key] || localStorage[key] || getCookie(key) || globalThis[key] || '';
         return value;
     }
     onNetworkConnect(https) {
@@ -3818,8 +3914,10 @@ export class Meta2d {
             this.store.data.fits?.forEach((fit) => {
                 let pens = [];
                 fit.children.forEach((id) => {
-                    this.store.pens[id].locked = LockState.None;
-                    pens.push(this.store.pens[id]);
+                    if (this.store.pens[id]) {
+                        this.store.pens[id].locked = LockState.None;
+                        pens.push(this.store.pens[id]);
+                    }
                 });
                 let r = wGap / 2;
                 if (fit.left && fit.right) {
@@ -3912,8 +4010,10 @@ export class Meta2d {
             this.store.data.fits?.forEach((fit) => {
                 let pens = [];
                 fit.children.forEach((id) => {
-                    this.store.pens[id].locked = LockState.None;
-                    pens.push(this.store.pens[id]);
+                    if (this.store.pens[id]) {
+                        this.store.pens[id].locked = LockState.None;
+                        pens.push(this.store.pens[id]);
+                    }
                 });
                 let r = hGap / 2;
                 if (fit.top && fit.bottom) {