From a1267daa72d96a52d9291677cf55ae22d402d88b Mon Sep 17 00:00:00 2001
From: hyx <hanyuxia@iie.ac.cn>
Date: Fri, 9 Jun 2023 09:45:08 +0800
Subject: [PATCH] =?UTF-8?q?CN-1062=20fix:=E5=88=97=E8=A1=A8=E9=A1=B5?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=A8=A1=E5=BC=8F=E5=90=8E=EF=BC=8Cstatus?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=B2=A1=E6=9C=89=E8=AF=B7=E6=B1=82=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=EF=BC=9B=E5=8D=A1=E7=89=87=E6=A8=A1=E5=BC=8F=E4=B8=8B?=
 =?UTF-8?q?=E7=82=B9select=EF=BC=8C=E9=80=89=E4=B8=AD=E6=9F=90=E4=B8=AA?=
 =?UTF-8?q?=E5=8D=A1=E7=89=87=E5=90=8E=E8=BE=B9=E6=A1=86=E6=94=B9=E5=8F=98?=
 =?UTF-8?q?=E4=BA=86=EF=BC=8C=E7=84=B6=E5=90=8E=E5=88=87=E6=8D=A2=E5=88=B0?=
 =?UTF-8?q?table=E6=A8=A1=E5=BC=8F=EF=BC=8C=E5=86=8D=E5=88=87=E5=9B=9E?=
 =?UTF-8?q?=E5=8D=A1=E7=89=87=E6=A8=A1=E5=BC=8F=EF=BC=8C=E4=B9=8B=E5=89=8D?=
 =?UTF-8?q?=E9=80=89=E4=B8=AD=E7=9A=84=E5=8D=A1=E7=89=87=E8=BE=B9=E6=A1=86?=
 =?UTF-8?q?=E4=BB=8D=E7=84=B6=E6=98=AF=E9=80=89=E4=B8=AD=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=EF=BC=9B=E5=88=A0=E9=99=A4=E6=8F=90=E7=A4=BA=E6=A1=86=E4=B8=AD?=
 =?UTF-8?q?=EF=BC=8Cname=E5=88=97=E6=8C=AA=E5=88=B0=E7=AC=AC=E4=B8=80?=
 =?UTF-8?q?=E5=88=97=EF=BC=8Ccategory=E5=92=8Csource=E5=88=97=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9C=80=E8=A6=81=E6=98=A0=E5=B0=84=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=8E=9F=E5=A7=8B=E6=95=B0=E6=8D=AE=EF=BC=9B?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9=E9=A1=B5=EF=BC=9Aimport?=
 =?UTF-8?q?=E5=88=97=E5=90=8D=E6=94=B9=E4=B8=BAtip=EF=BC=9BitemList?=
 =?UTF-8?q?=E4=B8=ADtip=E7=9A=84=E4=BA=A4=E4=BA=92=EF=BC=9BitemList?=
 =?UTF-8?q?=E4=B8=AD=E7=BC=96=E8=BE=91=E6=8C=89=E9=92=AE=E7=9B=96=E4=BD=8F?=
 =?UTF-8?q?=E4=BA=86tip=E5=88=97=E7=9A=84=E6=96=87=E5=AD=97=EF=BC=9BitemLi?=
 =?UTF-8?q?st=E4=B8=ADedit=E4=BA=A4=E4=BA=92=E9=97=AE=E9=A2=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/setting/knowledgeBase.scss          |  2 +-
 src/mixins/table.js                           | 10 ++-----
 src/views/setting/KnowledgeBase.vue           | 27 +++++++++++++----
 src/views/setting/KnowledgeBaseForm.vue       | 30 ++++++++++++++-----
 4 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/src/assets/css/components/views/setting/knowledgeBase.scss b/src/assets/css/components/views/setting/knowledgeBase.scss
