verdnatura/salix-front
verdnatura
/
salix-front
1
2
Fork 1
Code Issues Pull Requests 59 Releases Wiki Activity

Merge branch 'VnTable_fix' of https://gitea.verdnatura.es/verdnatura/salix-front into VnTable_fix
gitea/salix-front/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Jon Elias 2024-07-05 07:36:21 +02:00
parent b0ddad5231 31fa889d1f
commit 05d0322133
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/composables/useArrayData.js
View File

@ -85,7 +85,9 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
}
Object.assign(filter, store.userFilter, exprFilter);
const where = Object.assign(filter?.where ?? {}, 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 };