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

Merge pull request #3822 from dataease/pr@dev@feat_table

Browse Source 
feat(视图): 透视表行汇总支持按合计排序
This commit is contained in:
Junjun 2022-11-22 13:03:33 +08:00 committed by GitHub
commit 3507241d24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 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,6 +435,7 @@ 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) {
const sort = {
sortFieldId: r[0],

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

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