fix: manual page input not disabled when only one page is available

antares-sql · Jul 23, 2021 · 62f7e57 · 62f7e57
1 parent 14577d1
commit 62f7e57
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/renderer/components/WorkspacePropsTableRow.vue b/src/renderer/components/WorkspacePropsTableRow.vue
@@ -458,8 +458,13 @@ export default {
                   : this.localRow.default
                : '';
          }
-         else if (this.defaultValue.type === 'expression')
-            this.defaultValue.expression = this.localRow.default;
+         else if (this.defaultValue.type === 'expression') {
+            console.log(this.localRow.default);
+            if (this.localRow.default.toUpperCase().includes('ON UPDATE'))
+               this.defaultValue.expression = this.localRow.default.replace(/ on update.*$/i, '');
+            else
+               this.defaultValue.expression = this.localRow.default;
+         }
       },
       editON (event, content, field) {
          if (field === 'length') {

diff --git a/src/renderer/components/WorkspaceTableTab.vue b/src/renderer/components/WorkspaceTableTab.vue
@@ -328,7 +328,7 @@ export default {
          this.getTableData();
       },
       openPageMenu () {
-         if (this.isQuering) return;
+         if (this.isQuering || (this.results.length && this.results[0].rows.length < this.limit && this.page === 1)) return;
 
          this.isPageMenu = true;
          if (this.isPageMenu)