From 40877397f02eb210cf86ed2b9fa597a42341c00a Mon Sep 17 00:00:00 2001 From: ulleo Date: Thu, 15 Aug 2024 15:46:07 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=9B=BE=E8=A1=A8):=20=E5=A0=86=E5=8F=A0?= =?UTF-8?q?=E7=BB=84=E5=90=88=E5=9B=BE=E6=94=AF=E6=8C=81=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E5=A0=86=E5=8F=A0=E9=A1=B9=E8=BF=9B=E8=A1=8C=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #10957 --- .../dataease/chart/charts/impl/mix/StackMixHandler.java | 4 +++- .../chart/components/editor/drag-item/DimensionItem.vue | 9 ++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/StackMixHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/StackMixHandler.java index 4d2ff9883d..3eb7bc9ebb 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/StackMixHandler.java +++ b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/StackMixHandler.java @@ -31,7 +31,9 @@ public class StackMixHandler extends MixHandler { axisMap.put(ChartAxis.yAxisExt, view.getYAxisExt()); //去除除了x轴以外的排序 axisMap.forEach((k, v) -> { - v.forEach(x -> x.setSort("none")); + if (!ChartAxis.extStack.equals(k)) { + v.forEach(x -> x.setSort("none")); + } }); axisMap.put(ChartAxis.extLabel, view.getExtLabel()); axisMap.put(ChartAxis.extTooltip, view.getExtTooltip()); diff --git a/core/core-frontend/src/views/chart/components/editor/drag-item/DimensionItem.vue b/core/core-frontend/src/views/chart/components/editor/drag-item/DimensionItem.vue index ca5213d124..42c6c4d940 100644 --- a/core/core-frontend/src/views/chart/components/editor/drag-item/DimensionItem.vue +++ b/core/core-frontend/src/views/chart/components/editor/drag-item/DimensionItem.vue @@ -235,7 +235,8 @@ onMounted(() => { @click.prevent v-if=" !chart.type.includes('chart-mix') || - (chart.type.includes('chart-mix') && type === 'dimension') + (chart.type.includes('chart-mix') && + (type === 'dimension' || type === 'dimensionStack')) " > { v-if="item.deType === 1" :divided=" !chart.type.includes('chart-mix') || - (chart.type.includes('chart-mix') && type === 'dimension') + (chart.type.includes('chart-mix') && + (type === 'dimension' || type === 'dimensionStack')) " > { class="menu-item-padding" :divided=" !chart.type.includes('chart-mix') || - (chart.type.includes('chart-mix') && type === 'dimension') + (chart.type.includes('chart-mix') && + (type === 'dimension' || type === 'dimensionStack')) " :command="beforeClickItem('rename')" >