@meta2d/core 1.0.96 → 1.0.98

package/src/core.d.ts

@@ -345,7 +345,7 @@ export declare class Meta2d {
      * 放大到屏幕尺寸，并居中
      * @param fit true，填满但完整展示；false，填满，但长边可能截取（即显示不完整）
      */
-    fitView(fit?: boolean, viewPadding?: Padding): void;
+    fitView(fit?: boolean, viewPadding?: Padding, fill?: boolean): void;
     fillView(): void;
     trimPens(): void;
     /**
@@ -353,7 +353,7 @@ export declare class Meta2d {
      * @param fit true，填满但完整展示；false，填满，但长边可能截取（即显示不完整）
      */
     fitTemplateView(fit?: boolean, viewPadding?: Padding): void;
-    fitSizeView(fit?: boolean | string, viewPadding?: Padding): void;
+    fitSizeView(fit?: boolean | string, viewPadding?: Padding, fill?: boolean): void;
     centerSizeView(): void;
     /**
      * 宽度放大到屏幕尺寸，并滚动到最顶部

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);
@@ -2383,9 +2394,11 @@ export class Meta2d {
             if (!this.store.data.cancelFirstConnect) {
                 this.requestHttp(http);
             }
-            this.updateTimerList[net.index] = setInterval(async () => {
-                this.requestHttp(http);
-            }, http.interval || 1000);
+            if (net.interval !== 0) {
+                this.updateTimerList[net.index] = setInterval(async () => {
+                    this.requestHttp(http);
+                }, http.interval || 1000);
+            }
         }
         else if (net.protocol === 'SSE') {
             if (this.eventSources) {
@@ -2686,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)) : '');
+                    }
                 }
             }
         }
@@ -4265,7 +4280,7 @@ export class Meta2d {
      * 放大到屏幕尺寸，并居中
      * @param fit true，填满但完整展示；false，填满，但长边可能截取（即显示不完整）
      */
-    fitView(fit = true, viewPadding = 10) {
+    fitView(fit = true, viewPadding = 10, fill = true) {
         // 默认垂直填充，两边留白
         if (!this.hasView())
             return;
@@ -4295,7 +4310,7 @@ export class Meta2d {
         this.scale(ratio * this.store.data.scale);
         // 5. 居中
         this.centerView();
-        if (this.store.data.fits?.length) {
+        if (fill && this.store.data.fits?.length) {
             this.fillView();
         }
     }
@@ -4335,8 +4350,17 @@ export class Meta2d {
                         if (pen.image && pen.imageRatio) {
                             if (pen.calculative.worldRect.width / this.canvas.width > 0.1) {
                                 pen.imageRatio = false;
+                                pen.ratio = false;
                             }
                         }
+                        if (pen.name === 'tablePlus') {
+                            pen.colWidth = (pen.colWidth ?? 150) * ratio;
+                            pen.styles.forEach((style) => {
+                                if (style.width) {
+                                    style.width = style.width * ratio;
+                                }
+                            });
+                        }
                         pen.calculative.worldRect.x =
                             rect.x -
                                 wGap / 2 +
@@ -4450,6 +4474,7 @@ export class Meta2d {
                         if (pen.image && pen.imageRatio) {
                             if (pen.calculative.worldRect.height / this.canvas.height > 0.1) {
                                 pen.imageRatio = false;
+                                pen.ratio = false;
                             }
                         }
                         pen.calculative.worldRect.y =
@@ -4584,7 +4609,7 @@ export class Meta2d {
         });
         this.centerView();
     }
-    fitSizeView(fit = true, viewPadding = 10) {
+    fitSizeView(fit = true, viewPadding = 10, fill = true) {
         // 默认垂直填充，两边留白
         // if (!this.hasView()) return;
         // 1. 重置画布尺寸为容器尺寸
@@ -4623,7 +4648,7 @@ export class Meta2d {
         this.scale(ratio * this.store.data.scale);
         // 5. 居中
         this.centerSizeView();
-        if (this.store.data.fits?.length) {
+        if (fill && this.store.data.fits?.length) {
             this.fillView();
         }
     }