@meta2d/core 1.0.84 → 1.0.85

package/src/core.js

@@ -177,18 +177,20 @@ export class Meta2d {
         this.setBackgroundColor(this.store.theme[theme].background);
         this.canvas.parentElement.style.background =
             this.store.theme[theme].parentBackground;
-        this.store.data.color = this.store.theme[theme].color;
         this.setOptions({
             ruleColor: this.store.theme[theme].ruleColor,
             ruleOptions: this.store.theme[theme].ruleOptions,
         });
         // 更新全局的主题css变量
-        le5leTheme.updateCssRule(this.store.id, theme);
-        this.canvas.initGlobalStyle();
-        for (let i = 0; i < this.store.data.pens.length; i++) {
-            const pen = this.store.data.pens[i];
-            // 调用pen的主题设置函数,如果单个pen有主题的自定义设置的话
-            pen.setTheme && pen.setTheme(pen, this.store.styles);
+        if (!(this.store.options.themeOnlyCanvas || this.store.data.themeOnlyCanvas)) {
+            this.store.data.color = this.store.theme[theme].color;
+            le5leTheme.updateCssRule(this.store.id, theme);
+            this.canvas.initGlobalStyle();
+            for (let i = 0; i < this.store.data.pens.length; i++) {
+                const pen = this.store.data.pens[i];
+                // 调用pen的主题设置函数,如果单个pen有主题的自定义设置的话
+                pen.setTheme && pen.setTheme(pen, this.store.styles);
+            }
         }
         this.render();
     }
@@ -2548,7 +2550,17 @@ export class Meta2d {
         const method = sql.method || 'get';
         let _sql = sql.sql;
         if (method === 'list') {
-            _sql += ` LIMIT ${sql.pageSize || 20}` + (sql.current > 1 ? (' OFFSET ' + (sql.current - 1) * sql.pageSize) : '');
+            // _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`;
+                }
+            }
+            else {
+                if (!_sql.includes('LIMIT')) {
+                    _sql += ` LIMIT ${sql.pageSize || 20}` + (sql.current > 1 ? (' OFFSET ' + (sql.current - 1) * (sql.pageSize || 20)) : '');
+                }
+            }
         }
         const res = await fetch(`/api/iot/data/sql/${method}`, {
             method: 'POST',