From a467297ac5adae8d9321b760177de5c5de028207 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Thu, 21 Dec 2023 11:04:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=B6=88=E6=81=AF=E6=8E=A5=E6=94=B6?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E9=94=99=E8=AF=AF=20#7237?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/frontend/src/views/msg/Setting.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/frontend/src/views/msg/Setting.vue b/core/frontend/src/views/msg/Setting.vue
index 18b88319ad..50e217d078 100644
--- a/core/frontend/src/views/msg/Setting.vue
+++ b/core/frontend/src/views/msg/Setting.vue
@@ -136,6 +136,9 @@ export default {
               } else if (node.indeterminate_number_map[key] > 0) {
                 node.check_all_map[key] = false
                 node.indeterminate_map[key] = true
+              } else {
+                node.check_all_map[key] = false
+                node.indeterminate_map[key] = false
               }
             }
           }

From a9d75a2f1d1e09c9dabdbb2b6a30e03e9418183d Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Thu, 21 Dec 2023 11:04:38 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E8=A7=86=E5=9B=BE=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E5=99=A8=E6=94=AF=E6=8C=81=E4=B8=8E=E6=88=96=E5=85=B3=E7=B3=BB?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/frontend/src/views/chart/view/ChartEdit.vue    |  2 +-
 core/frontend/src/views/chart/view/FilterTree.vue   | 13 +++++++------
 .../views/dataset/data/components/filterFiled.vue   |  6 +++---
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/core/frontend/src/views/chart/view/ChartEdit.vue b/core/frontend/src/views/chart/view/ChartEdit.vue
index 12155b7dbe..17b9f8b2a6 100644
--- a/core/frontend/src/views/chart/view/ChartEdit.vue
+++ b/core/frontend/src/views/chart/view/ChartEdit.vue
@@ -2073,7 +2073,7 @@ export default {
   },
   computed: {
     filedList() {
-      return [...this.dimension, ...this.quota]
+      return [...this.dimension, ...this.quota].filter(ele => ele.id !== 'count')
     },
     obj() {
       return {
diff --git a/core/frontend/src/views/chart/view/FilterTree.vue b/core/frontend/src/views/chart/view/FilterTree.vue
index 278526a6f2..68d891cf63 100644
--- a/core/frontend/src/views/chart/view/FilterTree.vue
+++ b/core/frontend/src/views/chart/view/FilterTree.vue
@@ -16,15 +16,16 @@
         slot="footer"
         class="dialog-footer"
       >
-        <el-button
+        <de-btn
+          secondary
           @click="closeFilter"
         >{{ $t('chart.cancel') }}
-        </el-button>
-        <el-button
+        </de-btn>
+        <de-btn
           type="primary"
           @click="changeFilter"
         >{{ $t('chart.confirm') }}
-        </el-button>
+        </de-btn>
       </div>
     </el-dialog>
 </template>
@@ -105,13 +106,13 @@ export default {
 <style lang="scss">
 .filter-tree-cont {
   .tree-cont {
-      height: 200px;
+      min-height: 67px;
       width: 100%;
       padding: 16px;
       border-radius: 4px;
       border: 1px solid var(--deBorderBase, #DCDFE6);
       overflow: auto;
-  
+      max-height: 500px;
       .content {
         height: 100%;
         width: 100%;
diff --git a/core/frontend/src/views/dataset/data/components/filterFiled.vue b/core/frontend/src/views/dataset/data/components/filterFiled.vue
index 008fdbe5f0..13351e2d90 100644
--- a/core/frontend/src/views/dataset/data/components/filterFiled.vue
+++ b/core/frontend/src/views/dataset/data/components/filterFiled.vue
@@ -350,8 +350,8 @@ export default {
       }
       this.showTextArea = true
     },
-    filterTypeChange() {
-      this.item.term = ''
+    filterTypeChange(val) {
+      this.item.term = val === 'logic' ? 'eq' : ''
       this.item.value = ''
       this.initEnumOptions()
     },
@@ -389,7 +389,7 @@ export default {
         filterType: 'logic',
         enumValue: '',
         value: '',
-        term: ''
+        term: 'eq'
       })
       this.filterListInit(deType)
       this.checklist = []