index 93b42966..d2187016 100644
--- a/src/assets/css/components/views/setting/knowledgeBase.scss
+++ b/src/assets/css/components/views/setting/knowledgeBase.scss
@@ -892,7 +892,7 @@
           }
         }
         .imported-data-msg {
-          width: 140px;
+          width: 200px;
         }
 
         .el-icon-close {
diff --git a/src/mixins/table.js b/src/mixins/table.js
index 7cc9deaf..aafa1be5 100644
--- a/src/mixins/table.js
+++ b/src/mixins/table.js
@@ -44,7 +44,7 @@ export default {
     tableData: {
       handler (n) {
         if (this.tableData && this.tableData.length > 0) {
-          this.isInit = false
+          //this.isInit = false
         }
       }
     }
@@ -52,8 +52,7 @@ export default {
   data () {
     return {
       operationWidth: '165', // 操作列宽
-      show: true,
-      isInit: true
+      show: true
     }
   },
   methods: {
@@ -109,11 +108,8 @@ export default {
         })
       }
     },
-    init () {
-      this.isInit = true
-    },
     changeStatus (status, id) {
-      if (!this.isInit) {
+      if (id) {
         patch(api.knowledgeBaseEnable, { list: [{ knowledgeId: id, status: status }] }).then(response => {
           if (response.code === 200) {
             this.$message({ duration: 1000, type: 'success', message: this.$t('tip.saveSuccess') })
diff --git a/src/views/setting/KnowledgeBase.vue b/src/views/setting/KnowledgeBase.vue
index 948817d0..5b83d4d1 100644
--- a/src/views/setting/KnowledgeBase.vue
+++ b/src/views/setting/KnowledgeBase.vue
@@ -67,7 +67,7 @@
                     @selectionChange="selectionChange"
                     @edit="edit"
                     @orderBy="tableDataSort"
-                    @reload="getTableData"
+                    @reload="reloadRowList"
             ></knowledge-base-table-for-row>
           </div>
         </template>
@@ -84,6 +84,7 @@
                     :all-count="18"
                     @delete="toDelete"
                     @checkboxStatusChange="checkboxStatusChange"
+                    @reload="reloadRowList"
             ></knowledge-base-table-for-card>
           </div>
         </template>
@@ -118,9 +119,9 @@
               width="50">
       </el-table-column>
       <el-table-column property="knowledgeId" label="ID" width="50"></el-table-column>
-      <el-table-column property="category" label="Category" width="100"></el-table-column>
-      <el-table-column property="source" label="Source" width="110"></el-table-column>
       <el-table-column property="name" label="Name"></el-table-column>
+      <el-table-column property="category" label="Category" width="100" :formatter = "categoryFormat"></el-table-column>
+      <el-table-column property="source" label="Source" width="110" :formatter = "sourceFormat"></el-table-column>
     </el-table>
     <template #footer>
         <span class="dialog-footer">
@@ -137,6 +138,7 @@ import KnowledgeBaseTableForCard from '@/components/table/setting/knowledgeBaseT
 import KnowledgeBaseTableForRow from '@/components/table/setting/KnowledgeBaseTableForRow'
 import { api } from '@/utils/api'
 import { urlParamsHandler, overwriteUrl } from '@/utils/tools'
+import { knowledgeBaseCategory, knowledgeBaseSource } from '@/utils/constants'
 import axios from 'axios'
 import KnowledgeFilter from '@/views/setting/KnowledgeFilter'
 
@@ -173,6 +175,20 @@ export default {
       this.search(params)
       this.$refs.knowledgeFilter.reloadFilter()
     },
+    reloadRowList () {
+      this.getTableData()
+      this.$refs.knowledgeFilter.reloadFilter()
+    },
+    categoryFormat (row, column) {
+      const category = row.category
+      const t = knowledgeBaseCategory.find(t => t.value === category)
+      return t ? t.name : category
+    },
+    sourceFormat (row, column) {
+      const source = row.source
+      const t = knowledgeBaseSource.find(t => t.value === source)
+      return t ? t.name : source
+    },
     handleClose () {
       this.showConfirmDialog = false
     },
@@ -349,8 +365,9 @@ export default {
       this.batchDeleteObjs = []
       this.secondBatchDeleteObjs = []
       this.listMode = mode
-      // this.$refs.dataTable.init()
-      // this.$refs.dataTableCard.init()
+      if (this.$refs.dataTableCard) {
+        this.$refs.dataTableCard.clearSelect()
+      }
       const { query } = this.$route
       const newUrl = urlParamsHandler(window.location.href, query, { listMode: mode })
       overwriteUrl(newUrl)
diff --git a/src/views/setting/KnowledgeBaseForm.vue b/src/views/setting/KnowledgeBaseForm.vue
index f41025dd..8d213563 100644
--- a/src/views/setting/KnowledgeBaseForm.vue
+++ b/src/views/setting/KnowledgeBaseForm.vue
@@ -99,15 +99,15 @@
                 <table class="imported-table" v-if="!importedDataNoData">
                   <tr>
                     <th style="width: 230px">{{ importedTableFirstColumn }}</th>
-                    <th style="width: 180px">Label</th>
-                    <th >{{ $t('overall.import') }}</th>
-                    <th style="width: 16px"></th>
+                    <th >Label</th>
+                    <th style="width: 200px">{{ $t('overall.tip') }}</th>
+                    <th style="width: 50px"></th>
                   </tr>
                   <tr v-for="(d, i) in showImportedData" :key="importedType + d.tagName + d.tagValue + i">
                     <td class="imported-data-item" :title="d.tagName">
                       <el-form-item v-if="(editIndex === i)  || (addEditFlag && d.tagName === '' && d.tagValue === '')" prop="tagName">
                         <span class="imported-data-item-edit__input">
-                          <el-input v-model="editTagForm.tagName" @blur="onBlurTagItem"></el-input>
+                          <el-input v-model="editTagForm.tagName" @blur="onBlurTagItem(i)"></el-input>
                         </span>
                       </el-form-item>
                       <span v-else>{{ d.tagName }}</span>
@@ -115,7 +115,7 @@
                     <td class="imported-data-value" :title="d.tagValue">
                       <el-form-item v-if="editIndex === i || (addEditFlag && d.tagName === '' && d.tagValue === '')" prop="tagValue">
                         <span class="imported-data-item-edit__input">
-                          <el-input v-model="editTagForm.tagValue" @blur="onBlurTagItem"></el-input>
+                          <el-input v-model="editTagForm.tagValue" @blur="onBlurTagItem(i)"></el-input>
                         </span>
                       </el-form-item>
                       <span v-else>{{ d.tagValue }}</span>
@@ -252,6 +252,9 @@ export default {
       return validate
     }
     const nameAndLabelDuplicateValidator = (rule, value, callback) => {
+      if (this.backEditFlag) {
+        return true
+      }
       let validate = true
       let index = -1 // 当前编辑的键值index
       // 查看是否重名前，需要对名称进行校验，分别是IP、domain、APP的校验
@@ -273,6 +276,9 @@ export default {
       return validate
     }
     const requiredItemValidator = (rule, value, callback) => {
+      if (this.backEditFlag) {
+        return true
+      }
       let validate = true
       const realValue = value.replace(/\s+/g, '')// 去掉空格
       if (realValue === '') {
@@ -283,6 +289,9 @@ export default {
       return validate
     }
     const requiredValueValidator = (rule, value, callback) => {
+      if (this.backEditFlag) {
+        return true
+      }
       value = this.editTagForm.tagValue
       const index = this.editIndex
       let validate = true
@@ -297,11 +306,12 @@ export default {
       return validate
     }
     const nameFormatValidator = (rule, value, callback) => {
+      if (this.backEditFlag) {
+        return true
+      }
       value = this.editTagForm.tagName
       const index = this.editIndex
       let validate = true
-      this.showImportedData[index].msg = 'success'
-      this.showImportedData[index].isValid = 1
       const type = this.editObject.source// 当前选中的类型
       if (type === knowledgeSourceValue.ipTag) {
         const formal = value.replace(/\s+/g, '')// 去掉空格
@@ -1009,10 +1019,14 @@ export default {
         }
       })
     },
-    onBlurTagItem () {
+    onBlurTagItem (index) {
       this.$refs.editForm.validate(valid => {
         if (valid) {
           this.editTagErrorTip = ''
+          this.showImportedData[index].isValid = 1
+          this.showImportedData[index].msg = 'success'
+        } else {
+          this.showImportedData[index].isValid = 0
         }
       })
     },