From 21ed2c84d1cc600442e8e905370aa7836e648d0c Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Thu, 25 Jan 2024 19:29:46 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE-=E9=80=8F=E8=A7=86?=
 =?UTF-8?q?=E8=A1=A8):=20=E9=80=8F=E8=A7=86=E8=A1=A8=E6=B1=87=E6=80=BB?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/table/TableTotalSelector.vue        |  4 +---
 .../js/panel/charts/table/table-pivot.ts           | 14 +++++++-------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableTotalSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableTotalSelector.vue
index 265e215229..34a96d790b 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableTotalSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/table/TableTotalSelector.vue
@@ -502,9 +502,7 @@ onMounted(() => {
         </el-radio-group>
       </el-form-item>
       <el-form-item
-        v-show="
-          false && chart.type === 'table-pivot' && state.tableTotalForm.col?.totalSort !== 'none'
-        "
+        v-show="chart.type === 'table-pivot' && state.tableTotalForm.col?.totalSort !== 'none'"
         :label="t('chart.total_sort_field')"
         class="form-item"
       >
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 c53f0a0777..08c114e578 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
@@ -307,30 +307,30 @@ function customCalcFunc(query, data, totalCfgMap) {
   switch (aggregation) {
     case 'SUM': {
       return data.reduce((p, n) => {
-        return p + n[n[EXTRA_FIELD]]
+        return p + n[query[EXTRA_FIELD]]
       }, 0)
     }
     case 'AVG': {
       const sum = data.reduce((p, n) => {
-        return p + n[n[EXTRA_FIELD]]
+        return p + n[query[EXTRA_FIELD]]
       }, 0)
       return sum / data.length
     }
     case 'MIN': {
       const result = minBy(data, n => {
-        return n[n[EXTRA_FIELD]]
+        return n[query[EXTRA_FIELD]]
       })
-      return result[result[EXTRA_FIELD]]
+      return result[query[EXTRA_FIELD]]
     }
     case 'MAX': {
       const result = maxBy(data, n => {
-        return n[n[EXTRA_FIELD]]
+        return n[query[EXTRA_FIELD]]
       })
-      return result[result[EXTRA_FIELD]]
+      return result[query[EXTRA_FIELD]]
     }
     default: {
       return data.reduce((p, n) => {
-        return p + n[n[EXTRA_FIELD]]
+        return p + n[query[EXTRA_FIELD]]
       }, 0)
     }
   }