From 5e1dd6231dfcb7df8d92f6f373693e89ca164375 Mon Sep 17 00:00:00 2001 From: Pranav C Date: Fri, 10 May 2024 16:37:09 +0530 Subject: [PATCH] fix: shared form pagination related issues (#8451) --- packages/nc-gui/components/smartsheet/Form.vue | 4 +++- packages/nc-gui/components/smartsheet/Pagination.vue | 5 +++++ packages/nc-gui/composables/useSharedView.ts | 2 +- packages/nc-gui/composables/useViewData.ts | 6 ++++++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/packages/nc-gui/components/smartsheet/Form.vue b/packages/nc-gui/components/smartsheet/Form.vue index b993da844c..9a4ee0c3fa 100644 --- a/packages/nc-gui/components/smartsheet/Form.vue +++ b/packages/nc-gui/components/smartsheet/Form.vue @@ -1263,7 +1263,9 @@ useEventListener(
-
{{ $t('objects.field') }} {{ $t('general.text').toLowerCase() }}
+
+ {{ $t('objects.field') }} {{ $t('general.text').toLowerCase() }} +
vPaginationData.value?.pageSize ?? 25, set: (size: number) => { if (vPaginationData.value) { + // if there is no change in size then return + if (vPaginationData.value?.pageSize && vPaginationData.value?.pageSize === size) { + return + } + vPaginationData.value.pageSize = size if (vPaginationData.value.totalRows && page.value * size < vPaginationData.value.totalRows) { diff --git a/packages/nc-gui/composables/useSharedView.ts b/packages/nc-gui/composables/useSharedView.ts index 4c32d0aab4..9f93227c46 100644 --- a/packages/nc-gui/composables/useSharedView.ts +++ b/packages/nc-gui/composables/useSharedView.ts @@ -129,12 +129,12 @@ export function useSharedView() { const page = paginationData.value.page || 1 const pageSize = paginationData.value.pageSize || appInfoDefaultLimit param.offset = (page - 1) * pageSize + param.limit = sharedView.value?.type === ViewTypes.MAP ? 1000 : pageSize } return await $api.public.dataList( sharedView.value.uuid!, { - limit: sharedView.value?.type === ViewTypes.MAP ? 1000 : undefined, ...param, filterArrJson: JSON.stringify(param.filtersArr ?? nestedFilters.value), sortArrJson: JSON.stringify(param.sortsArr ?? sorts.value), diff --git a/packages/nc-gui/composables/useViewData.ts b/packages/nc-gui/composables/useViewData.ts index 4417d827f9..11f94687bc 100644 --- a/packages/nc-gui/composables/useViewData.ts +++ b/packages/nc-gui/composables/useViewData.ts @@ -200,6 +200,12 @@ export function useViewData( } formattedData.value = formatData(response.list) paginationData.value = response.pageInfo || paginationData.value || {} + + // if public then update sharedPaginationData + if (isPublic.value) { + sharedPaginationData.value = paginationData.value + } + excludePageInfo.value = !response.pageInfo isPaginationLoading.value = false