From 7273550b426076e8358f7d09c6d87ad4e49b46a9 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 16 Dec 2025 11:50:40 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E3=80=90=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=E3=80=91=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/chart/server/ChartDataServer.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 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 2eaaa94082..e76eac524b 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,6 +372,9 @@ public class ChartDataServer implements ChartDataApi { List mergeConfig = new ArrayList<>(); if (StringUtils.equalsAnyIgnoreCase(viewInfo.getType(), "table-normal", "table-info")) { for (ChartViewFieldDTO xAxi : xAxis) { + if (xAxi.isHide()) { + continue; + } if (xAxi.getDeType().equals(DeTypeConstants.DE_INT) || xAxi.getDeType().equals(DeTypeConstants.DE_FLOAT)) { CellStyle formatterCellStyle = createCellStyle(wb, xAxi.getFormatterCfg(), null); styles.add(formatterCellStyle); @@ -755,17 +758,20 @@ public class ChartDataServer implements ChartDataApi { } switch (formatter.getUnit()) { case 1000: - formatStr = formatStr + "\"千\""; + formatStr = formatStr + (formatter.getUnitLanguage().equalsIgnoreCase("ch") ? "\"千\"" : "\"K\""); break; case 10000: formatStr = formatStr + "\"万\""; break; case 1000000: - formatStr = formatStr + "\"百万\""; + formatStr = formatStr + (formatter.getUnitLanguage().equalsIgnoreCase("ch") ? "\"百万\"" : "\"M\""); break; case 100000000: formatStr = formatStr + "\"亿\""; break; + case 1000000000: + formatStr = formatStr + "\"B\""; + break; default: break; } @@ -788,17 +794,20 @@ public class ChartDataServer implements ChartDataApi { } switch (formatter.getUnit()) { case 1000: - formatStr = formatStr + "\"千\""; + formatStr = formatStr + (formatter.getUnitLanguage().equalsIgnoreCase("ch") ? "\"千\"" : "\"K\""); break; case 10000: formatStr = formatStr + "\"万\""; break; case 1000000: - formatStr = formatStr + "\"百万\""; + formatStr = formatStr + (formatter.getUnitLanguage().equalsIgnoreCase("ch") ? "\"百万\"" : "\"M\""); break; case 100000000: formatStr = formatStr + "\"亿\""; break; + case 1000000000: + formatStr = formatStr + "\"B\""; + break; default: break; }