Merge branch 'develop' of https://github.com/antares-sql/antares into…

… beta
antares-sql · Feb 26, 2024 · 6d94a04 · 6d94a04
2 parents 04e4d21 + 8500fc4
commit 6d94a04
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/renderer/components/WorkspaceTabQueryTableRow.vue b/src/renderer/components/WorkspaceTabQueryTableRow.vue
@@ -43,13 +43,15 @@
                   autofocus
                   class="editable-field form-input input-sm px-1"
                   @blur="editOFF"
+                  @keyup.delete.stop
                >
                <BaseSelect
                   v-else-if="inputProps.type === 'boolean'"
                   v-model="editingContent"
                   :options="['true', 'false']"
                   class="form-select small-select editable-field"
                   @blur="editOFF"
+                  @keyup.delete.stop
                />
                <BaseSelect
                   v-else-if="enumArray"
@@ -58,6 +60,7 @@
                   class="form-select small-select editable-field"
                   dropdown-class="small-select"
                   @blur="editOFF"
+                  @keyup.delete.stop
                />
                <input
                   v-else
@@ -67,6 +70,7 @@
                   autofocus
                   class="editable-field form-input input-sm px-1"
                   @blur="editOFF"
+                  @keyup.delete.stop
                >
             </template>
          </template>

diff --git a/src/renderer/stores/application.ts b/src/renderer/stores/application.ts
@@ -55,10 +55,9 @@ export const useApplicationStore = defineStore('application', {
       },
       showScratchpad (tag?: string) {
          this.isScratchpad = true;
-         if (tag) {
-            const { selectedTag } = storeToRefs(useScratchpadStore());
-            selectedTag.value = tag;
-         }
+         if (!tag) tag = 'all';
+         const { selectedTag } = storeToRefs(useScratchpadStore());
+         selectedTag.value = tag;
       },
       hideScratchpad () {
          this.isScratchpad = false;