From 545c5875bbeff009569e7e8bd4cd8c92b19e3b25 Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Mon, 21 Nov 2022 12:40:53 +0800 Subject: [PATCH] fix(nc-gui): expectedPage logic --- packages/nc-gui/composables/useViewData.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/nc-gui/composables/useViewData.ts b/packages/nc-gui/composables/useViewData.ts index c4e5bedbff..7b25a42123 100644 --- a/packages/nc-gui/composables/useViewData.ts +++ b/packages/nc-gui/composables/useViewData.ts @@ -192,8 +192,8 @@ export function useViewData( // to cater the case like when querying with a non-zero offset // the result page may point to the target page where the actual returned data don't display on - const expectedPage = Math.ceil(paginationData.value.totalRows! / paginationData.value.pageSize!) - if (Math.max(1, expectedPage) < paginationData.value.page!) { + const expectedPage = Math.max(1, Math.ceil(paginationData.value.totalRows! / paginationData.value.pageSize!)) + if (expectedPage < paginationData.value.page!) { await changePage(expectedPage) }