From f0cf28ac1d1d975afcd88e6b536e552c7a4b4ef0 Mon Sep 17 00:00:00 2001
From: wisonic <shaochuan.wu@fit2cloud.com>
Date: Mon, 3 Mar 2025 23:39:04 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E9=80=8F=E8=A7=86=E8=A1=A8=E5=9C=A8=E5=88=97=E7=BB=B4=E5=BA=A6?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E6=97=B6=E9=A6=96=E6=AC=A1=E5=88=97=E6=80=BB?=
 =?UTF-8?q?=E8=AE=A1=E6=98=BE=E7=A4=BA=E4=B8=BA=200?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/panel/charts/table/table-pivot.ts      | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-pivot.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-pivot.ts
index 3b9ed23a9f..7170190fea 100644
--- a/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-pivot.ts
+++ b/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-pivot.ts
@@ -244,9 +244,23 @@ export class TablePivot extends S2ChartView<PivotSheet> {
       col: chart.xAxisExt,
       quota: chart.yAxis
     }
-    //树形模式下，列维度为空，行小计会变成列总计，特殊处理下
-    if (basicStyle.tableLayoutMode === 'tree' && !chart.xAxisExt?.length) {
-      tableTotal.col.calcTotals = tableTotal.row.calcSubTotals
+    // 沒有列维度需要特殊处理
+    if (!chart.xAxisExt?.length) {
+      //树形模式下，列维度为空，行小计的配置会变成列总计
+      if (basicStyle.tableLayoutMode === 'tree') {
+        tableTotal.col.calcTotals = tableTotal.row.calcSubTotals
+        if (!tableTotal.col.calcTotals.cfg?.length) {
+          tableTotal.col.calcTotals.cfg = chart.yAxis.map(y => {
+            return {
+              dataeaseName: y.dataeaseName,
+              aggregation: 'SUM'
+            }
+          })
+        }
+      } else {
+        // 列总计设置为空
+        tableTotal.col.calcTotals.calcFunc = () => '-'
+      }
     }
     totals.forEach(total => {
       if (total.cfg?.length) {