Merge pull request #7245 from dataease/pr@dev_one_dot_x

Pr@dev one dot x

core/frontend/src/views/chart/view/ChartEdit.vue

@@ -2064,7 +2064,7 @@ export default {
   },
   computed: {
     filedList() {
-      return [...this.dimension, ...this.quota]
+      return [...this.dimension, ...this.quota].filter(ele => ele.id !== 'count')
     },
     obj() {
       return {

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%;

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 = []

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
               }
             }
           }