From 15ccc06d6f6f46257a393e13c065f5f6209f1a24 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Mon, 18 Mar 2024 14:10:58 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E7=BB=84=E4=BB=B6=E5=A4=9A=E9=80=89=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E8=BE=93=E5=85=A5=E6=90=9C=E7=B4=A2=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=EF=BC=8C=E4=BC=9A=E6=8A=8A=E4=B9=8B=E5=89=8D=E5=8B=BE?=
 =?UTF-8?q?=E9=80=89=E7=9A=84=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/frontend/src/components/elTreeSelect/index.vue       | 3 ++-
 core/frontend/src/components/elVisualSelect/index.vue     | 1 +
 core/frontend/src/components/widget/deWidget/DeSelect.vue | 4 ++++
 core/frontend/src/styles/index.scss                       | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/core/frontend/src/components/elTreeSelect/index.vue b/core/frontend/src/components/elTreeSelect/index.vue
index 2e5ebe7afb..e0472371bd 100644
--- a/core/frontend/src/components/elTreeSelect/index.vue
+++ b/core/frontend/src/components/elTreeSelect/index.vue
@@ -52,6 +52,7 @@
         class="tree-select-all"
       ><el-checkbox
         v-model="selectAll"
+        class="is-tree-select"
         :indeterminate="isIndeterminate"
         @change="selectAllChange"
       >{{ $t('dataset.check_all') }}</el-checkbox></p>
@@ -595,7 +596,7 @@ export default {
   padding: 10px 20px 0 24px;
 }
 .tree-select-all .el-checkbox__label {
-  color: var(--SelectTreeColor, #606266);
+  color: var(--SelectTreeColor, #606266) !important;
 }
 [aria-disabled='true'] > .el-tree-node__content {
     color: inherit !important;
diff --git a/core/frontend/src/components/elVisualSelect/index.vue b/core/frontend/src/components/elVisualSelect/index.vue
index 1d2d314939..2562d30c57 100644
--- a/core/frontend/src/components/elVisualSelect/index.vue
+++ b/core/frontend/src/components/elVisualSelect/index.vue
@@ -19,6 +19,7 @@
     >
       <el-checkbox
         v-model="selectAll"
+        class="is-tree-select"
         v-customStyle="customStyle"
         :indeterminate="isIndeterminate"
         @change="selectAllChange"
diff --git a/core/frontend/src/components/widget/deWidget/DeSelect.vue b/core/frontend/src/components/widget/deWidget/DeSelect.vue
index fe399b5b2c..1abd0d8a25 100644
--- a/core/frontend/src/components/widget/deWidget/DeSelect.vue
+++ b/core/frontend/src/components/widget/deWidget/DeSelect.vue
@@ -317,6 +317,10 @@ export default {
       this.refreshOptions()
     }, 1000),
     filterMethod(key) {
+      if (!key && !this.keyWord) {
+        this.keyWord = key
+        return
+      }
       this.keyWord = key
       this.searchWithKey()
     },
diff --git a/core/frontend/src/styles/index.scss b/core/frontend/src/styles/index.scss
index 13e05fbb47..4ed359da40 100644
--- a/core/frontend/src/styles/index.scss
+++ b/core/frontend/src/styles/index.scss
@@ -829,7 +829,7 @@ div:focus {
 }
 
 
-.el-checkbox__input.is-checked:not(.is-disabled)+.el-checkbox__label {
+.el-checkbox:not(.is-tree-select) .el-checkbox__input.is-checked:not(.is-disabled)+.el-checkbox__label {
   color: #1F2329 !important;
 }