diff --git a/front/assets/styles/theme.css b/front/assets/styles/theme.css index 9774c87..f89dff2 100644 --- a/front/assets/styles/theme.css +++ b/front/assets/styles/theme.css @@ -1011,4 +1011,16 @@ img, svg { font-size: 13px; font-weight: 400; line-height: 16px; +} + +.tag-filter { + border-radius: 10px; + background: #333 !important; + padding: 4px 11px !important; + color: white; + font-size: 12px; + font-weight: 400; + display: flex; + align-items: center; + justify-content: center; } \ No newline at end of file diff --git a/front/composables/useForm.js b/front/composables/useForm.js index 2c72fdd..4f355b2 100644 --- a/front/composables/useForm.js +++ b/front/composables/useForm.js @@ -21,7 +21,8 @@ export function useForm(props) { const title = computed(() => (route.params.id ? titleEdit : titleAdd)) let itemId = ref(null) - let formName = ref(`form-${crypto.randomUUID()}`) + let formName = ref(`form-${crypto.randomUUID ? crypto.randomUUID() : Utils.getGUID()}`) + // let itemId = computed(() => route.params.id) diff --git a/front/package-lock.json b/front/package-lock.json index c44af05..c9a84f8 100644 --- a/front/package-lock.json +++ b/front/package-lock.json @@ -1,11 +1,11 @@ { "name": "front", - "version": "1.5.0", + "version": "1.5.1", "lockfileVersion": 3, "requires": true, "packages": { "": { - "version": "1.5.0", + "version": "1.5.1", "hasInstallScript": true, "dependencies": { "@pinia/nuxt": "^0.9.0", diff --git a/front/package.json b/front/package.json index 764dcd6..49a374a 100644 --- a/front/package.json +++ b/front/package.json @@ -1,5 +1,5 @@ { - "version": "1.5.0", + "version": "1.5.1", "private": true, "scripts": { "start": "npm run dev -- -o", diff --git a/front/pages/transactions/list.vue b/front/pages/transactions/list.vue index b4adad7..86e6575 100644 --- a/front/pages/transactions/list.vue +++ b/front/pages/transactions/list.vue @@ -21,7 +21,7 @@
-
+
{{ appliedFilter }}
@@ -179,7 +179,10 @@ let filtersDictionary = computed(() => { filter: `date_before:"${DateUtils.dateToString(_filter.dateEnd)}"`, active: !!_filter.dateEnd, }, - ] + ].map((item) => { + item.filter = item.filter.replace(/(\w+):"([^"]+)"/g, (match, key, content) => `${key}:"${encodeURIComponent(content)}"`) + return item + }) }) let filtersDisplayList = computed(() => { @@ -233,5 +236,4 @@ onMounted(() => { }) animateSwipeList(list) - diff --git a/front/stores/dataStore.js b/front/stores/dataStore.js index b523d72..d27c250 100644 --- a/front/stores/dataStore.js +++ b/front/stores/dataStore.js @@ -314,7 +314,6 @@ export const useDataStore = defineStore('data', { // let filters = [{ field: 'query', value: filtersBackendList.value.join(' ') }] let filters = [{ field: 'query', value: `tag_is:"${Tag.getDisplayNameEllipsized(this.tagTodo)}"` }] - let list = await new TransactionRepository().searchTransaction({ filters }) list = get(list, 'data') ?? [] this.dashboard.transactionsWithTodo = TransactionTransformer.transformFromApiList(list)