From ce354c2495783d75f94bc6d3e6cdf060192f9240 Mon Sep 17 00:00:00 2001
From: wisonic-s <51065359+wisonic-s@users.noreply.github.com>
Date: Fri, 28 Mar 2025 11:29:41 +0800
Subject: [PATCH] Pr@dev v2@fix table scroll (#15522)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(图表): 修复分组柱状图子维度为空时不显示

* fix(图表): 修复表格滚动失效
---
 .../src/views/chart/components/js/panel/charts/bar/bar.ts    | 5 +----
 .../chart/components/views/components/ChartComponentS2.vue   | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/bar/bar.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/bar/bar.ts
index 894e42f905..88f1d4f06c 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/charts/bar/bar.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/charts/bar/bar.ts
@@ -448,10 +448,7 @@ export class GroupBar extends StackBar {
     }
     const { chart } = drawOptions
     const { xAxis, xAxisExt, yAxis } = chart
-    let innerSort = true
-    if (!(xAxis.length && xAxisExt.length && yAxis.length)) {
-      innerSort = false
-    }
+    let innerSort = !!(xAxis.length && xAxisExt.length && yAxis.length)
     if (innerSort && yAxis[0].sort === 'none') {
       innerSort = false
     }
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 a5fb145885..dd309dfb75 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
@@ -294,7 +294,7 @@ const initScroll = () => {
       myChart &&
       senior?.scrollCfg?.open &&
       chartData.value.tableRow?.length &&
-      PAGE_CHARTS.includes(chart.type) &&
+      PAGE_CHARTS.includes(props.view.type) &&
       !state.showPage
     ) {
       // 防止多次渲染