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

Merge branch 'dev' into 6724-disableEntryBooked
gitea/salix-front/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Guillermo Bonet 2024-04-18 11:18:22 +00:00
parent 7eb9666c7c 6ab7b4b68d
commit 9b5e8024be
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/ui/VnPaginate.vue
View File

@ -127,7 +127,6 @@ async function paginate() {
}
function endPagination() {
hasMoreData.value = arrayData.hasMoreData.value;
isLoading.value = false;
emit('onFetch', store.data);
emit('onPaginate');
@ -183,11 +182,12 @@ defineExpose({ fetch, addFilter });
</QCard>
</div>
</div>
<QInfiniteScroll
v-if="store.data"
@load="onLoad"
:offset="offset"
:disable="disableInfiniteScroll || !arrayData.hasMoreData.value"
:disable="disableInfiniteScroll || !arrayData.hasMoreData"
class="full-width"
v-bind="$attrs"
>

4
src/composables/useArrayData.js
View File

@ -98,7 +98,7 @@ export function useArrayData(key, userOptions) {
const { limit } = filter;
hasMoreData.value = response.data.length >= limit;
store.hasMoreData = hasMoreData.value;
if (append) {
if (!store.data) store.data = [];
for (const row of response.data) store.data.push(row);
@ -169,7 +169,7 @@ export function useArrayData(key, userOptions) {
}
async function loadMore() {
if (!hasMoreData.value) return;
if (!hasMoreData.value && !store.hasMoreData) return;
store.skip = store.limit * page.value;
page.value += 1;