From 0b492dcdc59c40435d3cd6efd2605926a8d285b0 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Fri, 10 May 2024 10:46:39 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E7=AE=A1=E7=90=86-=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=20hover=20=E6=98=BE=E7=A4=BA=E5=85=A8?=
 =?UTF-8?q?=E9=87=8F=E5=86=85=E5=AE=B9=E7=9A=84=E6=96=87=E5=AD=97=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/filter-text/src/FilterText.vue          | 4 +++-
 .../src/components/visualization/LinkJumpSet.vue           | 7 ++++++-
 .../src/components/visualization/LinkageSet.vue            | 7 ++++++-
 core/core-frontend/src/layout/components/AiComponent.vue   | 1 +
 core/core-frontend/src/layout/components/CollapseBar.vue   | 3 +--
 core/core-frontend/src/style/index.less                    | 7 +++++++
 .../chart/components/editor/drag-item/DimensionItem.vue    | 6 ++++++
 .../views/chart/components/editor/drag-item/QuotaItem.vue  | 7 +++++++
 8 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/core/core-frontend/src/components/filter-text/src/FilterText.vue b/core/core-frontend/src/components/filter-text/src/FilterText.vue
index d487835bbd..2fe8ec96f9 100644
--- a/core/core-frontend/src/components/filter-text/src/FilterText.vue
+++ b/core/core-frontend/src/components/filter-text/src/FilterText.vue
@@ -54,7 +54,9 @@ watch(
     </el-icon>
     <div class="filter-texts-container" ref="container">
       <p v-for="(ele, index) in filterTexts" :key="ele" class="text">
-        {{ ele }}
+        <el-tooltip effect="dark" :content="ele" placement="top-start">
+          {{ ele }}
+        </el-tooltip>
         <el-icon @click="clearFilter(index)">
           <Icon name="icon_close_outlined"></Icon>
         </el-icon>
diff --git a/core/core-frontend/src/components/visualization/LinkJumpSet.vue b/core/core-frontend/src/components/visualization/LinkJumpSet.vue
index 9c145c2997..f61dd67b3d 100644
--- a/core/core-frontend/src/components/visualization/LinkJumpSet.vue
+++ b/core/core-frontend/src/components/visualization/LinkJumpSet.vue
@@ -852,11 +852,16 @@ defineExpose({
   }
   .head-filter {
     flex: 1;
-    text-align: right;
+    display: flex;
+    align-items: center;
+    justify-content: end;
     margin-right: 16px;
     font-weight: 400;
     font-size: 12px;
     color: #646a73;
+    .ed-switch {
+      margin-left: 8px;
+    }
   }
 }
 
diff --git a/core/core-frontend/src/components/visualization/LinkageSet.vue b/core/core-frontend/src/components/visualization/LinkageSet.vue
index 77dd692e3b..580082b7f2 100644
--- a/core/core-frontend/src/components/visualization/LinkageSet.vue
+++ b/core/core-frontend/src/components/visualization/LinkageSet.vue
@@ -534,11 +534,16 @@ defineExpose({
   }
   .head-filter {
     flex: 1;
-    text-align: right;
+    display: flex;
+    align-items: center;
+    justify-content: end;
     margin-right: 16px;
     font-weight: 400;
     font-size: 12px;
     color: #646a73;
+    .ed-switch {
+      margin-left: 8px;
+    }
   }
 }
 
diff --git a/core/core-frontend/src/layout/components/AiComponent.vue b/core/core-frontend/src/layout/components/AiComponent.vue
index a6c789a2bc..736c91043a 100644
--- a/core/core-frontend/src/layout/components/AiComponent.vue
+++ b/core/core-frontend/src/layout/components/AiComponent.vue
@@ -51,6 +51,7 @@ onMounted(() => {
 .ai-main {
   position: fixed;
   border-radius: 5px;
+  border-top-right-radius: 0;
   overflow: hidden;
   height: 0;
   bottom: 48px;
diff --git a/core/core-frontend/src/layout/components/CollapseBar.vue b/core/core-frontend/src/layout/components/CollapseBar.vue
index 51f51598ff..c51fbb8b0f 100644
--- a/core/core-frontend/src/layout/components/CollapseBar.vue
+++ b/core/core-frontend/src/layout/components/CollapseBar.vue
@@ -10,7 +10,7 @@ const setCollapse = () => {
 
 <template>
   <div class="de-collapse-bar" @click="setCollapse">
-    <el-icon>
+    <el-icon style="color: #646a73">
       <Icon :name="!isCollapse ? 'icon_side-fold_outlined' : 'icon_side-expand_outlined'"></Icon>
     </el-icon>
     {{ !isCollapse ? '收起导航' : '' }}
@@ -29,7 +29,6 @@ const setCollapse = () => {
   font-size: 14px;
   font-weight: 400;
   line-height: 22px;
-  color: #646a73;
   display: flex;
   align-items: center;
 
diff --git a/core/core-frontend/src/style/index.less b/core/core-frontend/src/style/index.less
index 387c479c75..a3e1165209 100644
--- a/core/core-frontend/src/style/index.less
+++ b/core/core-frontend/src/style/index.less
@@ -402,3 +402,10 @@ strong {
 .ed-picker__popper {
   --ed-datepicker-border-color: #DEE0E3 !important;
 }
+
+.ed-dialog__headerbtn {
+  top: 21px !important;
+  display: flex;
+  align-items: center;
+  justify-content: center
+}
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 f32ab2b064..b658f565bb 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
@@ -226,6 +226,7 @@ onMounted(() => {
           <el-dropdown-item @click.prevent>
             <el-dropdown
               :effect="themes"
+              popper-class="data-dropdown_popper_mr9"
               placement="right-start"
               style="width: 100%; height: 100%"
               @command="sort"
@@ -305,6 +306,7 @@ onMounted(() => {
             <el-dropdown
               :effect="themes"
               placement="right-start"
+              popper-class="data-dropdown_popper_mr9"
               style="width: 100%; height: 100%"
               @command="dateStyle"
             >
@@ -438,6 +440,7 @@ onMounted(() => {
             <el-dropdown
               :effect="themes"
               placement="right-start"
+              popper-class="data-dropdown_popper_mr9"
               style="width: 100%; height: 100%"
               @command="datePattern"
             >
@@ -695,6 +698,9 @@ span {
 }
 </style>
 <style lang="less">
+.data-dropdown_popper_mr9 {
+  margin-left: -9px !important;
+}
 .menu-item-padding {
   span {
     font-size: 14px;
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 581048c620..e05b877e5d 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
@@ -349,6 +349,7 @@ onMounted(() => {
             <el-dropdown
               :effect="themes"
               placement="right-start"
+              popper-class="data-dropdown_popper_mr9"
               style="width: 100%"
               @command="switchChartType"
             >
@@ -403,6 +404,7 @@ onMounted(() => {
             <el-dropdown
               :effect="themes"
               placement="right-start"
+              popper-class="data-dropdown_popper_mr9"
               style="width: 100%; height: 100%"
               @command="summary"
             >
@@ -583,6 +585,7 @@ onMounted(() => {
             <el-dropdown
               placement="right-start"
               :effect="themes"
+              popper-class="data-dropdown_popper_mr9"
               style="width: 100%; height: 100%"
               @command="quickCalc"
             >
@@ -670,6 +673,7 @@ onMounted(() => {
             <el-dropdown
               :effect="themes"
               placement="right-start"
+              popper-class="data-dropdown_popper_mr9"
               style="width: 100%; height: 100%"
               @command="sort"
             >
@@ -958,6 +962,9 @@ span {
 }
 </style>
 <style lang="less">
+.data-dropdown_popper_mr9 {
+  margin-left: -9px !important;
+}
 .menu-item-padding {
   span {
     font-size: 14px;