From cc64cd45c0838ba03fb3026736c0a5f7e481ca70 Mon Sep 17 00:00:00 2001 From: wisonic Date: Tue, 3 Dec 2024 16:40:48 +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=AD=97=E6=AE=B5=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E5=A4=B1=E6=95=88=20#13598?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/chart/charts/impl/bar/GroupBarHandler.java | 6 +++--- .../chart/charts/impl/bar/StackGroupBarHandler.java | 6 +++--- 2 files changed, 6 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 0f2735bc48..f4dc3f62b3 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 @@ -49,10 +49,10 @@ public class GroupBarHandler extends BarHandler { if (ObjectUtils.isNotEmpty(xAxisExt) && Objects.equals(drillFields.get(0).getId(), xAxisExt.get(0).getId())) { fieldsToFilter.addAll(view.getXAxis()); + groupStackDrill(noDrillFieldAxis, noDrillFilterList, fieldsToFilter, drillFields, drillRequestList); + formatResult.getAxisMap().put(ChartAxis.xAxis, noDrillFieldAxis); + result.setFilterList(noDrillFilterList); } - groupStackDrill(noDrillFieldAxis, noDrillFilterList, fieldsToFilter, drillFields, drillRequestList); - formatResult.getAxisMap().put(ChartAxis.xAxis, noDrillFieldAxis); - result.setFilterList(noDrillFilterList); } return (T) result; } diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/StackGroupBarHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/StackGroupBarHandler.java index 78e3fc04d7..e0234268ea 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/StackGroupBarHandler.java +++ b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/bar/StackGroupBarHandler.java @@ -63,10 +63,10 @@ public class StackGroupBarHandler extends BarHandler { fieldsToFilter.addAll(view.getXAxis()); fieldsToFilter.addAll(xAxisExt); } + groupStackDrill(noDrillFieldAxis, noDrillFilterList, fieldsToFilter, drillFields, drillRequestList); + formatResult.getAxisMap().put(ChartAxis.xAxis, noDrillFieldAxis); + result.setFilterList(noDrillFilterList); } - groupStackDrill(noDrillFieldAxis, noDrillFilterList, fieldsToFilter, drillFields, drillRequestList); - formatResult.getAxisMap().put(ChartAxis.xAxis, noDrillFieldAxis); - result.setFilterList(noDrillFilterList); } return (T) result; }