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

fix: remove FIXME
gitea/salix-front/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Javier Segarra 2024-09-11 09:20:54 +02:00
parent 19eb770893
commit 2d8322c6da
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/composables/useArrayData.js
View File

@ -86,26 +86,12 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
Object.assign(filter, store.userFilter, exprFilter);
let where;
//FIXME: ARRAY DATA FALLA AL JUNTAR WHERE'S
// console.log(
// 'userParams?.filter?.where: ',
// userParams?.filter?.where,
// filter?.where,
// store.filter?.where
// );
if ((userParams?.filter?.where, filter?.where || store.filter?.where))
where = Object.assign(
userParams?.filter?.where ?? {},
filter?.where ?? {},
store.filter?.where ?? {}
);
if (filter?.where || store.filter?.where)
where = Object.assign(filter?.where ?? {}, store.filter?.where ?? {});
Object.assign(filter, store.filter);
filter.where = where;
// console.log('where: ', where);
const params = { filter };
// console.log('params: ', params);
delete userParams?.filter;
Object.assign(params, userParams);
params.filter.skip = store.skip;
if (store.order && store.order.length) params.filter.order = store.order;