From a58623970b23c6c9295e11ca1853ce5e84d4d7dd Mon Sep 17 00:00:00 2001
From: jingna <1264204245@qq.com>
Date: Fri, 18 Apr 2025 14:17:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=99=A8=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/editor/filter/FilterTree.vue   | 15 +++++--
 .../filter/auth-tree-chart/AuthTree.vue       | 40 +++++++++++++++----
 2 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/editor/filter/FilterTree.vue b/core/core-frontend/src/views/chart/components/editor/filter/FilterTree.vue
index 74ce033..b8ab3b9 100644
--- a/core/core-frontend/src/views/chart/components/editor/filter/FilterTree.vue
+++ b/core/core-frontend/src/views/chart/components/editor/filter/FilterTree.vue
@@ -95,19 +95,19 @@ defineExpose({
       </div>
     </div>
     <template #footer>
-      <el-button secondary @click="closeFilter">{{ $t('chart.cancel') }} </el-button>
+      <el-button class="cancelbtn" secondary @click="closeFilter">{{ $t('chart.cancel') }} </el-button>
       <el-button type="primary" @click="submit">{{ $t('chart.confirm') }} </el-button>
     </template>
   </el-dialog>
 </template>
-<style lang="less">
+<style lang="less" scoped>
 .filter-tree-cont {
   .tree-cont {
     min-height: 67px;
     width: 100%;
     padding: 16px;
     border-radius: 4px;
-    border: 1px solid var(--deBorderBase, #dcdfe6);
+    border: 1px solid var(--deBorderBase, #595f6b);
     overflow: auto;
     max-height: 500px;
     .content {
@@ -115,5 +115,14 @@ defineExpose({
       width: 100%;
     }
   }
+  .ed-button.is-secondary{
+    color: #F2F4F5;
+    background-color: #212121;
+    border: 1px solid #434343;
+  }
+  .ed-button--primary{
+    background-color:#0089FF;
+  }
+ 
 }
 </style>
diff --git a/core/core-frontend/src/views/chart/components/editor/filter/auth-tree-chart/AuthTree.vue b/core/core-frontend/src/views/chart/components/editor/filter/auth-tree-chart/AuthTree.vue
index aef7090..d8acd24 100644
--- a/core/core-frontend/src/views/chart/components/editor/filter/auth-tree-chart/AuthTree.vue
+++ b/core/core-frontend/src/views/chart/components/editor/filter/auth-tree-chart/AuthTree.vue
@@ -87,11 +87,11 @@ const del = (index, child) => {
   <div class="logic" :style="marginLeft">
     <div class="logic-left">
       <div class="operate-title">
-        <span style="color: #bfbfbf" class="mrg-title" v-if="x">
+        <span style="color: #bfbfbf;" class="mrg-title" v-if="x">
           {{ logic === 'or' ? 'OR' : 'AND' }}
         </span>
         <el-dropdown @command="handleCommand" trigger="click" v-else>
-          <span style="color: rgba(0 0 0 / 65%)" class="mrg-title fir">
+          <span style="color:#F2F4F5" class="mrg-title fir">
             {{ logic === 'or' ? 'OR' : 'AND' }}
             <el-icon>
               <Icon name="icon_down_outlined"><icon_down_outlined class="svg-icon" /></Icon>
@@ -159,18 +159,21 @@ const del = (index, child) => {
       font-family: var(--de-custom_font, 'PingFang');
       word-wrap: break-word;
       box-sizing: border-box;
-      color: rgba(0, 0, 0, 0.65);
+      // color: rgba(0, 0, 0, 0.65);
       display: inline-block;
       white-space: nowrap;
       margin: 0;
       padding: 0;
       width: 65px;
-      background-color: #f8f8fa;
+      // background-color: #f8f8fa;
       line-height: 28px;
       position: relative;
       z-index: 1;
       height: 28px;
-
+      background-color: #212121;
+      border:1px solid #434343;
+      color: #F2F4F5;
+      border-radius: 2px;
       .mrg-title {
         text-align: left;
         box-sizing: border-box;
@@ -237,11 +240,32 @@ const del = (index, child) => {
       padding: 0 10px;
       margin-right: 10px;
       font-size: 14px;
-      color: #246dff;
-      background: #fff;
-      border: 1px solid #246dff;
+      color: #0089FF;
+      background: transparent;
+      border: 1px solid #0089FF;
       border-radius: 2px;
     }
   }
+  
+}
+
+.ed-dropdown__popper .ed-dropdown-menu{
+  background-color: #303133;
+  border: 1px solid #434343;
+}
+:deep(.ed-dropdown-menu__item) {
+  color: #F2F4F5;
 }
 </style>
+<style>
+.ed-dropdown__popper.ed-popper{
+  border-color: rgba(70, 70, 70, 1);
+}
+.ed-popper.is-light{
+  border:none;
+  background: transparent;
+}
+.ed-dropdown-menu__item:not(.is-disabled):hover{
+  background-color: rgba(83, 83, 83, 1);
+}
+</style>
\ No newline at end of file