From be890617f2bd14586a8e036c2cd288f701724d53 Mon Sep 17 00:00:00 2001 From: wisonic-s Date: Wed, 12 Jun 2024 17:29:50 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E8=A7=86=E5=9B=BE):=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=20AntV=20=E6=B1=87=E6=80=BB=E8=A1=A8=E6=B1=87?= =?UTF-8?q?=E6=80=BB=E8=A1=8C=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/chart/chart/table/table-info.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/core/frontend/src/views/chart/chart/table/table-info.js b/core/frontend/src/views/chart/chart/table/table-info.js index 378bb0aeac..d25229c4ef 100644 --- a/core/frontend/src/views/chart/chart/table/table-info.js +++ b/core/frontend/src/views/chart/chart/table/table-info.js @@ -435,19 +435,21 @@ export function baseTableNormal(container, chart, action, tableData, vueCom, res heightByField[newData.length] = customAttr.size.tableTitleHeight s2Options.style.rowCfg = { heightByField } // 计算汇总加入到数据里,冻结最后一行 - s2Options.frozenTrailingRowCount = 1 + const xAxis = JSON.parse(chart.xaxis) const yAxis = JSON.parse(chart.yaxis) - const summaryObj = newData.reduce((p, n) => { + s2Options.frozenTrailingRowCount = 1 + const summaryObj = yAxis.length > 0 ? newData.reduce((p, n) => { yAxis.forEach(axis => { p[axis.dataeaseName] = (n[axis.dataeaseName] || 0) + (p[axis.dataeaseName] || 0) }) return p - }, { SUMMARY: true }) + }, { SUMMARY: true }) : {} newData.push(summaryObj) s2Options.dataCell = viewMeta => { if (viewMeta.rowIndex === newData.length - 1) { - if (viewMeta.colIndex === 0 && yAxis.length !== 0) { + if (viewMeta.colIndex === 0 && xAxis.length !== 0) { viewMeta.fieldValue = customAttr.size.summaryLabel ?? '总计' + viewMeta.summaryLabel = viewMeta.fieldValue } return new SummaryCell(viewMeta, viewMeta.spreadsheet) } @@ -1043,7 +1045,7 @@ function showTooltipValue(s2Instance, event, meta) { return } let value = cellMeta.data[valueField] - if (valueField === SERIES_NUMBER_FIELD) { + if (cellMeta.summaryLabel) { value = cellMeta.fieldValue } if (!value) {