From ff65325f78807f9265f9cbcecf3b545ef2914c0f Mon Sep 17 00:00:00 2001
From: jianneng-fit2cloud <jianneng.pan@fit2cloud.com>
Date: Wed, 15 Jan 2025 18:47:06 +0800
Subject: [PATCH] =?UTF-8?q?style(=E5=9B=BE=E8=A1=A8):=20=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E8=AF=8D=E4=BA=91=E5=9B=BE=E4=BB=A5=E5=8F=8AK=E7=BA=BF?=
 =?UTF-8?q?=E5=9B=BE=E7=BB=B4=E5=BA=A6=E4=BB=A5=E5=8F=8A=E6=8C=87=E6=A0=87?=
 =?UTF-8?q?=E7=9A=84=E6=8E=92=E5=BA=8F=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../editor/drag-item/DimensionItem.vue        | 19 ++++++++++---------
 .../components/editor/drag-item/QuotaItem.vue | 10 ++++++----
 2 files changed, 16 insertions(+), 13 deletions(-)

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 d53727ee39..d4ee907a53 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
@@ -193,14 +193,15 @@ const showCustomSort = item => {
   return !item.chartId && (item.deType === 0 || item.deType === 5)
 }
 const showSort = () => {
-  const isExtColor = props.type === 'extColor'
-  const isChartMix = props.chart.type.includes('chart-mix')
-  const isDimensionOrDimensionStack =
-    props.type === 'dimension' || props.type === 'dimensionStack' || props.type === 'dimensionExt'
-  if (isExtColor) {
+  const { type: chartType } = props.chart
+  const { type: propType } = props
+  const notShowSort = ['word-cloud', 'stock-line'].includes(chartType)
+  if (notShowSort || propType === 'extColor') {
     return false
   }
-  return !isChartMix || isDimensionOrDimensionStack
+  const isChartMix = chartType.includes('chart-mix')
+  const isDimensionType = ['dimension', 'dimensionStack', 'dimensionExt'].includes(propType)
+  return !isChartMix || isDimensionType
 }
 const toggleHide = () => {
   item.value.index = props.index
@@ -225,17 +226,17 @@ onMounted(() => {
         :style="{ backgroundColor: tagType + '0a', border: '1px solid ' + tagType }"
       >
         <span v-if="type !== 'extColor'" style="display: flex; color: #646a73">
-          <el-icon v-if="'asc' === item.sort">
+          <el-icon v-if="'asc' === item.sort && showSort()">
             <Icon name="icon_sort-a-to-z_outlined"
               ><icon_sortAToZ_outlined class="svg-icon"
             /></Icon>
           </el-icon>
-          <el-icon v-if="'desc' === item.sort">
+          <el-icon v-if="'desc' === item.sort && showSort()">
             <Icon name="icon_sort-z-to-a_outlined"
               ><icon_sortZToA_outlined class="svg-icon"
             /></Icon>
           </el-icon>
-          <el-icon v-if="'custom_sort' === item.sort">
+          <el-icon v-if="'custom_sort' === item.sort && showSort()">
             <Icon name="icon_sort_outlined"><icon_sort_outlined class="svg-icon" /></Icon>
           </el-icon>
           <el-icon>
diff --git a/core/core-frontend/src/views/chart/components/editor/drag-item/QuotaItem.vue b/core/core-frontend/src/views/chart/components/editor/drag-item/QuotaItem.vue
index 5bca3e2a9b..afe3c68c70 100644
--- a/core/core-frontend/src/views/chart/components/editor/drag-item/QuotaItem.vue
+++ b/core/core-frontend/src/views/chart/components/editor/drag-item/QuotaItem.vue
@@ -308,7 +308,9 @@ const showSort = computed(() => {
     props.type !== 'extLabel' &&
     props.type !== 'extTooltip' &&
     props.type !== 'extBubble' &&
-    !['chart-mix', 'indicator', 'liquid', 'gauge'].includes(chart.value.type)
+    !['chart-mix', 'indicator', 'liquid', 'gauge', 'word-cloud', 'stock-line'].includes(
+      chart.value.type
+    )
   )
 })
 
@@ -327,17 +329,17 @@ onMounted(() => {
         :style="{ backgroundColor: tagType + '0a', border: '1px solid ' + tagType }"
       >
         <span style="display: flex; color: #646a73">
-          <el-icon v-if="'asc' === item.sort">
+          <el-icon v-if="'asc' === item.sort && showSort">
             <Icon name="icon_sort-a-to-z_outlined"
               ><icon_sortAToZ_outlined class="svg-icon"
             /></Icon>
           </el-icon>
-          <el-icon v-if="'desc' === item.sort">
+          <el-icon v-if="'desc' === item.sort && showSort">
             <Icon name="icon_sort-z-to-a_outlined"
               ><icon_sortZToA_outlined class="svg-icon"
             /></Icon>
           </el-icon>
-          <el-icon v-if="'custom_sort' === item.sort">
+          <el-icon v-if="'custom_sort' === item.sort && showSort">
             <Icon name="icon_sort_outlined"><icon_sort_outlined class="svg-icon" /></Icon>
           </el-icon>
           <el-icon>