From d5a118b7b2e2855c35b6bf95d94aaa4b8632f42b Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 9 Jun 2025 13:31:56 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20[Bug]=E8=BF=9C=E7=A8=8Bexcel=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E6=97=B6=E5=AF=B9=E5=AF=86=E7=A0=81=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E7=89=B9=E6=AE=8A=E5=AD=97=E7=AC=A6=E9=9C=80=E8=A6=81=E8=BF=9B?= =?UTF-8?q?=E8=A1=8C=E7=BC=96=E7=A0=81=20#16089?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chart/server/ChartDataServer.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 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 e637663948..27cac89de9 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 @@ -608,22 +608,22 @@ public class ChartDataServer implements ChartDataApi { if (formatter.getType().equals("auto")) { String[] valueSplit = String.valueOf(value).split("."); if (StringUtils.isEmpty(value) || !value.contains(".")) { - formatStr = "0"; + formatStr = "General"; } else { formatStr = "0." + new String(new char[valueSplit.length]).replace('\0', '0'); } switch (formatter.getUnit()) { case 1000: - formatStr = formatStr + "千"; + formatStr = formatStr + "\"千\""; break; case 10000: - formatStr = formatStr + "万"; + formatStr = formatStr + "\"万\""; break; case 1000000: - formatStr = formatStr + "百万"; + formatStr = formatStr + "\"百万\""; break; case 100000000: - formatStr = formatStr + "'亿'"; + formatStr = formatStr + "\"亿\""; break; default: break; @@ -635,7 +635,7 @@ public class ChartDataServer implements ChartDataApi { if (formatter.getSuffix().equals("%")) { formatStr = formatStr + "\"%\""; } else { - formatStr = formatStr + formatter.getSuffix(); + formatStr = formatStr + "\"" + formatter.getSuffix() + "\""; } } } @@ -647,16 +647,16 @@ public class ChartDataServer implements ChartDataApi { } switch (formatter.getUnit()) { case 1000: - formatStr = formatStr + "千"; + formatStr = formatStr + "\"千\""; break; case 10000: - formatStr = formatStr + "万"; + formatStr = formatStr + "\"万\""; break; case 1000000: - formatStr = formatStr + "百万"; + formatStr = formatStr + "\"百万\""; break; case 100000000: - formatStr = formatStr + "'亿'"; + formatStr = formatStr + "\"亿\""; break; default: break; @@ -668,7 +668,7 @@ public class ChartDataServer implements ChartDataApi { if (formatter.getSuffix().equals("%")) { formatStr = formatStr + "\"%\""; } else { - formatStr = formatStr + formatter.getSuffix(); + formatStr = formatStr + "\"" + formatter.getSuffix() + "\""; } } } else if (formatter.getType().equals("percent")) {