From 11dd9fcee1a605d57841647c625ae08e616e723e Mon Sep 17 00:00:00 2001 From: wisonic Date: Wed, 31 Jul 2024 19:50:46 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=88=86=E7=BB=84=E6=9F=B1=E7=8A=B6=E5=9B=BE=E4=B8=8B=E9=92=BB?= =?UTF-8?q?=E5=88=86=E7=BB=84=E4=BF=A1=E6=81=AF=E4=B8=A2=E5=A4=B1=20#10875?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/chart/charts/impl/bar/GroupBarHandler.java | 8 +++----- .../java/io/dataease/chart/manage/ChartDataManage.java | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/GroupBarHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/GroupBarHandler.java index 72b5cb29d1..0f2735bc48 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/GroupBarHandler.java +++ b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/GroupBarHandler.java @@ -6,10 +6,7 @@ import lombok.Getter; import org.apache.commons.lang3.ObjectUtils; import org.springframework.stereotype.Component; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; import java.util.stream.Collectors; @Component @@ -69,7 +66,8 @@ public class GroupBarHandler extends BarHandler { var xAxis = formatResult.getAxisMap().get(ChartAxis.xAxis); var xAxisExt = formatResult.getAxisMap().get(ChartAxis.xAxisExt); var yAxis = formatResult.getAxisMap().get(ChartAxis.yAxis); - var xAxisBase = xAxis.subList(0, xAxis.size() - xAxisExt.size()); + var drillAxis = xAxis.stream().filter(axis -> FieldSource.DRILL == axis.getSource()).toList(); + var xAxisBase = xAxis.subList(0, xAxis.size() - xAxisExt.size() - drillAxis.size()); return ChartDataBuild.transBaseGroupDataAntV(xAxisBase, xAxis, xAxisExt, yAxis, view, data, isDrill); } } diff --git a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java index 37ad8fc3ea..2bbf881e0c 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java +++ b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java @@ -288,7 +288,7 @@ public class ChartDataManage { if (i == drillRequestList.size() - 1) { ChartViewFieldDTO nextDrillField = drill.get(i + 1); if (!fields.contains(nextDrillField.getId())) { - viewField.setSource(FieldSource.DRILL); + nextDrillField.setSource(FieldSource.DRILL); nextDrillField.setSort(getDrillSort(xAxis, drill.get(0))); xAxis.add(nextDrillField); dillAxis.add(nextDrillField);