@meta2d/core 1.1.2 → 1.1.4

package/src/core.d.ts

@@ -74,7 +74,7 @@ export declare class Meta2d {
     private init;
     initEventFns(): void;
     getSendData(data: any[], cpen?: Pen): any;
-    convertType(value: string, type: string): string | number | boolean;
+    convertType(value: string, type: string): any;
     getEventData(list: any, pen: Pen): any;
     message(options: MessageOptions): void;
     closeAll(): void;

package/src/core.js

@@ -611,6 +611,16 @@ export class Meta2d {
                 }
             }
         }
+        else if (typeof value === 'object') {
+            let bodyStr = JSON.stringify(value);
+            let keys = bodyStr.match(/\$\{([^}]+)\}/g)?.map(m => m.slice(2, -1));
+            if (keys?.length) {
+                for (let i = 0; i < keys.length; i++) {
+                    bodyStr = bodyStr.replace(`\${${keys[i]}}`, this.getDynamicParam(keys[i]));
+                }
+            }
+            return JSON.parse(bodyStr);
+        }
         return value;
     }
     getEventData(list, pen) {
@@ -3573,12 +3583,13 @@ export class Meta2d {
                     this.doEvent(e, eventName);
                 break;
             case 'change':
-                e.pen && updateFormData(e.pen);
                 if (e.pen) {
+                    updateFormData(e.pen);
                     this.store.data.locked && !e.pen.disabled &&
                         this.doEvent(e.pen, eventName);
                 }
                 else {
+                    updateFormData(e);
                     this.store.data.locked &&
                         e &&
                         !e.disabled &&