@meta2d/core 1.0.99 → 1.1.1

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';
@@ -267,6 +267,16 @@ export class Meta2d {
                             }
                             _value[key] = __value;
                         }
+                        else if (typeof value[key] === 'string' &&
+                            ((value[key].startsWith('{') && value[key].endsWith('}')) ||
+                                (value[key].startsWith('[') && value[key].endsWith(']')))) {
+                            try {
+                                _value[key] = JSON.parse(value[key]);
+                            }
+                            catch (e) {
+                                _value[key] = value[key];
+                            }
+                        }
                         else {
                             _value[key] = value[key];
                         }
@@ -675,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) {
@@ -929,6 +939,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 = [];
@@ -1851,6 +1862,7 @@ export class Meta2d {
             step,
         });
         initPens = [deepClone(pen)];
+        this.inactive();
         pen.children = undefined;
         // 保存修改 children 的历史记录
         this.pushHistory({
@@ -1864,7 +1876,6 @@ export class Meta2d {
             // delete 会记录 history , 更改 step 即可
             this.store.histories[this.store.histories.length - 1].step = step;
         }
-        this.inactive();
     }
     clearCombine(pen) {
         if (!pen && this.store.active) {
@@ -2546,7 +2557,7 @@ export class Meta2d {
         if (!options.hasOwnProperty("keepalive")) {
             Object.assign(options, { keepallive: 30 });
         }
-        //  clean为false 时，clientId 是必填项 
+        //  clean为false 时，clientId 是必填项
         // if(options.clientId && !options.hasOwnProperty("clean")){
         //   Object.assign(options,{clean: false});
         // }
@@ -4315,6 +4326,9 @@ export class Meta2d {
         }
     }
     fillView() {
+        if (this.store.options.unFill) {
+            return; //不自适应
+        }
         const rect = this.getRect();
         const wGap = this.canvas.width - rect.width;
         const hGap = this.canvas.height - rect.height;
@@ -4373,6 +4387,8 @@ export class Meta2d {
                         pen.calculative.x = pen.calculative.worldRect.x;
                         pen.width = pen.calculative.worldRect.width;
                         pen.x = pen.calculative.worldRect.x;
+                        pen.textWidth *= ratio;
+                        pen.calculative.textWidth *= ratio;
                         this.canvas.updatePenRect(pen, { worldRectIsReady: false });
                         if (pen.externElement) {
                             pen.onResize?.(pen);
@@ -6004,6 +6020,7 @@ export class Meta2d {
     setLifeCycleFunc = setLifeCycleFunc;
     destroy(onlyData) {
         this.clear(false);
+        clearIframes();
         this.stopDataMock();
         this.closeSocket();
         this.closeNetwork();