From 2110389d8cc21c8027a46ae7b0edbb86c879725a Mon Sep 17 00:00:00 2001 From: junjun Date: Tue, 22 Nov 2022 11:53:31 +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=E6=94=AF=E6=8C=81=E6=8C=89=E5=90=88=E8=AE=A1=E6=8E=92?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/package.json | 2 +- frontend/src/views/chart/chart/table/table-info.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 15c23737b0..2c535eb052 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -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", diff --git a/frontend/src/views/chart/chart/table/table-info.js b/frontend/src/views/chart/chart/table/table-info.js index 976215d370..5e7a7d552f 100644 --- a/frontend/src/views/chart/chart/table/table-info.js +++ b/frontend/src/views/chart/chart/table/table-info.js @@ -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(),