From 291d3f83529ae3d12583814af40993054fb15f8f Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Fri, 2 Dec 2022 11:05:59 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):=20=E9=80=8F=E8=A7=86?=
 =?UTF-8?q?=E8=A1=A8=E5=88=97=E6=B1=87=E6=80=BB=E6=94=AF=E6=8C=81=E6=8C=89?=
 =?UTF-8?q?=E5=90=88=E8=AE=A1=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/chart/table/table-info.js         | 1 -
 frontend/src/views/chart/components/shapeAttr/TotalCfg.vue | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/frontend/src/views/chart/chart/table/table-info.js b/frontend/src/views/chart/chart/table/table-info.js
index 63f044588f..46dabf1ed4 100644
--- a/frontend/src/views/chart/chart/table/table-info.js
+++ b/frontend/src/views/chart/chart/table/table-info.js
@@ -435,7 +435,6 @@ export function baseTablePivot(s2, container, chart, action, tableData) {
     }
     sortParams.push(sort)
   }
-  totalCfg.col.totalSort = false
   if (totalCfg.col.totalSort && totalCfg.col.totalSort !== 'none' && r.length > 0 && totalCfg.col.showGrandTotals && v.indexOf(totalCfg.col.totalSortField) > -1) {
     const sort = {
       sortFieldId: r[0],
diff --git a/frontend/src/views/chart/components/shapeAttr/TotalCfg.vue b/frontend/src/views/chart/components/shapeAttr/TotalCfg.vue
index d7160abd24..df2e1f2a95 100644
--- a/frontend/src/views/chart/components/shapeAttr/TotalCfg.vue
+++ b/frontend/src/views/chart/components/shapeAttr/TotalCfg.vue
@@ -225,7 +225,7 @@
             </el-select>
           </el-form-item>
           <el-form-item
-            v-if="false && chart.type === 'table-pivot'"
+            v-if="chart.type === 'table-pivot'"
             :label="$t('chart.total_sort')"
             class="form-item"
           >
@@ -239,7 +239,7 @@
             </el-radio-group>
           </el-form-item>
           <el-form-item
-            v-if="false && chart.type === 'table-pivot' && totalForm.col.totalSort !== 'none'"
+            v-if="chart.type === 'table-pivot' && totalForm.col.totalSort !== 'none'"
             :label="$t('chart.total_sort_field')"
             class="form-item"
           >