From d3a19d3fa5568da35e71d530846b73abcebc508d Mon Sep 17 00:00:00 2001 From: wisonic-s Date: Mon, 29 Sep 2025 10:43:31 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=AF=BC=E5=87=BA=E5=88=86=E7=BB=84=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/chart/server/ChartDataServer.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java b/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java index 295ee9f93d..fb982689a9 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java +++ b/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java @@ -655,10 +655,18 @@ public class ChartDataServer implements ChartDataApi { } } else { Cell cell1 = rowMap.get("row" + depth).createCell(width); - cell1.setCellValue(getGroupName(tableHeader, column.getField())); + if (StringUtils.isNotBlank(column.getTitle())) { + cell1.setCellValue(column.getTitle()); + } else { + cell1.setCellValue(getGroupName(tableHeader, column.getField())); + } cell1.setCellStyle(cellStyle); Cell cell2 = rowMap.get("row" + depth).createCell(width + column.getWidth() - 1); - cell2.setCellValue(getGroupName(tableHeader, column.getField())); + if (StringUtils.isNotBlank(column.getTitle())) { + cell2.setCellValue(column.getTitle()); + } else { + cell2.setCellValue(getGroupName(tableHeader, column.getField())); + } cell2.setCellStyle(cellStyle); CellRangeAddress region = new CellRangeAddress(depth, depth, width, width + column.getWidth() - 1); sheet.addMergedRegion(region);