diff --git a/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java b/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java index d89a0192ae..0d6b4f7314 100644 --- a/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java +++ b/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java @@ -942,10 +942,30 @@ public class ChartDataBuild { public static Map transTableNormal(Map> fieldMap, ChartViewWithBLOBs view, List data, List desensitizationList) { List fields = new ArrayList<>(); + List yfields = new ArrayList<>(); if (CollectionUtils.isNotEmpty(fieldMap.get("xAxis"))) fields.addAll(fieldMap.get("xAxis")); - if (CollectionUtils.isNotEmpty(fieldMap.get("tooltipAxis"))) fields.addAll(fieldMap.get("tooltipAxis")); - if (CollectionUtils.isNotEmpty(fieldMap.get("labelAxis"))) fields.addAll(fieldMap.get("labelAxis")); + if (CollectionUtils.isNotEmpty(fieldMap.get("tooltipAxis"))) { + fieldMap.get("tooltipAxis").forEach(field -> { + Integer deType = field.getDeType(); + if(deType == 2 || deType == 3) { + yfields.add(field); + } else { + fields.add(field); + } + }); + } + if (CollectionUtils.isNotEmpty(fieldMap.get("labelAxis"))) { + fieldMap.get("labelAxis").forEach(field -> { + Integer deType = field.getDeType(); + if(deType == 2 || deType == 3) { + yfields.add(field); + } else { + fields.add(field); + } + }); + } if (CollectionUtils.isNotEmpty(fieldMap.get("yAxis"))) fields.addAll(fieldMap.get("yAxis")); + if (CollectionUtils.isNotEmpty(yfields)) fields.addAll(yfields); return transTableNormal(fields, view, data, desensitizationList); }