feat(视图): 透视表列汇总支持按合计排序

welovelearning · Dec 2, 2022 · 291d3f8 · 291d3f8
1 parent 0aabb23
commit 291d3f8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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"
           >