From 90bf3d0e85ce6fce726f9d1bf575d11734d58971 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Fri, 8 Sep 2023 14:33:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BD=BF=E7=94=A8echarts=E5=9C=B0?= =?UTF-8?q?=E5=9B=BE=E7=AC=A6=E5=8F=B7=E5=8A=9F=E8=83=BD=E6=A8=A1=E7=89=88?= =?UTF-8?q?=E6=8A=A5=E9=94=99#5918?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/service/chart/ChartViewService.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java index adc6fe33ce..61f575449c 100644 --- a/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -604,12 +604,21 @@ public class ChartViewService { List viewFields = gson.fromJson(view.getViewFields(), tokenType); final Map> extFieldsMap = new LinkedHashMap<>(); if (CollectionUtils.isNotEmpty(viewFields)) { - viewFields.forEach(field -> { + String[] busiFlagArray = new String[] {"daxis", "locationXaxis", "locationYaxis"}; + Map flagMap = new HashMap<>(); + for (String s : busiFlagArray) { + flagMap.put(s, false); + } + for (ChartViewFieldDTO field : viewFields) { + flagMap.put(field.getBusiType(), true); String busiType = field.getBusiType(); List list = extFieldsMap.containsKey(busiType) ? extFieldsMap.get(busiType) : new ArrayList<>(); list.add(field); extFieldsMap.put(field.getBusiType(), list); - }); + } + if (flagMap.get("daxis") && (!flagMap.get("locationXaxis") || !flagMap.get("locationYaxis"))) { + viewFields = viewFields.stream().filter(field -> !StringUtils.equals("daxis", field.getBusiType())).collect(Collectors.toList()); + } } List xAxisBase = gson.fromJson(view.getXAxis(), tokenType);