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-11-22 11:53:31 +08:00
parent dedf013830
commit 2110389d8c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/package.json
View File

@ -35,7 +35,7 @@
"@antv/l7-scene": "2.8.31",
"@antv/l7-source": "2.8.31",
"@antv/l7-utils": "2.8.31",
"@antv/s2": "^1.11.0",
"@antv/s2": "1.35.0",
"@antv/util": "^2.0.17",
"@riophae/vue-treeselect": "0.4.0",
"@tinymce/tinymce-vue": "^3.2.8",

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

@ -424,7 +424,7 @@ export function baseTablePivot(s2, container, chart, action, tableData) {
// 解析合计、小计排序
const sortParams = []
if (totalCfg.row.totalSort && totalCfg.row.totalSort !== 'none' && c.length > 0) {
if (totalCfg.row.totalSort && totalCfg.row.totalSort !== 'none' && c.length > 0 && totalCfg.row.showGrandTotals) {
const sort = {
sortFieldId: c[0],
sortMethod: totalCfg.row.totalSort.toUpperCase(),
@ -435,7 +435,7 @@ export function baseTablePivot(s2, container, chart, action, tableData) {
}
sortParams.push(sort)
}
if (totalCfg.col.totalSort && totalCfg.col.totalSort !== 'none' && r.length > 0) {
if (totalCfg.col.totalSort && totalCfg.col.totalSort !== 'none' && r.length > 0 && totalCfg.col.showGrandTotals) {
const sort = {
sortFieldId: r[0],
sortMethod: totalCfg.col.totalSort.toUpperCase(),