@meta2d/core 1.1.0 → 1.1.2

package/src/core.d.ts

@@ -87,6 +87,7 @@ export declare class Meta2d {
      * @param emit 是否发送消息
      */
     addPen(pen: Pen, history?: boolean, emit?: boolean, abs?: boolean): Promise<Pen>;
+    addPenSync(pen: Pen, history?: boolean, emit?: boolean, abs?: boolean): Pen;
     addPens(pens: Pen[], history?: boolean, abs?: boolean): Promise<Pen[]>;
     render(patchFlags?: boolean | number): void;
     setBackgroundImage(url: string, data?: any): Promise<void>;
@@ -214,6 +215,7 @@ export declare class Meta2d {
      * @param canDelLocked 是否删除已经锁住的画笔
      */
     delete(pens?: Pen[], canDelLocked?: boolean, history?: boolean): void;
+    deleteSync(pens?: Pen[], canDelLocked?: boolean, history?: boolean): void;
     scale(scale: number, center?: {
         x: number;
         y: number;

package/src/core.js

@@ -1,4 +1,4 @@
-import { commonAnchors, commonPens, cube, reset, updateFormData } from './diagrams';
+import { clearIframes, commonAnchors, commonPens, cube, updateIframes, reset, updateFormData } from './diagrams';
 import { Canvas } from './canvas';
 import { calcInView, calcTextDrawRect, calcTextLines, calcTextRect, facePen, formatAttrs, getAllChildren, getFromAnchor, getParent, getToAnchor, getWords, LockState, PenType, renderPenRaw, setElemPosition, connectLine, nearestAnchor, setChildValue, isAncestor, isShowChild, CanvasLayer, validationPlugin, setLifeCycleFunc, getAllFollowers, isInteraction, calcWorldAnchors, isDomShapes, defaultFormat, findOutliersByZScore, } from './pen';
 import { rotatePoint } from './point';
@@ -685,7 +685,7 @@ export class Meta2d {
             else {
                 this.fitView(true, 10);
             }
-            document.title = data.name + "-" + window.name;
+            // document.title = data.name + "-" + window.name;
         }
     }
     doSendDataEvent(value, topics) {
@@ -862,6 +862,9 @@ export class Meta2d {
     async addPen(pen, history, emit = true, abs = false) {
         return await this.canvas.addPen(pen, history, emit, abs);
     }
+    addPenSync(pen, history, emit = true, abs = false) {
+        return this.canvas.addPenSync(pen, history, emit, abs);
+    }
     async addPens(pens, history, abs = false) {
         return await this.canvas.addPens(pens, history, abs);
     }
@@ -939,6 +942,7 @@ export class Meta2d {
             if (data.theme) {
                 this.setTheme(data.theme);
             }
+            updateIframes(data.pens);
             this.setBackgroundImage(data.bkImage, data);
             Object.assign(this.store.data, data);
             this.store.data.pens = [];
@@ -1179,33 +1183,36 @@ export class Meta2d {
                     //   key: realTime.key,
                     // });
                     //JetLinks
+                    const Jet = this.store.data.networks?.some((item) => item.protocol === 'ADIIOT');
                     let productId = realTime.productId || pen.productId;
                     let deviceId = realTime.deviceId || pen.deviceId;
                     let propertyId = realTime.propertyId;
                     let flag = false;
-                    if (productId && productId.indexOf('${') > -1) {
-                        let keys = productId.match(/(?<=\$\{).*?(?=\})/g);
-                        if (keys?.length) {
-                            productId = this.getDynamicParam(keys[0]) || productId;
+                    if (Jet) {
+                        if (productId && typeof productId === 'string' && productId.indexOf('${') > -1) {
+                            let keys = productId.match(/(?<=\$\{).*?(?=\})/g);
+                            if (keys?.length) {
+                                productId = this.getDynamicParam(keys[0]) || productId;
+                            }
+                            flag = true;
                         }
-                        flag = true;
-                    }
-                    if (deviceId && deviceId.indexOf('${') > -1) {
-                        let keys = deviceId.match(/(?<=\$\{).*?(?=\})/g);
-                        if (keys?.length) {
-                            deviceId = this.getDynamicParam(keys[0]) || deviceId;
+                        if (deviceId && typeof deviceId === 'string' && deviceId.indexOf('${') > -1) {
+                            let keys = deviceId.match(/(?<=\$\{).*?(?=\})/g);
+                            if (keys?.length) {
+                                deviceId = this.getDynamicParam(keys[0]) || deviceId;
+                            }
+                            flag = true;
                         }
-                        flag = true;
-                    }
-                    if (propertyId && propertyId.indexOf('${') > -1) {
-                        let keys = propertyId.match(/(?<=\$\{).*?(?=\})/g);
-                        if (keys?.length) {
-                            propertyId = this.getDynamicParam(keys[0]) || propertyId;
+                        if (propertyId && typeof propertyId === 'string' && propertyId.indexOf('${') > -1) {
+                            let keys = propertyId.match(/(?<=\$\{).*?(?=\})/g);
+                            if (keys?.length) {
+                                propertyId = this.getDynamicParam(keys[0]) || propertyId;
+                            }
+                            flag = true;
+                        }
+                        if (flag) {
+                            realTime.bind && (realTime.bind.id = productId + '#' + deviceId + '#' + propertyId);
                         }
-                        flag = true;
-                    }
-                    if (flag) {
-                        realTime.bind && (realTime.bind.id = productId + '#' + deviceId + '#' + propertyId);
                     }
                     if (!this.store.bind[realTime.bind.id]) {
                         this.store.bind[realTime.bind.id] = [];
@@ -1214,20 +1221,22 @@ export class Meta2d {
                         id: pen.id,
                         key: realTime.key,
                     });
-                    if (productId && deviceId && propertyId) {
-                        const index = this.jetLinksList.findIndex((item) => item.topic.startsWith(`/${productId}/${deviceId}`));
-                        if (index > -1) {
-                            const properties = this.jetLinksList[index].properties;
-                            if (!properties.includes(realTime.propertyId)) {
-                                this.jetLinksList[index].properties.push(realTime.propertyId);
+                    if (Jet) {
+                        if (productId && deviceId && propertyId) {
+                            const index = this.jetLinksList.findIndex((item) => item.topic.startsWith(`/${productId}/${deviceId}`));
+                            if (index > -1) {
+                                const properties = this.jetLinksList[index].properties;
+                                if (!properties.includes(realTime.propertyId)) {
+                                    this.jetLinksList[index].properties.push(realTime.propertyId);
+                                }
+                            }
+                            else {
+                                this.jetLinksList.push({
+                                    topic: `/${productId}/${deviceId}`,
+                                    deviceId,
+                                    properties: [realTime.propertyId],
+                                });
                             }
-                        }
-                        else {
-                            this.jetLinksList.push({
-                                topic: `/${productId}/${deviceId}`,
-                                deviceId,
-                                properties: [realTime.propertyId],
-                            });
                         }
                     }
                     if (realTime.bind.class === 'iot') {
@@ -2038,6 +2047,9 @@ export class Meta2d {
     delete(pens, canDelLocked = false, history = true) {
         this.canvas.delete(pens, canDelLocked, history);
     }
+    deleteSync(pens, canDelLocked = false, history = true) {
+        this.canvas.deleteSync(pens, canDelLocked, history);
+    }
     scale(scale, center = { x: 0, y: 0 }) {
         this.canvas.scale(scale, center);
     }
@@ -4347,13 +4359,13 @@ export class Meta2d {
                     let left = fit.leftValue;
                     let right = fit.rightValue;
                     if (left) {
-                        left = Math.abs(left) < 1 ? left * this.canvas.width : left;
+                        left = Math.abs(left) < 1 ? left * rect.width : left;
                     }
                     else {
                         left = 0;
                     }
                     if (right) {
-                        right = Math.abs(right) < 1 ? right * this.canvas.width : right;
+                        right = Math.abs(right) < 1 ? right * rect.width : right;
                     }
                     else {
                         right = 0;
@@ -4374,11 +4386,20 @@ export class Meta2d {
                                 }
                             });
                         }
-                        pen.calculative.worldRect.x =
-                            rect.x -
-                                wGap / 2 +
-                                left +
-                                (pen.calculative.worldRect.x - rect.x) * ratio; //(fit.leftValue || 0)+ (pen.calculative.worldRect.x + pen.calculative.worldRect.width/2)-( pen.calculative.worldRect.width*ratio)*(range/2- (fit.rightValue || 0))/(range- (fit.leftValue || 0)-(fit.rightValue || 0));
+                        if (Math.abs(fit.leftValue) < 1) {
+                            pen.calculative.worldRect.x =
+                                rect.x -
+                                    wGap / 2 +
+                                    left +
+                                    (pen.calculative.worldRect.x - rect.x - left) * ratio;
+                        }
+                        else {
+                            pen.calculative.worldRect.x =
+                                rect.x -
+                                    wGap / 2 +
+                                    left +
+                                    (pen.calculative.worldRect.x - rect.x) * ratio;
+                        }
                         pen.calculative.worldRect.width *= ratio;
                         pen.calculative.worldRect.ex =
                             pen.calculative.worldRect.x + pen.calculative.worldRect.width;
@@ -6019,6 +6040,7 @@ export class Meta2d {
     setLifeCycleFunc = setLifeCycleFunc;
     destroy(onlyData) {
         this.clear(false);
+        clearIframes();
         this.stopDataMock();
         this.closeSocket();
         this.closeNetwork();