diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js index 651bcefb0..a198c157d 100644 --- a/src/composables/useArrayData.js +++ b/src/composables/useArrayData.js @@ -234,8 +234,12 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) { async function loadMore() { if (!store.hasMoreData) return; + const isCurrentFilter = JSON.parse(store.currentFilter.filter); - store.skip = store.limit * store.page; + const limit = isCurrentFilter + ? isCurrentFilter.limit ?? store.limit + : store.limit; + store.skip = limit * store.page; store.page += 1; await fetch({ append: true });