From bf69e9d15c82a6892db630f66a39144ad7d38275 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Thu, 25 Jan 2024 19:25:11 +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

---
 .../src/views/chart/chart/table/table-info.js      | 14 +++++++-------
 .../views/chart/components/shapeAttr/TotalCfg.vue  |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/frontend/src/views/chart/chart/table/table-info.js b/core/frontend/src/views/chart/chart/table/table-info.js
index cfb436362d..93a3812711 100644
--- a/core/frontend/src/views/chart/chart/table/table-info.js
+++ b/core/frontend/src/views/chart/chart/table/table-info.js
@@ -861,30 +861,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)
     }
   }
diff --git a/core/frontend/src/views/chart/components/shapeAttr/TotalCfg.vue b/core/frontend/src/views/chart/components/shapeAttr/TotalCfg.vue
index 41e7b4d4fc..577021dd6a 100644
--- a/core/frontend/src/views/chart/components/shapeAttr/TotalCfg.vue
+++ b/core/frontend/src/views/chart/components/shapeAttr/TotalCfg.vue
@@ -304,7 +304,7 @@
             </el-radio-group>
           </el-form-item>
           <el-form-item
-            v-show="false && chart.type === 'table-pivot' && totalForm.col.totalSort !== 'none'"
+            v-show="chart.type === 'table-pivot' && totalForm.col.totalSort !== 'none'"
             :label="$t('chart.total_sort_field')"
             class="form-item"
           >