From 6752ac99da7f830c45dfaa84050da237ec4f035b Mon Sep 17 00:00:00 2001
From: wisonic <shaochuan.wu@fit2cloud.com>
Date: Tue, 14 Jan 2025 16:37:35 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E8=A1=A8=E5=B8=B8=E8=A7=84=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E5=88=87=E6=8D=A2=E5=88=86=E9=A1=B5=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E5=90=8E=E5=BA=8F=E5=8F=B7=E8=AE=A1=E7=AE=97=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=20#14601?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/components/ChartComponentS2.vue       | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue b/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue
index ea2b3925ba..48183d32c6 100644
--- a/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue
+++ b/core/core-frontend/src/views/chart/components/views/components/ChartComponentS2.vue
@@ -235,7 +235,16 @@ const setupPage = (chart: ChartObj, resetPageInfo?: boolean) => {
     return
   }
   const pageInfo = state.pageInfo
-  pageInfo.pageSize = customAttr.basicStyle.tablePageSize ?? 20
+  state.pageStyle = customAttr.basicStyle.tablePageStyle
+  if (state.pageStyle === 'general') {
+    if (state.currentPageSize === 0) {
+      state.currentPageSize = pageInfo.pageSize
+    } else {
+      pageInfo.pageSize = state.currentPageSize
+    }
+  } else {
+    pageInfo.pageSize = customAttr.basicStyle.tablePageSize ?? 20
+  }
   if (state.totalItems > state.pageInfo.pageSize || state.pageStyle === 'general') {
     pageInfo.total = state.totalItems
     state.showPage = true
@@ -245,12 +254,6 @@ const setupPage = (chart: ChartObj, resetPageInfo?: boolean) => {
   if (resetPageInfo) {
     state.pageInfo.currentPage = 1
   }
-  state.pageStyle = customAttr.basicStyle.tablePageStyle
-  if (state.pageStyle === 'general') {
-    if (state.currentPageSize == 0) {
-      state.currentPageSize = pageInfo.pageSize
-    }
-  }
 }
 
 const mouseMove = () => {