From 109dfa14ebe619f37add09d6c99ec6fdc097fe4a Mon Sep 17 00:00:00 2001
From: hyx <hanyuxia@iie.ac.cn>
Date: Mon, 5 Jun 2023 11:23:35 +0800
Subject: [PATCH] =?UTF-8?q?CN-1016=20=20Filter=E7=82=B9=E5=87=BB=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/setting/KnowledgeFilter.vue | 85 +++++++++++++--------------
 1 file changed, 42 insertions(+), 43 deletions(-)

diff --git a/src/views/setting/KnowledgeFilter.vue b/src/views/setting/KnowledgeFilter.vue
index d4e7a9a4..68e68114 100644
--- a/src/views/setting/KnowledgeFilter.vue
+++ b/src/views/setting/KnowledgeFilter.vue
@@ -4,15 +4,16 @@
       {{ $t('knowledge.filters') }}
     </div>
     <template v-for="(filter, index) in filterData" :key="index">
-      <div class="knowledge-filter" v-if="filter.data.length > 0">
+      <div class="knowledge-filter">
         <div class="filter__header" @click="filter.collapse = !filter.collapse">
           <span class="new-knowledge-filter-header-title">{{filter.title}}</span>
           <i class="el-icon-arrow-right new-knowledge-filter-icon" :class="{ 'arrow-rotate': !filter.collapse }"></i>
         </div>
         <el-collapse-transition>
-          <div class="filter__body" v-if="!filter.collapse">
+          <div class="filter__body">
             <el-tree
-                    :ref="`knowledgeTree${index}`"
+                    :ref="`knowledgeTree${filter.id}`"
+                    v-if="!filter.collapse"
                     :data="filter.data"
                     show-checkbox
                     node-key="id"
@@ -46,12 +47,14 @@ export default {
       isIndeterminateModel: false,
       filterData: [
         {
+          id:0,
           title: this.$t('knowledge.type'),
           collapse: false,
           value: [],
           data: []
         },
         {
+          id:1,
           title: this.$t('knowledge.status'),
           collapse: false,
           value: [],
@@ -75,47 +78,43 @@ export default {
       ])
     },
     handleCheckedItemChange (data, checkinfo, index) {
-      this.$nextTick(() => {
-        setTimeout(() => {
-          let typeCheckedNodes = this.$refs.knowledgeTree0.getCheckedNodes()
-          const typeHalfCheckedNodes = checkinfo.halfCheckedNodes
-          typeCheckedNodes = typeCheckedNodes.concat(typeHalfCheckedNodes)
-          const statusCheckedNodes = this.$refs.knowledgeTree1.getCheckedNodes()
-          const typeCheckedLen = typeCheckedNodes.length
-          const statusCheckedLen = statusCheckedNodes.length
-          let params = {}
-          let allSourceNum = 0
-          this.filterData[0].data.forEach(item => {
-            allSourceNum = allSourceNum + item.children.length
-          })
-          if (typeCheckedLen === 0 || statusCheckedLen === 0) {
-            this.$emit('clearList')
-          } else {
-            const categorys = []
-            const sources = []
-            typeCheckedNodes.forEach(val => {
-              if (val.type === 0) {
-                categorys.push(val.value)
-              } else if (val.type === 1) {
-                sources.push(val.value)
-              }
-            })
-            if (!(categorys.length === this.filterData[0].data.length && sources.length === allSourceNum)) {
-              params = {
-                category: categorys.toString(),
-                source: sources.toString()
-              }
-            }
-            if (statusCheckedLen === 1) {
-              params = {
-                ...params,
-                status: statusCheckedNodes[0].value
-              }
-            }
-            this.$emit('reload', params, true)
-          }
-        }, 200)
+      let typeCheckedNodes = this.$refs.knowledgeTree0.getCheckedNodes()
+      const typeHalfCheckedNodes = checkinfo.halfCheckedNodes
+      typeCheckedNodes = typeCheckedNodes.concat(typeHalfCheckedNodes)
+      const statusCheckedNodes = this.$refs.knowledgeTree1.getCheckedNodes()
+      const typeCheckedLen = typeCheckedNodes.length
+      const statusCheckedLen = statusCheckedNodes.length
+      let params = {}
+      let allSourceNum = 0
+      this.filterData[0].data.forEach(item => {
+        allSourceNum = allSourceNum + item.children.length
       })
+      if (typeCheckedLen === 0 || statusCheckedLen === 0) {
+        this.$emit('clearList')
+      } else {
+        const categorys = []
+        const sources = []
+        typeCheckedNodes.forEach(val => {
+          if (val.type === 0) {
+            categorys.push(val.value)
+          } else if (val.type === 1) {
+            sources.push(val.value)
+          }
+        })
+        if (!(categorys.length === this.filterData[0].data.length && sources.length === allSourceNum)) {
+          params = {
+            category: categorys.toString(),
+            source: sources.toString()
+          }
+        }
+        if (statusCheckedLen === 1) {
+          params = {
+            ...params,
+            status: statusCheckedNodes[0].value
+          }
+        }
+        this.$emit('reload', params, true)
+      }
     },
     getAllTableData (params) {
       let searchParams = { pageSize: -1 }