From 78a176e4fc165d4fa44688a4c8a40e1096a5764a Mon Sep 17 00:00:00 2001
From: ulleo <ulleo.wang@gmail.com>
Date: Thu, 13 Jun 2024 16:37:57 +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=88=86=E9=A1=B5=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=8F=AF=E8=83=BD=E6=97=A0=E6=B3=95=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../editor/editor-style/components/BasicStyleSelector.vue       | 2 +-
 .../chart/components/views/components/ChartComponentS2.vue      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue
index 2037465b19..78b54bddec 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue
@@ -734,7 +734,7 @@ onMounted(() => {
       </el-radio-group>
     </el-form-item>
     <el-form-item
-      v-if="showProperty('tablePageMode')"
+      v-if="showProperty('tablePageMode') && state.basicStyleForm.tablePageMode !== 'pull'"
       :label="t('chart.table_pager_style')"
       class="form-item"
       :class="'form-item-' + themes"
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 5b265206d0..18f99706cc 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
@@ -181,7 +181,7 @@ const setupPage = (chart: ChartObj, resetPageInfo?: boolean) => {
   }
   const pageInfo = state.pageInfo
   pageInfo.pageSize = customAttr.basicStyle.tablePageSize ?? 20
-  if (state.totalItems > state.pageInfo.pageSize) {
+  if (state.totalItems > state.pageInfo.pageSize || state.pageStyle !== 'general') {
     pageInfo.total = state.totalItems
     state.showPage = true
   } else {