center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
junjun 2022-12-02 11:05:59 +08:00
parent 0aabb23165
commit 291d3f8352
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/views/chart/chart/table/table-info.js
View File

@ -435,7 +435,6 @@ export function baseTablePivot(s2, container, chart, action, tableData) {
} }
sortParams.push(sort) 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) { if (totalCfg.col.totalSort && totalCfg.col.totalSort !== 'none' && r.length > 0 && totalCfg.col.showGrandTotals && v.indexOf(totalCfg.col.totalSortField) > -1) {
const sort = { const sort = {
sortFieldId: r[0], sortFieldId: r[0],

4
frontend/src/views/chart/components/shapeAttr/TotalCfg.vue
View File

@ -225,7 +225,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
v-if="false && chart.type === 'table-pivot'" v-if="chart.type === 'table-pivot'"
:label="$t('chart.total_sort')" :label="$t('chart.total_sort')"
class="form-item" class="form-item"
> >
@ -239,7 +239,7 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<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')" :label="$t('chart.total_sort_field')"
class="form-item" class="form-item"
> >