@meta2d/core 1.0.92 → 1.0.94-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meta2d/core",
-  "version": "1.0.92",
+  "version": "1.0.94-alpha.1",
   "description": "@meta2d/core: Powerful, Beautiful, Simple, Open - Web-Based 2D At Its Best .",
   "main": "index.js",
   "types": "index.d.ts",

package/src/core.d.ts

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

package/src/core.js

@@ -460,7 +460,7 @@ export class Meta2d {
         };
         this.events[EventAction.SendData] = (pen, e) => {
             if (e.data?.length) {
-                const value = this.getSendData(e.data);
+                const value = this.getSendData(e.data, pen);
                 if (pen.formId && pen.formData) {
                     //表单数据
                     Object.assign(value, pen.formData);
@@ -550,7 +550,7 @@ export class Meta2d {
             });
         };
     }
-    getSendData(data) {
+    getSendData(data, cpen) {
         const value = {};
         data.forEach((item) => {
             if (item.prop) {
@@ -564,7 +564,7 @@ export class Meta2d {
                         let keys = _value.match(/\$\{([^}]+)\}/g)?.map(m => m.slice(2, -1));
                         if (keys) {
                             keys.forEach((key) => {
-                                _value = _value.replace(`\${${key}}`, this.getDynamicParam(key));
+                                _value = _value.replace(`\${${key}}`, getter(cpen, key) || this.getDynamicParam(key));
                             });
                         }
                         value[item.prop] = _value;
@@ -731,11 +731,22 @@ export class Meta2d {
             let params = undefined;
             let url = network.url;
             if (network.method === 'GET') {
-                params =
-                    '?' +
-                        Object.keys(value)
-                            .map((key) => key + '=' + value[key])
-                            .join('&');
+                if (Object.keys(value).length !== 0) {
+                    if (url.includes('?')) {
+                        params =
+                            '&' +
+                                Object.keys(value)
+                                    .map((key) => key + '=' + value[key])
+                                    .join('&');
+                    }
+                    else {
+                        params =
+                            '?' +
+                                Object.keys(value)
+                                    .map((key) => key + '=' + value[key])
+                                    .join('&');
+                    }
+                }
             }
             // if (network.method === 'POST') {
             if (url.indexOf('${') > -1) {
@@ -2634,7 +2645,7 @@ export class Meta2d {
         const res = await fetch('/api/iot/app/mqtt', {
             method: 'GET',
             headers: {
-                Authorization: `Bearer ${getToken()}`,
+                Authorization: getToken(),
             },
         });
         if (res.ok) {
@@ -2651,7 +2662,7 @@ export class Meta2d {
         const res = await fetch('/api/iot/subscribe/properties', {
             method: 'POST',
             headers: {
-                Authorization: `Bearer ${getToken()}`,
+                Authorization: getToken(),
             },
             body: JSON.stringify({ devices: devices, type }),
         });
@@ -2664,7 +2675,7 @@ export class Meta2d {
         const ret = await fetch(`/api/iot/unsubscribe/properties`, {
             method: 'POST',
             headers: {
-                Authorization: `Bearer ${getToken()}`,
+                Authorization: getToken(),
             },
             body: JSON.stringify({ token }),
         });
@@ -2689,7 +2700,7 @@ export class Meta2d {
         const res = await fetch(`/api/iot/data/sql/${method}`, {
             method: 'POST',
             headers: {
-                Authorization: `Bearer ${getCookie('token') || localStorage.getItem('token') || new URLSearchParams(location.search).get('token') || ''}`,
+                Authorization: getToken(),
             },
             body: JSON.stringify({ dbId: sql.dbId || sql.dbid, sql: _sql, }),
         });