From 336ef99b0c36bbddcda1f17f656649bcca19b970 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Fri, 27 Sep 2024 14:03:08 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):=20?=
 =?UTF-8?q?=E8=81=94=E5=8A=A8=E8=AE=BE=E7=BD=AE/=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE-icon=20=E5=BA=94=E8=AF=A5=E8=93=9D=E8=89=B2?=
 =?UTF-8?q?=E9=AB=98=E4=BA=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../editor/editor-senior/Senior.vue           | 35 +++++++++++++------
 .../editor-senior/components/AssistLine.vue   |  8 +++--
 .../editor/editor-style/ChartStyle.vue        |  2 +-
 3 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/editor/editor-senior/Senior.vue b/core/core-frontend/src/views/chart/components/editor/editor-senior/Senior.vue
index 11b1deab71..3402d0905f 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-senior/Senior.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-senior/Senior.vue
@@ -32,6 +32,7 @@ import { cloneDeep, defaultsDeep } from 'lodash-es'
 import BubbleAnimateCfg from '@/views/chart/components/editor/editor-senior/components/BubbleAnimateCfg.vue'
 import { XpackComponent } from '@/components/plugin'
 import CarouselSetting from '@/custom-component/common/CarouselSetting.vue'
+import { Icon } from 'vant'
 const dvMainStore = dvMainStoreWithOut()
 
 const { nowPanelTrackInfo, nowPanelJumpInfo, dvInfo, componentData, curComponent } =
@@ -338,28 +339,34 @@ const removeJumpSenior = () => {
                     已设置
                   </span>
                   <button
+                    :class="'label-' + props.themes"
                     class="circle-button_icon"
                     :title="t('chart.delete')"
-                    :class="'label-' + props.themes"
                     :style="{ margin: '0 8px' }"
                     @click="removeLinkageSenior"
                   >
                     <el-icon>
-                      <Icon name="icon_delete-trash_outlined"
-                        ><icon_deleteTrash_outlined class="svg-icon"
+                      <Icon
+                        ><icon_deleteTrash_outlined
+                          :class="chart.linkageActive && 'primary-color'"
+                          class="svg-icon"
                       /></Icon>
                     </el-icon>
                   </button>
                 </template>
                 <button
+                  :class="'label-' + props.themes"
                   class="circle-button_icon"
                   :title="t('chart.edit')"
-                  :class="'label-' + props.themes"
                   @click="linkageSetOpen"
                   :disabled="!chart.linkageActive"
                 >
                   <el-icon>
-                    <Icon name="icon_edit_outlined"><icon_edit_outlined class="svg-icon" /></Icon>
+                    <Icon
+                      ><icon_edit_outlined
+                        :class="chart.linkageActive && 'primary-color'"
+                        class="svg-icon"
+                    /></Icon>
                   </el-icon>
                 </button>
               </span>
@@ -381,28 +388,34 @@ const removeJumpSenior = () => {
                     已设置
                   </span>
                   <button
+                    :class="'label-' + props.themes"
                     class="circle-button_icon"
                     :title="t('chart.delete')"
-                    :class="'label-' + props.themes"
                     :style="{ margin: '0 8px' }"
                     @click="removeJumpSenior"
                   >
                     <el-icon>
-                      <Icon name="icon_delete-trash_outlined"
-                        ><icon_deleteTrash_outlined class="svg-icon"
+                      <Icon
+                        ><icon_deleteTrash_outlined
+                          :class="chart.jumpActive && 'primary-color'"
+                          class="svg-icon"
                       /></Icon>
                     </el-icon>
                   </button>
                 </template>
                 <button
+                  :class="'label-' + props.themes"
                   class="circle-button_icon"
                   :title="t('chart.edit')"
-                  :class="'label-' + props.themes"
                   @click="linkJumpSetOpen"
                   :disabled="!chart.jumpActive"
                 >
                   <el-icon>
-                    <Icon name="icon_edit_outlined"><icon_edit_outlined class="svg-icon" /></Icon>
+                    <Icon
+                      ><icon_edit_outlined
+                        :class="chart.jumpActive && 'primary-color'"
+                        class="svg-icon"
+                    /></Icon>
                   </el-icon>
                 </button>
               </span>
@@ -492,7 +505,7 @@ span {
   font-style: normal;
   font-weight: 400;
   line-height: 20px;
-  color: #a6a6a6 !important;
+  color: #a6a6a6;
 }
 
 .inner-container {
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/AssistLine.vue b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/AssistLine.vue
index c5e676aaeb..a38848cb1d 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/AssistLine.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/AssistLine.vue
@@ -166,7 +166,11 @@ onMounted(() => {
           @click="editLine"
         >
           <el-icon>
-            <Icon name="icon_edit_outlined"><icon_edit_outlined class="svg-icon" /></Icon>
+            <Icon
+              ><icon_edit_outlined
+                :class="state.assistLineCfg.enable && 'primary-color'"
+                class="svg-icon"
+            /></Icon>
           </el-icon>
         </button>
       </span>
@@ -363,7 +367,7 @@ span {
   font-style: normal;
   font-weight: 400;
   line-height: 20px;
-  color: #a6a6a6 !important;
+  color: #a6a6a6;
   &.ed-button {
     color: var(--ed-color-primary) !important;
   }
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue
index 92ab219fe1..2dbcd972fd 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue
@@ -433,7 +433,7 @@ watch(
             />
           </el-collapse-item>
           <el-collapse-item
-            :themes="themes"
+            :effect="themes"
             v-if="showProperties('label-selector')"
             :title="t('chart.label')"
             name="label"