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

This commit is contained in:
Fabio Di Stasio 2024-02-26 18:19:14 +01:00
commit 6d94a04b67
2 changed files with 7 additions and 4 deletions

View File

@ -43,6 +43,7 @@
autofocus autofocus
class="editable-field form-input input-sm px-1" class="editable-field form-input input-sm px-1"
@blur="editOFF" @blur="editOFF"
@keyup.delete.stop
> >
<BaseSelect <BaseSelect
v-else-if="inputProps.type === 'boolean'" v-else-if="inputProps.type === 'boolean'"
@ -50,6 +51,7 @@
:options="['true', 'false']" :options="['true', 'false']"
class="form-select small-select editable-field" class="form-select small-select editable-field"
@blur="editOFF" @blur="editOFF"
@keyup.delete.stop
/> />
<BaseSelect <BaseSelect
v-else-if="enumArray" v-else-if="enumArray"
@ -58,6 +60,7 @@
class="form-select small-select editable-field" class="form-select small-select editable-field"
dropdown-class="small-select" dropdown-class="small-select"
@blur="editOFF" @blur="editOFF"
@keyup.delete.stop
/> />
<input <input
v-else v-else
@ -67,6 +70,7 @@
autofocus autofocus
class="editable-field form-input input-sm px-1" class="editable-field form-input input-sm px-1"
@blur="editOFF" @blur="editOFF"
@keyup.delete.stop
> >
</template> </template>
</template> </template>

View File

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