From 834a71f1ccfc3f01a377d3c6a1e5a29a0642da73 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Thu, 14 Mar 2024 11:49:32 +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=EF=BC=8C=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=9A=84=E5=88=97=E4=B8=AD=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E7=A9=BA=E5=80=BC=E6=97=B6=EF=BC=8C=E8=BF=87=E6=BB=A4=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=8F=AF=E7=AD=9B=E9=80=89=E7=A9=BA=E5=80=BC=20#7720?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../widget/deWidget/DeSelectGrid.vue          | 45 ++++++++++---------
 .../panel/filter/filterMain/FilterControl.vue |  2 +-
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/core/frontend/src/components/widget/deWidget/DeSelectGrid.vue b/core/frontend/src/components/widget/deWidget/DeSelectGrid.vue
index acaf9cc5c9..3aa156201e 100644
--- a/core/frontend/src/components/widget/deWidget/DeSelectGrid.vue
+++ b/core/frontend/src/components/widget/deWidget/DeSelectGrid.vue
@@ -32,17 +32,15 @@
         >
         {{ $t('commons.all') }}
         </el-checkbox>
-        
-
         <el-checkbox-group
           v-model="value"
           @change="handleCheckedChange"
         >
-          <template v-for="item in data">
+          <template v-for="item in dataWithEmpty">
             <el-checkbox
               :key="item.id"
               :label="item.id"
-            >{{ item.id }}
+            >{{ item.label || item.id }}
             </el-checkbox>
             <br :key="item.id">
           </template>
@@ -58,12 +56,12 @@
           @change="changeRadioBox"
         >
           <el-radio
-            v-for="(item, index) in data"
-            :key="index"
+            v-for="item in dataWithEmpty"
+            :key="item.id"
             :label="item.id"
             @click.native.prevent="testChange(item)"
           >
-            <span>{{ item.id }}</span>
+            <span>{{item.label || item.id  }}</span>
           </el-radio>
         </el-radio-group>
       </div>
@@ -131,6 +129,9 @@ export default {
     }
   },
   computed: {
+    dataWithEmpty() {
+      return this.element.options.attrs.showEmpty ? [{ label: '空数据', id: '_empty_$'}, ...this.data] : this.data
+    },
     operator() {
       return this.element.options.attrs.multiple ? 'in' : 'eq'
     },
@@ -175,8 +176,8 @@ export default {
       this.changeValue(value)
 
       if (this.element.options.attrs.multiple) {
-        this.checkAll = this.value.length === this.data.length
-        this.isIndeterminate = this.value.length > 0 && this.value.length < this.data.length
+        this.checkAll = this.value.length === this.dataWithEmpty.length
+        this.isIndeterminate = this.value.length > 0 && this.value.length < this.dataWithEmpty.length
       }
     },
     'element.options.attrs.fieldId': function(value, old) {
@@ -199,8 +200,8 @@ export default {
         this.clearDefault(this.data)
         this.changeInputStyle()
         if (this.element.options.attrs.multiple) {
-          this.checkAll = this.value.length === this.data.length
-          this.isIndeterminate = this.value.length > 0 && this.value.length < this.data.length
+          this.checkAll = this.value.length === this.dataWithEmpty.length
+          this.isIndeterminate = this.value.length > 0 && this.value.length < this.dataWithEmpty.length
         }
       }) || (this.element.options.value = '')
     },
@@ -217,8 +218,8 @@ export default {
       this.$nextTick(() => {
         this.show = true
         if (value) {
-          this.checkAll = this.value.length === this.data.length
-          this.isIndeterminate = this.value.length > 0 && this.value.length < this.data.length
+          this.checkAll = this.value.length === this.dataWithEmpty.length
+          this.isIndeterminate = this.value.length > 0 && this.value.length < this.dataWithEmpty.length
         }
         this.changeInputStyle()
       })
@@ -242,8 +243,8 @@ export default {
         this.data = this.optionData(res.data)
         this.changeInputStyle()
         if (this.element.options.attrs.multiple) {
-          this.checkAll = this.value.length === this.data.length
-          this.isIndeterminate = this.value.length > 0 && this.value.length < this.data.length
+          this.checkAll = this.value.length === this.dataWithEmpty.length
+          this.isIndeterminate = this.value.length > 0 && this.value.length < this.dataWithEmpty.length
         }
       }) || (this.element.options.value = '')
     },
@@ -318,8 +319,8 @@ export default {
         this.changeValue(this.value)
 
         if (this.element.options.attrs.multiple) {
-          this.checkAll = this.value.length === this.data.length
-          this.isIndeterminate = this.value.length > 0 && this.value.length < this.data.length
+          this.checkAll = this.value.length === this.dataWithEmpty.length
+          this.isIndeterminate = this.value.length > 0 && this.value.length < this.dataWithEmpty.length
         }
       }
     },
@@ -368,8 +369,8 @@ export default {
           this.data = this.optionData(res.data)
           this.changeInputStyle()
           if (this.element.options.attrs.multiple) {
-            this.checkAll = this.value.length === this.data.length
-            this.isIndeterminate = this.value.length > 0 && this.value.length < this.data.length
+            this.checkAll = this.value.length === this.dataWithEmpty.length
+            this.isIndeterminate = this.value.length > 0 && this.value.length < this.dataWithEmpty.length
           }
         })
       }
@@ -454,14 +455,14 @@ export default {
       this.changeValue(value)
     },
     handleCheckAllChange(val) {
-      this.value = val ? this.data.map(item => item.id) : []
+      this.value = val ? this.dataWithEmpty.map(item => item.id) : []
       this.isIndeterminate = false
       this.changeValue(this.value)
     },
     handleCheckedChange(values) {
       const checkedCount = values.length
-      this.checkAll = checkedCount === this.data.length
-      this.isIndeterminate = checkedCount > 0 && checkedCount < this.data.length
+      this.checkAll = checkedCount === this.dataWithEmpty.length
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.dataWithEmpty.length
       this.changeValue(values)
     },
     testChange(item) {
diff --git a/core/frontend/src/views/panel/filter/filterMain/FilterControl.vue b/core/frontend/src/views/panel/filter/filterMain/FilterControl.vue
index 75ee7acf67..8b9b44c73f 100644
--- a/core/frontend/src/views/panel/filter/filterMain/FilterControl.vue
+++ b/core/frontend/src/views/panel/filter/filterMain/FilterControl.vue
@@ -69,7 +69,7 @@
 
     <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') }}