From 1d0ca17e8ef4d7ad857164a0028dd0d27c9c5621 Mon Sep 17 00:00:00 2001
From: ulleo <ulleo.wang@gmail.com>
Date: Tue, 10 Sep 2024 15:55:45 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=9B=BE=E8=A1=A8):=20=E5=88=86=E7=BB=84?=
 =?UTF-8?q?=E6=9F=B1=E7=BA=BF=E7=BB=84=E5=90=88=E5=9B=BE=E5=AD=90=E7=B1=BB?=
 =?UTF-8?q?=E5=88=AB=E5=A2=9E=E5=8A=A0=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#11863
---
 .../io/dataease/chart/charts/impl/mix/GroupMixHandler.java | 4 +++-
 .../chart/components/editor/drag-item/DimensionItem.vue    | 7 ++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/GroupMixHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/GroupMixHandler.java
index 4b58abfbc0..c0dbce4b24 100644
--- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/GroupMixHandler.java
+++ b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/mix/GroupMixHandler.java
@@ -31,7 +31,9 @@ public class GroupMixHandler extends MixHandler {
         axisMap.put(ChartAxis.yAxisExt, view.getYAxisExt());
         //去除除了x轴以外的排序
         axisMap.forEach((k, v) -> {
-            v.forEach(x -> x.setSort("none"));
+            if (!ChartAxis.xAxisExt.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 3ca5e59ec3..02a939d037 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
@@ -176,7 +176,8 @@ const showCustomSort = item => {
 const showSort = () => {
   const isExtColor = props.type === 'extColor'
   const isChartMix = props.chart.type.includes('chart-mix')
-  const isDimensionOrDimensionStack = props.type === 'dimension' || props.type === 'dimensionStack'
+  const isDimensionOrDimensionStack =
+    props.type === 'dimension' || props.type === 'dimensionStack' || props.type === 'dimensionExt'
   if (isExtColor) {
     return false
   }
@@ -333,7 +334,7 @@ onMounted(() => {
             :divided="
               !chart.type.includes('chart-mix') ||
               (chart.type.includes('chart-mix') &&
-                (type === 'dimension' || type === 'dimensionStack'))
+                (type === 'dimension' || type === 'dimensionStack' || type === 'dimensionExt'))
             "
           >
             <el-dropdown
@@ -532,7 +533,7 @@ onMounted(() => {
             :divided="
               !chart.type.includes('chart-mix') ||
               (chart.type.includes('chart-mix') &&
-                (type === 'dimension' || type === 'dimensionStack'))
+                (type === 'dimension' || type === 'dimensionStack' || type === 'dimensionExt'))
             "
             :command="beforeClickItem('rename')"
           >