CN-1016 Filter与查找条件组合操作调试及问题修改

src/mixins/data-list.js

@@ -343,6 +343,8 @@ export default {
     },
     search (params) {
       this.pageObj.pageNo = 1
+      delete this.searchLabel.category
+      delete this.searchLabel.source
       this.getTableData(params)
     },
     getTimeString () {

src/views/setting/KnowledgeBase.vue

@@ -6,6 +6,7 @@
     <div class="knowledge-base__content" >
       <div class="left-filter" style="">
           <knowledge-filter ref="knowledgeFilter"
+                            :keyWord="keyWord"
                   @reload="reload"
                   @clearList="clearList"></knowledge-filter>
       </div>
@@ -166,10 +167,11 @@ export default {
   methods: {
     onSearch () {
       const params = {
-        q: this.keyWord
+        name: this.keyWord
       }
       this.clearList()
       this.search(params)
+      this.$refs.knowledgeFilter.reloadFilter(params)
     },
     handleClose () {
       this.showConfirmDialog = false
@@ -299,6 +301,10 @@ export default {
       this.isSelectedStatus = false
       this.batchDeleteObjs = []
       this.secondBatchDeleteObjs = []
+      params = {
+        ...params,
+        name: this.keyWord
+      }
       this.getTableData(params, isAll, isClearType)
     },
     clearList () {

src/views/setting/KnowledgeFilter.vue

@@ -37,6 +37,7 @@ import { knowledgeCategoryValue, knowledgeSourceValue } from '@/utils/constants'
 export default {
   name: 'KnowledgeFilter',
   props: {
+    keyWord: String
   },
   data () {
     return {
@@ -61,8 +62,7 @@ export default {
         children: 'children',
         label: 'label'
       },
-      allTableData: [],
+      allTableData: []
-      allCount: 0
     }
   },
   watch: {
@@ -76,37 +76,45 @@ export default {
     },
     handleCheckedItemChange (data, checkinfo, index) {
       this.$nextTick(() => {
-        let typeCheckedNodes = this.$refs.knowledgeTree0.getCheckedNodes()
+        setTimeout(() => {
-        const typeHalfCheckedNodes = checkinfo.halfCheckedNodes
+          let typeCheckedNodes = this.$refs.knowledgeTree0.getCheckedNodes()
-        typeCheckedNodes = typeCheckedNodes.concat(typeHalfCheckedNodes)
+          const typeHalfCheckedNodes = checkinfo.halfCheckedNodes
-        const statusCheckedNodes = this.$refs.knowledgeTree1.getCheckedNodes()
+          typeCheckedNodes = typeCheckedNodes.concat(typeHalfCheckedNodes)
-        const typeCheckedLen = typeCheckedNodes.length
+          const statusCheckedNodes = this.$refs.knowledgeTree1.getCheckedNodes()
-        const statusCheckedLen = statusCheckedNodes.length
+          const typeCheckedLen = typeCheckedNodes.length
-        let params = {}
+          const statusCheckedLen = statusCheckedNodes.length
-        if (typeCheckedLen === 0 || statusCheckedLen === 0) {
+          let params = {}
-          this.$emit('clearList')
+          let allSourceNum = 0
-        } else {
+          this.filterData[0].data.forEach(item => {
-          const categorys = []
+            allSourceNum = allSourceNum + item.children.length
-          const sources = []
-          typeCheckedNodes.forEach(val => {
-            if (val.type === 0) {
-              categorys.push(val.value)
-            } else if (val.type === 1) {
-              sources.push(val.value)
-            }
           })
-          params = {
+          if (typeCheckedLen === 0 || statusCheckedLen === 0) {
-            category: categorys.toString(),
+            this.$emit('clearList')
-            source: sources.toString()
+          } else {
-          }
+            const categorys = []
-          if (statusCheckedLen === 1) {
+            const sources = []
-            params = {
+            typeCheckedNodes.forEach(val => {
-              ...params,
+              if (val.type === 0) {
-              status: statusCheckedNodes[0].value
+                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)
           }
-          this.$emit('reload', params, true)
+        }, 200)
-        }
       })
     },
     getAllTableData (params) {
@@ -126,16 +134,12 @@ export default {
       })
     },
     initAllData () {
-      this.allCount = this.allTableData.length
       let webSketchCount = 0
       let fqdnCategoryCount = 0
       let iocMalwareCount = 0
       let iocDarkwebCount = 0
       let ipLocationCount = 0
       let asnCount = 0
-      const fqdnWhoCount = 0
-      const fqdnIcpCount = 0
-      const appCategoryCount = 0
 
       let aiTaggingCount = 0
       let psiphon3Count = 0
@@ -212,25 +216,7 @@ export default {
             value: knowledgeSourceValue.asn,
             count: asnCount,
             type: 1
-          }/*, {
+          }
-            id: 16,
-            label: 'FQDN Who',
-            value: 'cn_fqdn_who_isBuiltIn',
-            count:fqdnWhoCount,
-            children: []
-          },{
-            id: 17,
-            label: 'FQDN Icp',
-            value: 'cn_fqdn_icp_built_in',
-            count:fqdnIcpCount,
-            children: []
-          },{
-            id: 18,
-            label: 'APP Category',
-            value: 'cn_app_category_built_indad',
-            count:appCategoryCount,
-            children: []
-          } */
           ]
         },
         {
@@ -294,12 +280,16 @@ export default {
         { id: 2, label: 'disable', value: 0, count: disableCount, type: 0 }
       ]
     },
-    reloadFilter () {
+    reloadFilter (params) {
-      this.getAllTableData()
+      this.getAllTableData(params)
     }
   },
   mounted () {
-    this.getAllTableData()
+    let params = {}
+    params = {
+      name: this.keyWord
+    }
+    this.getAllTableData(params)
   },
   computed: {
   }