From 56a55e2a4469f1aa945d6248d7f4ec76263f7663 Mon Sep 17 00:00:00 2001
From: ulleo <ulleo.wang@gmail.com>
Date: Fri, 28 Jun 2024 14:56:38 +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=E8=AE=BE=E7=BD=AE=E5=B8=B8=E8=A7=84?=
 =?UTF-8?q?=E7=BF=BB=E9=A1=B5=E5=90=8E=EF=BC=8C=E5=88=87=E6=8D=A2=E6=AF=8F?=
 =?UTF-8?q?=E9=A1=B5=E6=98=BE=E7=A4=BA=E6=9D=A1=E7=9B=AE=E6=95=B0=E5=90=8E?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=BF=BB=E9=A1=B5=EF=BC=8C=E6=AF=8F=E9=A1=B5?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=9D=A1=E7=9B=AE=E6=95=B0=E6=81=A2=E5=A4=8D?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/views/components/ChartComponentS2.vue  | 11 +++++++++++
 1 file changed, 11 insertions(+)

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 8e27575788..98645fed1c 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
@@ -109,6 +109,14 @@ const containerId = 'container-' + showPosition.value + '-' + view.value.id
 const viewTrack = ref(null)
 
 const calcData = (view: Chart, callback, resetPageInfo = true) => {
+  if (view.customAttr.basicStyle.tablePageStyle === 'general') {
+    if (state.currentPageSize !== 0) {
+      view.chartExtRequest.pageSize = state.currentPageSize
+    }
+  } else {
+    delete view.chartExtRequest.pageSize
+  }
+  console.log(view)
   if (view.tableId || view['dataFrom'] === 'template') {
     isError.value = false
     const v = JSON.parse(JSON.stringify(view))
@@ -258,6 +266,9 @@ const handleCurrentChange = pageNum => {
 }
 
 const handlePageSizeChange = pageSize => {
+  if (state.pageStyle === 'general') {
+    state.currentPageSize = pageSize
+  }
   let extReq = { pageSize: pageSize }
   if (chartExtRequest.value) {
     extReq = { ...extReq, ...chartExtRequest.value }