@meta2d/core 1.0.97 → 1.0.99

package/src/core.js

@@ -542,10 +542,18 @@ export class Meta2d {
             window.parent.postMessage(JSON.stringify({ name: e.value, data: value }), '*');
             return;
         };
-        this.events[EventAction.Message] = (pen, e) => {
+        this.events[EventAction.Message] = (pen, e, params) => {
+            let theme = e.params;
+            let content = e.value;
+            if (!content && params && params.type === 'http') {
+                content = params.error.statusText;
+                if (!theme) {
+                    theme = 'error';
+                }
+            }
             this.message({
-                theme: e.params,
-                content: e.value,
+                theme,
+                content,
                 ...e.extend,
             });
         };
@@ -782,6 +790,9 @@ export class Meta2d {
                 }
                 console.info('http消息发送成功');
             }
+            else {
+                this.store.emitter.emit('error', { type: 'http', error: res });
+            }
         }
         else if (network.protocol === 'mqtt') {
             const clients = this.mqttClients?.filter((client) => client.options.href === network.url);
@@ -2688,14 +2699,16 @@ export class Meta2d {
         let _sql = sql.sql;
         if (method === 'list') {
             // _sql+= ` LIMIT ${sql.pageSize||20}`+(sql.current>1?(' OFFSET '+(sql.current-1)*sql.pageSize):'');
-            if (sql.dbType === "oracle") {
-                if (!_sql.includes('OFFSET')) {
-                    _sql += ` OFFSET ${(sql.current || 1 - 1) * (sql.pageSize || 20)} ROWS FETCH NEXT ${sql.pageSize || 20} ROWS ONLY`;
+            if (sql.pageSize !== -1) {
+                if (sql.dbType === "oracle") {
+                    if (!_sql.includes('OFFSET')) {
+                        _sql += ` OFFSET ${((sql.current || 1) - 1) * (sql.pageSize || 20)} ROWS FETCH NEXT ${sql.pageSize || 20} ROWS ONLY`;
+                    }
                 }
-            }
-            else {
-                if (!_sql.includes('LIMIT')) {
-                    _sql += ` LIMIT ${sql.pageSize || 20}` + (sql.current > 1 ? (' OFFSET ' + (sql.current - 1) * (sql.pageSize || 20)) : '');
+                else {
+                    if (!_sql.includes('LIMIT')) {
+                        _sql += ` LIMIT ${sql.pageSize || 20}` + (sql.current > 1 ? (' OFFSET ' + (sql.current - 1) * (sql.pageSize || 20)) : '');
+                    }
                 }
             }
         }