From 5a42b7df399c8ac44dd5740db3b8064257b1733f Mon Sep 17 00:00:00 2001 From: wisonic-s Date: Thu, 9 Apr 2026 20:54:31 +0800 Subject: [PATCH] =?UTF-8?q?fix():=20=E4=BF=AE=E5=A4=8D=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E8=A1=A8=E9=9A=90=E8=97=8F=E5=AD=97=E6=AE=B5=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E4=BC=9A=E5=AF=BC=E8=87=B4=E6=8C=87=E6=A0=87=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=8C=96=E9=94=99=E8=AF=AF=20#17737?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/chart/server/ChartDataServer.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 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 b60eafed6d..b85eac3dd5 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 @@ -372,12 +372,12 @@ public class ChartDataServer implements ChartDataApi { Integer totalDepth = 0; List mergeConfig = new ArrayList<>(); if (StringUtils.equalsAnyIgnoreCase(viewInfo.getType(), "table-normal", "table-info")) { - for (ChartViewFieldDTO xAxi : xAxis) { - if (xAxi.isHide()) { + for (ChartViewFieldDTO tmpAxis : xAxis) { + if (tmpAxis.isHide()) { continue; } - if (xAxi.getDeType().equals(DeTypeConstants.DE_INT) || xAxi.getDeType().equals(DeTypeConstants.DE_FLOAT)) { - CellStyle formatterCellStyle = createCellStyle(wb, xAxi.getFormatterCfg(), null); + if (tmpAxis.getDeType().equals(DeTypeConstants.DE_INT) || tmpAxis.getDeType().equals(DeTypeConstants.DE_FLOAT)) { + CellStyle formatterCellStyle = createCellStyle(wb, tmpAxis.getFormatterCfg(), null); styles.add(formatterCellStyle); } else { styles.add(null); @@ -404,6 +404,7 @@ public class ChartDataServer implements ChartDataApi { } } if ("table-info".equalsIgnoreCase(viewInfo.getType()) && !"dataset".equalsIgnoreCase(viewInfo.getDownloadType())) { + xAxis = xAxis.stream().filter(x -> !x.isHide()).toList(); Map tableCell = (Map) viewInfo.getCustomAttr().get("tableCell"); Boolean mergeCells = (Boolean) tableCell.get("mergeCells"); if (mergeCells != null && mergeCells) { @@ -528,7 +529,7 @@ public class ChartDataServer implements ChartDataApi { detailsSheet.setColumnWidth(j, 255 * 20); } else if (cellValObj != null) { try { - if ((viewInfo.getType().equalsIgnoreCase("table-normal") || viewInfo.getType().equalsIgnoreCase("table-info")) && (xAxis.get(j).getDeType().equals(DeTypeConstants.DE_INT) || xAxis.get(j).getDeType().equals(DeTypeConstants.DE_FLOAT))) { + if (StringUtils.equalsAnyIgnoreCase(viewInfo.getType(), "table-info", "table-normal") && Arrays.asList(DeTypeConstants.DE_INT,DeTypeConstants.DE_FLOAT).contains(xAxis.get(j).getDeType())) { try { FormatterCfgDTO formatterCfgDTO = xAxis.get(j).getFormatterCfg() == null ? new FormatterCfgDTO().setUnitLanguage(Lang.isChinese() ? "ch" : "en") : xAxis.get(j).getFormatterCfg(); row.getCell(j).setCellStyle(styles.get(j));