diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js index ee66f6be7..c36eb9990 100644 --- a/src/composables/useArrayData.js +++ b/src/composables/useArrayData.js @@ -75,13 +75,18 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) { limit: store.limit, }; + let userParams = { ...store.userParams }; + Object.assign(filter, store.userFilter); - delete store.filter.where; + let where; + if (filter?.where || store.filter?.where) + where = Object.assign(filter?.where ?? {}, store.filter?.where ?? {}); Object.assign(filter, store.filter); + filter.where = where; const params = { filter }; - Object.assign(params, store.userParams); + Object.assign(params, userParams); if (params.filter) params.filter.skip = store.skip; if (store?.order && typeof store?.order == 'string') store.order = [store.order]; if (store.order?.length) params.filter.order = [...store.order]; diff --git a/src/pages/Account/Card/AccountSummary.vue b/src/pages/Account/Card/AccountSummary.vue index 5a21e18a5..e6c21ed34 100644 --- a/src/pages/Account/Card/AccountSummary.vue +++ b/src/pages/Account/Card/AccountSummary.vue @@ -30,7 +30,7 @@ const filter = {