From 5ff543f5abb3ca9870b2e398567270396743459c Mon Sep 17 00:00:00 2001
From: wisonic-s <51065359+wisonic-s@users.noreply.github.com>
Date: Wed, 12 Mar 2025 15:23:13 +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=A4=9A=E7=BB=B4=E5=BA=A6=E6=80=BB?=
 =?UTF-8?q?=E8=AE=A1=E7=BB=84=E5=86=85=E6=8E=92=E5=BA=8F=E6=9C=AA=E7=94=9F?=
 =?UTF-8?q?=E6=95=88=20#15159=20(#15313)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/panel/charts/table/table-pivot.ts      | 36 ++++++++++---------
 1 file changed, 20 insertions(+), 16 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 dfeda71b63..ef8692639c 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
@@ -191,15 +191,17 @@ export class TablePivot extends S2ChartView<PivotSheet> {
       tableTotal.row.showGrandTotals &&
       v.indexOf(tableTotal.row.totalSortField) > -1
     ) {
-      const sort = {
-        sortFieldId: c[0],
-        sortMethod: tableTotal.row.totalSort.toUpperCase(),
-        sortByMeasure: TOTAL_VALUE,
-        query: {
-          [EXTRA_FIELD]: tableTotal.row.totalSortField
+      c.forEach(i => {
+        const sort = {
+          sortFieldId: i,
+          sortMethod: tableTotal.row.totalSort.toUpperCase(),
+          sortByMeasure: TOTAL_VALUE,
+          query: {
+            [EXTRA_FIELD]: tableTotal.row.totalSortField
+          }
         }
-      }
-      sortParams.push(sort)
+        sortParams.push(sort)
+      })
     }
     if (
       tableTotal.col.totalSort &&
@@ -208,15 +210,17 @@ export class TablePivot extends S2ChartView<PivotSheet> {
       tableTotal.col.showGrandTotals &&
       v.indexOf(tableTotal.col.totalSortField) > -1
     ) {
-      const sort = {
-        sortFieldId: r[0],
-        sortMethod: tableTotal.col.totalSort.toUpperCase(),
-        sortByMeasure: TOTAL_VALUE,
-        query: {
-          [EXTRA_FIELD]: tableTotal.col.totalSortField
+      r.forEach(i => {
+        const sort = {
+          sortFieldId: i,
+          sortMethod: tableTotal.col.totalSort.toUpperCase(),
+          sortByMeasure: TOTAL_VALUE,
+          query: {
+            [EXTRA_FIELD]: tableTotal.col.totalSortField
+          }
         }
-      }
-      sortParams.push(sort)
+        sortParams.push(sort)
+      })
     }
     //列维度为空，行排序按照指标列来排序，取第一个有排序设置的指标
     if (!columnFields?.length) {