From 52b33251bcee17a9d7336d8e5d37ba64f55ac656 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Tue, 12 Mar 2024 18:56:24 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6):=20?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E9=A2=9C=E8=89=B2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/frontend/src/components/elTreeSelect/index.vue           | 4 ++++
 core/frontend/src/components/widget/deWidget/DeSelectGrid.vue | 4 +++-
 .../src/components/widget/deWidget/inputStyleMixin.js         | 2 +-
 3 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 fe57dc5bc9..a11234a3ac 100644
--- a/core/frontend/src/components/elTreeSelect/index.vue
+++ b/core/frontend/src/components/elTreeSelect/index.vue
@@ -594,7 +594,11 @@ export default {
 }
 .tree-select-all {
     padding: 10px 20px 0 24px;
+    
   }
+  .tree-select-all .el-checkbox__label {
+      color: var(--SelectTreeColor, #606266);
+    }
 [aria-disabled='true'] > .el-tree-node__content {
     color: inherit !important;
     background: transparent !important;
diff --git a/core/frontend/src/components/widget/deWidget/DeSelectGrid.vue b/core/frontend/src/components/widget/deWidget/DeSelectGrid.vue
index a69f0a352c..acaf9cc5c9 100644
--- a/core/frontend/src/components/widget/deWidget/DeSelectGrid.vue
+++ b/core/frontend/src/components/widget/deWidget/DeSelectGrid.vue
@@ -29,8 +29,10 @@
           v-model="checkAll"
           :indeterminate="isIndeterminate"
           @change="handleCheckAllChange"
-        />
+        >
         {{ $t('commons.all') }}
+        </el-checkbox>
+        
 
         <el-checkbox-group
           v-model="value"
diff --git a/core/frontend/src/components/widget/deWidget/inputStyleMixin.js b/core/frontend/src/components/widget/deWidget/inputStyleMixin.js
index 362ba87875..a8efb743b8 100644
--- a/core/frontend/src/components/widget/deWidget/inputStyleMixin.js
+++ b/core/frontend/src/components/widget/deWidget/inputStyleMixin.js
@@ -34,7 +34,7 @@ export default {
     },
     multiple: {
       handler() {
-        if (!['de-select-tree', 'de-select'].includes(this.element.component)) return
+        if (!['de-select-tree', 'de-select', 'de-select-grid'].includes(this.element.component)) return
         const time = setTimeout(() => {
           clearTimeout(time)
           this.typeTransform().forEach(ele => {