From 84f7eab95d7e914f3c516d051d3c210ff8ebf9c3 Mon Sep 17 00:00:00 2001 From: MaysWind Date: Wed, 24 Jul 2024 23:30:33 +0800 Subject: [PATCH] show no available tags when all tags are hidden --- src/stores/transactionTag.js | 3 +++ .../cards/TransactionTagFilterSettingsCard.vue | 13 ++++++++++--- .../settings/TransactionTagFilterSettingsPage.vue | 13 ++++++++++--- 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/src/stores/transactionTag.js b/src/stores/transactionTag.js index 0efafb27..da6eb148 100644 --- a/src/stores/transactionTag.js +++ b/src/stores/transactionTag.js @@ -75,6 +75,9 @@ export const useTransactionTagsStore = defineStore('transactionTags', { }, allAvailableTagsCount(state) { return state.allTransactionTags.length; + }, + allVisibleTagsCount(state) { + return state.allVisibleTags.length; } }, actions: { diff --git a/src/views/desktop/common/cards/TransactionTagFilterSettingsCard.vue b/src/views/desktop/common/cards/TransactionTagFilterSettingsCard.vue index 3a72e39a..818e289f 100644 --- a/src/views/desktop/common/cards/TransactionTagFilterSettingsCard.vue +++ b/src/views/desktop/common/cards/TransactionTagFilterSettingsCard.vue @@ -65,11 +65,11 @@ :key="itemIdx" v-for="itemIdx in [ 1, 2, 3 ]"> - + {{ $t('No available tag') }} - + @@ -104,7 +104,7 @@
- {{ $t(applyText) }} + {{ $t(applyText) }} {{ $t('Cancel') }}
@@ -171,6 +171,13 @@ export default { }, hasAnyAvailableTag() { return this.transactionTagsStore.allAvailableTagsCount > 0; + }, + hasAnyVisibleTag() { + if (this.showHidden) { + return this.transactionTagsStore.allAvailableTagsCount > 0; + } else { + return this.transactionTagsStore.allVisibleTagsCount > 0; + } } }, created() { diff --git a/src/views/mobile/settings/TransactionTagFilterSettingsPage.vue b/src/views/mobile/settings/TransactionTagFilterSettingsPage.vue index 000d9166..08d1ecef 100644 --- a/src/views/mobile/settings/TransactionTagFilterSettingsPage.vue +++ b/src/views/mobile/settings/TransactionTagFilterSettingsPage.vue @@ -5,7 +5,7 @@ - + @@ -37,11 +37,11 @@ - + - + @@ -143,6 +143,13 @@ export default { }, hasAnyAvailableTag() { return this.transactionTagsStore.allAvailableTagsCount > 0; + }, + hasAnyVisibleTag() { + if (this.showHidden) { + return this.transactionTagsStore.allAvailableTagsCount > 0; + } else { + return this.transactionTagsStore.allVisibleTagsCount > 0; + } } }, created() {