From ac28e52ca7f5bb1d37509e6b48b4f452d9c52da7 Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Mon, 6 Mar 2023 14:19:29 +0800
Subject: [PATCH] =?UTF-8?q?CN-906=20fix:=20=E7=9F=A5=E8=AF=86=E5=BA=93?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F=E5=AD=97=E6=AE=B5=E5=90=8D?=
 =?UTF-8?q?=E6=9B=B4=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../table/setting/KnowledgeBaseTable.vue      |  6 ++++--
 src/mixins/table.js                           |  6 ++++--
 src/utils/constants.js                        |  3 ++-
 src/views/setting/KnowledgeBase.vue           | 19 ++++++++++++++++++-
 4 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/components/table/setting/KnowledgeBaseTable.vue b/src/components/table/setting/KnowledgeBaseTable.vue
index 3aef8fc7..9b8b9c48 100644
--- a/src/components/table/setting/KnowledgeBaseTable.vue
+++ b/src/components/table/setting/KnowledgeBaseTable.vue
@@ -126,7 +126,8 @@ export default {
         {
           label: this.$t('overall.createTime'),
           prop: 'ctime',
-          show: false
+          show: false,
+          sortable: 'custom'
         },
         {
           label: this.$t('overall.updatedBy'),
@@ -136,7 +137,8 @@ export default {
         {
           label: this.$t('overall.updateTime'),
           prop: 'utime',
-          show: false
+          show: false,
+          sortable: 'custom'
         }
       ]
     }
diff --git a/src/mixins/table.js b/src/mixins/table.js
index 62289e57..a1b17c60 100644
--- a/src/mixins/table.js
+++ b/src/mixins/table.js
@@ -55,13 +55,14 @@ export default {
       })
     },
     tableDataSort (item) {
-      let orderBy = ''
+      /*let orderBy = ''
       if (item.order === 'ascending') {
         if (item.prop === 'lastTime') {
           orderBy = chartTableOrderOptionsMapping[item.prop]
         } else {
           orderBy = item.prop
         }
+        orderBy = chartTableOrderOptionsMapping[item.prop] || item.prop
       }
       if (item.order === 'descending') {
         if (item.prop === 'lastTime') {
@@ -69,7 +70,8 @@ export default {
         } else {
           orderBy = '-' + item.prop
         }
-      }
+      }*/
+      const orderBy = (item.order === 'descending' ? '-' : '') + (chartTableOrderOptionsMapping[item.prop] || item.prop)
       this.$emit('orderBy', orderBy)
     }
   }
diff --git a/src/utils/constants.js b/src/utils/constants.js
index 62247abc..26211ac3 100644
--- a/src/utils/constants.js
+++ b/src/utils/constants.js
@@ -122,7 +122,8 @@ export const chartTableColumnMapping = {
   ip: 'IP'
 }
 export const chartTableOrderOptionsMapping = {
-  lastTime: 'last_time'
+  lastTime: 'last_time',
+  tagName: 'tag_name'
 }
 export const chartPieTableTopOptions = [
   { name: 'Sessions', value: 'sessions' },
diff --git a/src/views/setting/KnowledgeBase.vue b/src/views/setting/KnowledgeBase.vue
index d7163843..5c0534cc 100644
--- a/src/views/setting/KnowledgeBase.vue
+++ b/src/views/setting/KnowledgeBase.vue
@@ -42,7 +42,7 @@ import cnDataList from '@/components/table/CnDataList'
 import dataListMixin from '@/mixins/data-list'
 import KnowledgeBaseTable from '@/components/table/setting/KnowledgeBaseTable'
 import { api } from '@/utils/api'
-import { get } from '@/utils/http'
+import {del, get} from '@/utils/http'
 
 export default {
   name: 'knowledgeBase',
@@ -67,6 +67,23 @@ export default {
         }
       })
     },
+    del (row) {
+      this.$confirm(this.$t('tip.confirmDelete'), {
+        confirmButtonText: this.$t('tip.yes'),
+        cancelButtonText: this.$t('tip.no'),
+        type: 'warning'
+      }).then(() => {
+        del(this.url + '?ids=' + row.knowledgeId).then(response => {
+          if (response.code === 200) {
+            this.delFlag = true
+            this.$message({ duration: 2000, type: 'success', message: this.$t('tip.deleteSuccess') })
+            this.getTableData()
+          } else {
+            this.$message.error(response.msg)
+          }
+        })
+      })
+    },
     jumpToCreatePage () {
       this.$router.push({
         path: '/knowledgeBase/form',