From 0d10a065222a65478636a8a16c55e05dfaf486a2 Mon Sep 17 00:00:00 2001 From: hyx Date: Thu, 8 Jun 2023 17:17:41 +0800 Subject: [PATCH] =?UTF-8?q?CN-1062=20fix:=E5=B7=A6=E4=BE=A7filter=EF=BC=8C?= =?UTF-8?q?type=E6=9C=89=E5=8D=8A=E9=80=89=E7=9A=84category=EF=BC=8C?= =?UTF-8?q?=E7=82=B9=E5=87=BBdisable=20=E6=8A=A5=E9=94=99;=E5=86=85?= =?UTF-8?q?=E7=BD=AE=E6=95=B0=E6=8D=AE=E9=80=89=E6=8B=A9=E6=A1=86=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E7=A6=81=E7=94=A8;=E5=B7=A6=E4=BE=A7=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E4=B8=80=E4=BA=9B=E5=8B=BE=E9=80=89=E7=9A=84,?= =?UTF-8?q?=E5=8F=B3=E4=BE=A7=E5=88=A0=E9=99=A4=E4=B8=80=E4=B8=AA=EF=BC=8C?= =?UTF-8?q?=E5=8B=BE=E9=80=89=E5=8F=88=E8=87=AA=E5=8A=A8=E5=8B=BE=E4=B8=8A?= =?UTF-8?q?=E4=BA=86=EF=BC=8C=E4=BD=86=E6=98=AF=E5=8F=B3=E4=BE=A7=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=B2=A1=E5=8F=98=E5=8C=96;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../table/setting/KnowledgeBaseTableForRow.vue | 1 + .../table/setting/knowledgeBaseTableForCard.vue | 4 ++-- src/mixins/table.js | 10 ++++++++++ src/views/setting/KnowledgeBase.vue | 6 ++++++ src/views/setting/KnowledgeFilter.vue | 12 +++++++++--- 5 files changed, 28 insertions(+), 5 deletions(-) diff --git a/src/components/table/setting/KnowledgeBaseTableForRow.vue b/src/components/table/setting/KnowledgeBaseTableForRow.vue index 8b26c85e..2eacf52e 100644 --- a/src/components/table/setting/KnowledgeBaseTableForRow.vue +++ b/src/components/table/setting/KnowledgeBaseTableForRow.vue @@ -13,6 +13,7 @@ :resizable="false" align="center" type="selection" + :selectable="selectable" width="55">
{{data.name}}
- +
{{$t('overall.edit')}}
{{$t('overall.delete')}}
-
+
diff --git a/src/mixins/table.js b/src/mixins/table.js index 665067a9..7cc9deaf 100644 --- a/src/mixins/table.js +++ b/src/mixins/table.js @@ -109,6 +109,9 @@ export default { }) } }, + init () { + this.isInit = true + }, changeStatus (status, id) { if (!this.isInit) { patch(api.knowledgeBaseEnable, { list: [{ knowledgeId: id, status: status }] }).then(response => { @@ -126,6 +129,13 @@ export default { }) } }, + selectable (row, rowIndex) { + if (row.isBuiltIn === 1) { + return false + } else { + return true + } + }, tableOperation ([command, row]) { switch (command) { default: diff --git a/src/views/setting/KnowledgeBase.vue b/src/views/setting/KnowledgeBase.vue index a33028a6..948817d0 100644 --- a/src/views/setting/KnowledgeBase.vue +++ b/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) diff --git a/src/views/setting/KnowledgeFilter.vue b/src/views/setting/KnowledgeFilter.vue index 95ef6c53..17723a1a 100644 --- a/src/views/setting/KnowledgeFilter.vue +++ b/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) + } }) }) },