diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js index 8567a0409e..50d620a348 100644 --- a/src/composables/useArrayData.js +++ b/src/composables/useArrayData.js @@ -18,7 +18,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) { onMounted(() => { setOptions(); - arrayDataStore.reset(['skip']); + reset(['skip']); const query = route.query; const searchUrl = store.searchUrl; @@ -74,9 +74,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) { }; let exprFilter; - let userParams = { ...store.userParams }; - if (store?.exprBuilder) { const where = buildFilter(userParams, (param, value) => { const res = store.exprBuilder(param, value); @@ -159,11 +157,10 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) { if (filter) store.filter = filter; let userParams = { ...store.userParams, ...params }; - userParams = sanitizerParams(userParams, store?.exprBuilder); store.userParams = userParams; - arrayDataStore.reset(['skip', 'filter.skip', 'page']); + reset(['skip', 'filter.skip', 'page']); await fetch({}); return { filter, params }; @@ -190,6 +187,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) { } store.order = order; + reset(['skip', 'filter.skip', 'page']); fetch({}); index++;