From 248416b6763916d80c6990003076312f42764388 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 17 Apr 2024 08:41:47 +0200
Subject: [PATCH 1/3] fix(lilium) #7180 SupplierList Scroll

---
 src/components/ui/VnPaginate.vue | 13 ++++++++++---
 src/composables/useArrayData.js  | 11 +++++++++--
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index b259bf8be..3328dc437 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -83,7 +83,12 @@ const store = arrayData.store;
 onMounted(() => {
     if (props.autoLoad) fetch();
 });
-
+// watch(
+//     () => arrayData,
+//     () => {
+//         console.error(this);
+//     }
+// );
 watch(
     () => props.data,
     () => {
@@ -127,7 +132,7 @@ async function paginate() {
 }
 
 function endPagination() {
-    hasMoreData.value = arrayData.hasMoreData.value;
+    // hasMoreData.value = store.hasMoreData.value;
     isLoading.value = false;
     emit('onFetch', store.data);
     emit('onPaginate');
@@ -183,11 +188,13 @@ defineExpose({ fetch, addFilter });
             </QCard>
         </div>
     </div>
+    <!-- <pre>hasMoreData*{{ hasMoreData }}</pre>
+    <pre>arrayData.hasMoreData**{{ arrayData.store.hasMoreData }}</pre> -->
     <QInfiniteScroll
         v-if="store.data"
         @load="onLoad"
         :offset="offset"
-        :disable="disableInfiniteScroll || !arrayData.hasMoreData.value"
+        :disable="disableInfiniteScroll || !arrayData.hasMoreData"
         class="full-width"
         v-bind="$attrs"
     >
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 093806567..c3d969f55 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -20,6 +20,13 @@ export function useArrayData(key, userOptions) {
 
     const page = ref(1);
 
+    // watch(
+    //     () => store.hasMoreData,
+    //     () => {
+    //         hasMoreData.value = store.hasMoreData;
+    //         arrayDataStore.$state.console.error(this);
+    //     }
+    // );
     onMounted(() => {
         setOptions();
 
@@ -98,7 +105,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 +176,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;

From 846c85ed1a3a4a7634eeefa01d8c60e45c7a03d5 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 18 Apr 2024 09:36:24 +0000
Subject: [PATCH 2/3] Actualizar src/components/ui/VnPaginate.vue

---
 src/components/ui/VnPaginate.vue | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index 3328dc437..f516f473d 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -83,12 +83,7 @@ const store = arrayData.store;
 onMounted(() => {
     if (props.autoLoad) fetch();
 });
-// watch(
-//     () => arrayData,
-//     () => {
-//         console.error(this);
-//     }
-// );
+
 watch(
     () => props.data,
     () => {
@@ -132,7 +127,6 @@ async function paginate() {
 }
 
 function endPagination() {
-    // hasMoreData.value = store.hasMoreData.value;
     isLoading.value = false;
     emit('onFetch', store.data);
     emit('onPaginate');
@@ -188,8 +182,7 @@ defineExpose({ fetch, addFilter });
             </QCard>
         </div>
     </div>
-    <!-- <pre>hasMoreData*{{ hasMoreData }}</pre>
-    <pre>arrayData.hasMoreData**{{ arrayData.store.hasMoreData }}</pre> -->
+    
     <QInfiniteScroll
         v-if="store.data"
         @load="onLoad"

From 7f63ea4e1c5c0b3ea5c7f6c4d465353b9e2171a7 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 18 Apr 2024 09:37:01 +0000
Subject: [PATCH 3/3] Actualizar src/composables/useArrayData.js

---
 src/composables/useArrayData.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index c3d969f55..a87ccbb96 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -20,13 +20,6 @@ export function useArrayData(key, userOptions) {
 
     const page = ref(1);
 
-    // watch(
-    //     () => store.hasMoreData,
-    //     () => {
-    //         hasMoreData.value = store.hasMoreData;
-    //         arrayDataStore.$state.console.error(this);
-    //     }
-    // );
     onMounted(() => {
         setOptions();