diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue index 66d5c11a5..6d25dc105 100644 --- a/src/components/ui/VnPaginate.vue +++ b/src/components/ui/VnPaginate.vue @@ -130,19 +130,19 @@ const addFilter = async (filter, params) => { await arrayData.addFilter({ filter, params }); }; -async function fetch(params, keepRowsNumber = false) { +async function fetch(params, keepPagination = false) { useArrayData(props.dataKey, params); const { limit, skip } = arrayData.store; - if (keepRowsNumber) { + if (!keepPagination) await arrayData.fetch({ append: false }); + else { arrayData.store.limit = limit + skip; arrayData.store.skip = 0; - } - await arrayData.fetch({ append: false }); - if (keepRowsNumber) { + await arrayData.fetch({ append: false }); arrayData.store.limit = limit; arrayData.store.skip = skip; } + if (!store.hasMoreData) isLoading.value = false; emit('onFetch', store.data);