@meta2d/core 1.1.4 → 1.1.6

package/src/core.js

@@ -237,7 +237,7 @@ export class Meta2d {
                     let keys = url.match(/\$\{([^}]+)\}/g)?.map(m => m.slice(2, -1));
                     if (keys) {
                         keys?.forEach((key) => {
-                            url = url.replace(`\${${key}}`, pen[key] || this.getDynamicParam(key));
+                            url = url.replace(`\${${key}}`, getter(pen, key) || this.getDynamicParam(key));
                         });
                     }
                 }
@@ -262,7 +262,7 @@ export class Meta2d {
                             let keys = __value.match(/\$\{([^}]+)\}/g)?.map(m => m.slice(2, -1));
                             if (keys) {
                                 keys.forEach((key) => {
-                                    __value = __value.replace(`\${${key}}`, pen[key] || this.getDynamicParam(key));
+                                    __value = __value.replace(`\${${key}}`, getter(pen, key) || this.getDynamicParam(key));
                                 });
                             }
                             _value[key] = __value;
@@ -447,7 +447,7 @@ export class Meta2d {
                     let keys = e.params.match(/\$\{([^}]+)\}/g)?.map(m => m.slice(2, -1));
                     if (keys) {
                         keys?.forEach((key) => {
-                            url = url.replace(`\${${key}}`, pen[key] || this.getDynamicParam(key));
+                            url = url.replace(`\${${key}}`, getter(pen, key) || this.getDynamicParam(key));
                         });
                     }
                 }
@@ -505,13 +505,13 @@ export class Meta2d {
                     const _pen = e.params ? this.findOne(e.params) : pen;
                     for (let key in value) {
                         if (value[key] === undefined || value[key] === '') {
-                            value[key] = _pen[key];
+                            value[key] = getter(_pen, key);
                         }
                         else if (typeof value[key] === 'string' &&
                             value[key]?.indexOf('${') > -1) {
                             let keys = value[key].match(/\$\{([^}]+)\}/g)?.map(m => m.slice(2, -1));
                             if (keys?.length) {
-                                value[key] = _pen[keys[0]] ?? this.getDynamicParam(keys[0]);
+                                value[key] = getter(_pen, key[0]) ?? this.getDynamicParam(keys[0]);
                             }
                         }
                     }
@@ -535,7 +535,10 @@ export class Meta2d {
                 return;
             }
             let params = queryURLParams(_pen.iframe.split('?')[1]);
-            const value = this.getEventData(e.list, _pen);
+            let value = this.getSendData(e.data, pen);
+            if (e.list) {
+                value = this.getEventData(e.list, pen);
+            }
             _pen.calculative.singleton.div.children[0].contentWindow.postMessage(JSON.stringify({
                 name: e.value,
                 id: params.id,
@@ -548,7 +551,10 @@ export class Meta2d {
                 console.warn('[meta2d] Emit value must be a string');
                 return;
             }
-            const value = this.getEventData(e.list, pen);
+            let value = this.getSendData(e.data, pen);
+            if (e.list) {
+                value = this.getEventData(e.list, pen);
+            }
             window.parent.postMessage(JSON.stringify({ name: e.value, data: value }), '*');
             return;
         };
@@ -570,7 +576,7 @@ export class Meta2d {
     }
     getSendData(data, cpen) {
         const value = {};
-        data.forEach((item) => {
+        data?.forEach((item) => {
             if (item.prop) {
                 if (item.id && item.id !== '固定值') {
                     const pen = this.findOne(item.id);
@@ -684,8 +690,8 @@ export class Meta2d {
         //图纸更新
         const data = await getMeta2dData(this.store, id);
         if (data) {
+            this.canvas.opening = true;
             this.open(data);
-            this.canvas.opening = false;
             this.lock(1);
             const width = this.store.data.width || this.store.options.width;
             const height = this.store.data.height || this.store.options.height;
@@ -695,6 +701,7 @@ export class Meta2d {
             else {
                 this.fitView(true, 10);
             }
+            this.render(true);
             // document.title = data.name + "-" + window.name;
         }
     }
@@ -1552,7 +1559,7 @@ export class Meta2d {
         this.canvas.setPenRect(pen, rect, render);
     }
     startAnimate(idOrTagOrPens, params) {
-        this.stopAnimate(idOrTagOrPens);
+        // this.stopAnimate(idOrTagOrPens);
         let pens;
         // 没有参数 则播放有自动播放属性的动画
         if (!idOrTagOrPens) {
@@ -1565,9 +1572,19 @@ export class Meta2d {
         }
         else if (typeof idOrTagOrPens === 'string') {
             pens = this.find(idOrTagOrPens);
+            pens.forEach((pen) => {
+                if (!pen.calculative.pause || pen.currentAnimation !== params) {
+                    this.stopAnimate([pen]);
+                }
+            });
         }
         else {
             pens = idOrTagOrPens;
+            pens.forEach((pen) => {
+                if (!pen.calculative.pause || pen.currentAnimation !== params) {
+                    this.stopAnimate([pen]);
+                }
+            });
         }
         if (!pens.length) {
             return;
@@ -4262,12 +4279,12 @@ export class Meta2d {
         }
         let mySerializedSVG = ctx.getSerializedSvg();
         if (defs?.length) {
-            mySerializedSVG = mySerializedSVG.replace('<defs/>', `<defs>
-          <style type="text/css">
-            ${defs.join('\n')}
-          </style>
-          {{bk}}
-        </defs>
+            mySerializedSVG = mySerializedSVG.replace('<defs/>', `<defs>
+          <style type="text/css">
+            ${defs.join('\n')}
+          </style>
+          {{bk}}
+        </defs>
         {{bkRect}}`);
         }
         if (background) {
@@ -4336,7 +4353,7 @@ export class Meta2d {
         else {
             ratio = w > h ? w : h;
         }
-        if (this.store.data.fits?.length) {
+        if (fill && this.store.data.fits?.length) {
             this.canvas.opening = true;
         }
         // 该方法直接更改画布的 scale 属性，所以比率应该乘以当前 scale
@@ -4688,7 +4705,7 @@ export class Meta2d {
                 ratio = w > h ? w : h;
             }
         }
-        if (this.store.data.fits?.length) {
+        if (fill && this.store.data.fits?.length) {
             this.canvas.opening = true;
         }
         // 该方法直接更改画布的 scale 属性，所以比率应该乘以当前 scale
@@ -6069,6 +6086,7 @@ export class Meta2d {
             globalStore.canvasDraws = {};
             globalStore.anchors = {};
             globalStore.htmlElements = {};
+            globalStore.lineAnimateDraws = {};
         }
     }
 }