From e7b431e9ec2c9745fb9b980d039d8f721093498c Mon Sep 17 00:00:00 2001 From: alexm Date: Tue, 19 Nov 2024 09:32:35 +0100 Subject: [PATCH 1/3] fix(VnPaginate): disable pagination --- src/components/ui/VnPaginate.vue | 2 ++ src/pages/Item/ItemFixedPrice.vue | 2 +- src/pages/Ticket/Card/TicketSale.vue | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue index b058dc642..04a843889 100644 --- a/src/components/ui/VnPaginate.vue +++ b/src/components/ui/VnPaginate.vue @@ -141,6 +141,8 @@ async function fetch(params) { } async function paginate() { + if (props.disableInfiniteScroll || !store.hasMoreData) return; + const { page, rowsPerPage, sortBy, descending } = pagination.value; if (!props.url) return; diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue index 815c7d519..628af681a 100644 --- a/src/pages/Item/ItemFixedPrice.vue +++ b/src/pages/Item/ItemFixedPrice.vue @@ -440,7 +440,7 @@ function handleOnDataSave({ CrudModelRef }) { selection: 'multiple', }" :crud-model="{ - paginate: false, + disableInfiniteScroll: true, }" v-model:selected="rowsSelected" :row-click="saveOnRowChange" diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue index 1b9791529..08cf248ba 100644 --- a/src/pages/Ticket/Card/TicketSale.vue +++ b/src/pages/Ticket/Card/TicketSale.vue @@ -621,7 +621,7 @@ watch( }" :create-as-dialog="false" :crud-model="{ - paginate: false, + disableInfiniteScroll: true, }" :default-remove="false" :default-reset="false" From 5d58bb0c139d7dd108c75736cd24325c8115a447 Mon Sep 17 00:00:00 2001 From: alexm Date: Tue, 19 Nov 2024 09:47:59 +0100 Subject: [PATCH 2/3] fix(VnPaginate): disable pagination --- src/components/VnTable/VnTable.vue | 2 ++ src/components/ui/VnPaginate.vue | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue index 908157610..da6c89cbb 100644 --- a/src/components/VnTable/VnTable.vue +++ b/src/components/VnTable/VnTable.vue @@ -325,6 +325,8 @@ function handleOnDataSaved(_) { } function handleScroll() { + if ($props.crudModel.disableInfiniteScroll) return; + const tMiddle = tableRef.value.$el.querySelector('.q-table__middle'); const { scrollHeight, scrollTop, clientHeight } = tMiddle; const isAtBottom = Math.abs(scrollHeight - scrollTop - clientHeight) <= 40; diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue index 04a843889..b058dc642 100644 --- a/src/components/ui/VnPaginate.vue +++ b/src/components/ui/VnPaginate.vue @@ -141,8 +141,6 @@ async function fetch(params) { } async function paginate() { - if (props.disableInfiniteScroll || !store.hasMoreData) return; - const { page, rowsPerPage, sortBy, descending } = pagination.value; if (!props.url) return; From 8a1db719e3c3c68eccad2218a9a47c966d050a1f Mon Sep 17 00:00:00 2001 From: robert Date: Tue, 19 Nov 2024 11:58:16 +0100 Subject: [PATCH 3/3] fix(Supplier): change isSerious to isReal --- src/i18n/locale/en.yml | 2 +- src/i18n/locale/es.yml | 2 +- src/pages/Supplier/Card/SupplierBasicData.vue | 4 ++-- src/pages/Supplier/Card/SupplierDescriptor.vue | 4 ++-- src/pages/Supplier/Card/SupplierSummary.vue | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index aa8df17e2..070125540 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -940,7 +940,7 @@ supplier: basicData: alias: Alias workerFk: Responsible - isSerious: Verified + isReal: Verified isActive: Active isPayMethodChecked: PayMethod checked note: Notes diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index 575e2c6c7..54728c5b6 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -938,7 +938,7 @@ supplier: basicData: alias: Alias workerFk: Responsable - isSerious: Verificado + isReal: Verificado isActive: Activo isPayMethodChecked: Método de pago validado note: Notas diff --git a/src/pages/Supplier/Card/SupplierBasicData.vue b/src/pages/Supplier/Card/SupplierBasicData.vue index 52964557d..c1a107d3a 100644 --- a/src/pages/Supplier/Card/SupplierBasicData.vue +++ b/src/pages/Supplier/Card/SupplierBasicData.vue @@ -61,8 +61,8 @@ const workersOptions = ref([]); { {{ t('Inactive supplier') }} `#/supplier/${entityId.value}/${section}`;