From e122f143954190be1e3ef0aa10313bb95b976865 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Mon, 18 Mar 2024 09:52:37 +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=E5=85=A8=E9=80=89=E9=A2=9C?=
 =?UTF-8?q?=E8=89=B2=E6=B2=A1=E6=9C=89=E5=8F=91=E7=94=9F=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/dataease/DeOutWidget.vue        |  2 +-
 .../frontend/src/components/elTreeSelect/index.vue | 14 ++++++--------
 .../src/components/elVisualSelect/index.vue        |  2 +-
 .../panel/filter/filterMain/FilterControl.vue      |  7 ++++++-
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/core/frontend/src/components/dataease/DeOutWidget.vue b/core/frontend/src/components/dataease/DeOutWidget.vue
index 54aa290bf3..e2ae137c92 100644
--- a/core/frontend/src/components/dataease/DeOutWidget.vue
+++ b/core/frontend/src/components/dataease/DeOutWidget.vue
@@ -205,7 +205,7 @@ export default {
         styleEle.id = `style${this.element.id}`
         document.querySelector('head').appendChild(styleEle)
       }
-      styleEle.innerHTML = `#component${this.element.id} .el-input__inner::placeholder {\n  color: ${this.element.style.wordColor} \n    }`
+      styleEle.innerHTML = `#component${this.element.id}.component-custom .el-input__inner::placeholder {\n  color: ${this.element.style.wordColor}b3 \n    }`
     },
     filterLoaded(p) {
       this.$emit('filter-loaded', p)
diff --git a/core/frontend/src/components/elTreeSelect/index.vue b/core/frontend/src/components/elTreeSelect/index.vue
index a11234a3ac..2e5ebe7afb 100644
--- a/core/frontend/src/components/elTreeSelect/index.vue
+++ b/core/frontend/src/components/elTreeSelect/index.vue
@@ -52,7 +52,6 @@
         class="tree-select-all"
       ><el-checkbox
         v-model="selectAll"
-        v-customStyle="customStyle"
         :indeterminate="isIndeterminate"
         @change="selectAllChange"
       >{{ $t('dataset.check_all') }}</el-checkbox></p>
@@ -590,15 +589,14 @@ export default {
 </script>
 <style>
 .el-tree-select .de-select-option {
-    display: none !important;
+  display: none !important;
 }
 .tree-select-all {
-    padding: 10px 20px 0 24px;
-    
-  }
-  .tree-select-all .el-checkbox__label {
-      color: var(--SelectTreeColor, #606266);
-    }
+  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/elVisualSelect/index.vue b/core/frontend/src/components/elVisualSelect/index.vue
index 633e6520a1..1d2d314939 100644
--- a/core/frontend/src/components/elVisualSelect/index.vue
+++ b/core/frontend/src/components/elVisualSelect/index.vue
@@ -23,7 +23,7 @@
         :indeterminate="isIndeterminate"
         @change="selectAllChange"
       >
-        <span :style="{ color: `${isConfig ? '#1F2329' : customStyle.wordColor} !important`}">{{ $t('dataset.check_all') }}</span>
+        <span :style="{ color: `${isConfig ? '#1F2329' : customStyle.wordColor}`}">{{ $t('dataset.check_all') }}</span>
       </el-checkbox>
     </p>
     <el-option
diff --git a/core/frontend/src/views/panel/filter/filterMain/FilterControl.vue b/core/frontend/src/views/panel/filter/filterMain/FilterControl.vue
index f25ff39228..dfef530c91 100644
--- a/core/frontend/src/views/panel/filter/filterMain/FilterControl.vue
+++ b/core/frontend/src/views/panel/filter/filterMain/FilterControl.vue
@@ -70,7 +70,12 @@
     <el-col :span="16">
       <div class="filter-options-right">
         <span style="padding-right: 10px;">
-          
+          <span v-if="widget.name && ['textSelectWidget', 'textSelectGridWidget'].includes(widget.name)" style="padding-right: 10px;">
+            <el-checkbox
+              v-model="attrs.showEmpty"
+            >{{ $t('panel.show_empty') }}
+            </el-checkbox>
+          </span>
           <el-checkbox
             v-model="attrs.showTitle"
             @change="showTitleChange"