Merge remote-tracking branch 'origin/dev' into dev

src/views/setting/KnowledgeBase.vue

@@ -253,6 +253,8 @@ export default {
             this.$refs.knowledgeFilter.reloadFilter()
             this.secondBatchDeleteObjs = []
             this.batchDeleteObjs = []
+            delete this.searchLabel.category
+            delete this.searchLabel.source
             this.getTableData()
           } else {
             this.$message.error(response.data.message)
@@ -347,6 +349,8 @@ export default {
       this.batchDeleteObjs = []
       this.secondBatchDeleteObjs = []
       this.listMode = mode
+      // this.$refs.dataTable.init()
+      // this.$refs.dataTableCard.init()
       const { query } = this.$route
       const newUrl = urlParamsHandler(window.location.href, query, { listMode: mode })
       overwriteUrl(newUrl)
@@ -362,6 +366,8 @@ export default {
           if (response.data.code === 200) {
             this.delFlag = true
             this.$message({ duration: 2000, type: 'success', message: this.$t('tip.deleteSuccess') })
+            delete this.searchLabel.category
+            delete this.searchLabel.source
             this.getTableData()
           } else {
             this.$message.error(response.data.message)

src/views/setting/KnowledgeFilter.vue

@@ -121,18 +121,20 @@ export default {
     },
     handleCheckedItemChange (data, checkinfo) {
       let typeCheckedNodes = []
+      let typeHalfCheckedNodes = []
       if (this.$refs.knowledgeTreeTypeFilter) {
         if (this.$refs.knowledgeTreeTypeFilter instanceof Array) {
           typeCheckedNodes = this.$refs.knowledgeTreeTypeFilter[0].getCheckedNodes()
+          typeHalfCheckedNodes = this.$refs.knowledgeTreeTypeFilter[0].getHalfCheckedNodes()
         } else {
           typeCheckedNodes = this.$refs.knowledgeTreeTypeFilter.getCheckedNodes()
+          typeHalfCheckedNodes = this.$refs.knowledgeTreeTypeFilter.getHalfCheckedNodes()
         }
         const categoryIds = []
         typeCheckedNodes.forEach(item => {
           categoryIds.push(item.id)
         })
         this.defaultCheckedCategory = categoryIds
-        const typeHalfCheckedNodes = checkinfo.halfCheckedNodes
         typeCheckedNodes = typeCheckedNodes.concat(typeHalfCheckedNodes)
       }
       let statusCheckedNodes = []
@@ -214,8 +216,12 @@ export default {
         this.initStatusData()
         const self = this
         this.$nextTick(() => {
-          self.$refs.knowledgeTreeTypeFilter.setCheckedKeys(this.defaultCheckedCategory)
-          self.$refs.knowledgeTreeStatusFilter.setCheckedKeys(this.defaultCheckedStatus)
+          if (self.$refs.knowledgeTreeTypeFilter) {
+            self.$refs.knowledgeTreeTypeFilter.setCheckedKeys(this.defaultCheckedCategory)
+          }
+          if (self.$refs.knowledgeTreeStatusFilter) {
+            self.$refs.knowledgeTreeStatusFilter.setCheckedKeys(this.defaultCheckedStatus)
+          }
         })
       })
     },