CN-1096 知识库UI开发

CN-1179 知识库内新增格式错误的Tag，文件导入形式和手动增加形式报错不一致

src/Login.vue

@@ -82,7 +82,7 @@ export default {
             res.loginSuccessPath = this.$route.query.redirect
             this.loginSuccess(res)
             localStorage.setItem(storageKey.username, this.username)
-            localStorage.setItem(storageKey.userId, res.data.data.userId)
+            localStorage.setItem(storageKey.userId, res.data.data.user ? res.data.data.user.userId : res.data.data.userId)
             localStorage.setItem(storageKey.token, res.data.data.token)
           } else if (res.data.code === 518005) {
             this.$message.error(this.$t('Incorrect username or password'))

src/components/table/setting/KnowledgeBaseTableForRow.vue

@@ -18,7 +18,7 @@
           width="55">
       </el-table-column>
       <el-table-column
-          v-for="(item, index) in customTableTitles"
+          v-for="(item, index) in tableTitle"
           :key="`col-${index}`"
           :fixed="item.fixed"
           :label="item.label"
@@ -52,6 +52,29 @@
           <template v-else-if="item.prop === 'source'">
             <span class="type-tag">{{tagSourceText(scope.row[item.prop])}}</span>
           </template>
+          <template v-else-if="item.prop === 'reference'" >
+            <templage v-if="scope.row[item.prop] && scope.row[item.prop].length > 2" >
+              <el-popover placement="right-end" trigger="hover" :show-arrow="false" offset="0" ref="referenceMoreInfo"
+                          hide-after="0" >
+                <template #reference>
+                  <div class="reference-tag__show">
+                    <div class="reference-tag__group">
+                      <span class="reference-tag" v-for="(refer, index) in scope.row[item.prop].slice(0,2)" >{{refer}}</span>
+                    </div>
+                    <div class="reference-more">+{{scope.row[item.prop].length - 2}} more</div>
+                  </div>
+                </template>
+                <div class="reference-tag__tip">
+                  <span class="reference-tag" v-for="(refer, index) in scope.row[item.prop].slice(2)" >{{refer}}</span>
+                </div>
+              </el-popover>
+            </templage>
+            <template v-else>
+              <template v-for="(refer, index) in scope.row[item.prop]">
+                <div class="type-tag">{{refer}}</div>
+              </template>
+            </template>
+          </template>
           <template v-else-if="item.prop === 'opTime' || item.prop === 'ctime'">
             <template v-if="scope.row[item.prop]">
               {{dateFormatByAppearance(scope.row[item.prop])}}
@@ -71,17 +94,6 @@
           <template v-else-if="item.prop === 'description'">
             <span class="list-desc" :title="scope.row[item.prop]">{{scope.row[item.prop]}}</span>
           </template>
-          <template v-else-if="item.prop === 'status'">
-            <el-switch class="card-enable"
-                       v-model="scope.row.status"
-                       active-color="#38ACD2"
-                       inactive-color="#C0CEDB"
-                       :active-value="1"
-                       :inactive-value="0"
-                       @change="changeStatus($event,scope.row.knowledgeId)"
-            >
-            </el-switch>
-          </template>
           <span v-else>{{scope.row[item.prop] || '-'}}</span>
         </template>
       </el-table-column>
@@ -112,30 +124,32 @@ export default {
           label: 'ID',
           prop: 'knowledgeId',
           show: true,
-          width: 60,
+          width: 100,
           sortable: 'custom'
         }, {
-          label: this.$t('config.roles.name'),
+          label: this.$t('overall.name'),
           prop: 'name',
           minWidth: 100,
+          width: 150,
           show: true,
           sortable: 'custom'
         }, {
-          label: this.$t('overall.category'),
+          label: this.$t('overall.type'),
-          prop: 'category',
-          width: 100,
-          show: true
-        }, {
-          label: this.$t('overall.source'),
           prop: 'source',
           width: 130,
           show: true
+        }, {
+          label: this.$t('knowledge.reference'),
+          prop: 'reference',
+          width: 180,
+          show: true
         }, {
           label: this.$t('overall.remark'),
           prop: 'description',
           minWidth: 150,
           show: true
         },
+        /*
         {
           label: this.$t('overall.createdBy'),
           prop: 'opUser',
@@ -151,22 +165,34 @@ export default {
           label: this.$t('overall.updatedBy'),
           prop: 'uuser',
           show: false
-        },
+        }, */
         {
           label: this.$t('overall.updateTime'),
           prop: 'opTime',
           show: true,
+          width: 150,
           sortable: 'custom'
-        },
-        {
-          label: this.$t('knowledge.status'),
-          prop: 'status',
-          show: true,
-          minWidth: 40
         }
       ]
     }
   },
+  watch: {
+    tableData: {
+      handler (n) {
+        if (this.tableData && this.tableData.length > 0) {
+          this.tableData.forEach(item => {
+            item.reference = []
+
+            if (item.refRule && item.refRule.length > 0) {
+              item.refRule.forEach(ref => {
+                item.reference.push(ref.name)
+              })
+            }
+          })
+        }
+      }
+    }
+  },
   computed: {
     tagCategoryText () {
       return function (type) {

src/components/table/setting/knowledgeBaseTableForCard.vue

@@ -1,29 +1,12 @@
 <template>
-  <el-checkbox-group v-model="checkList" v-if="!isNoData">
+  <template v-if="!isNoData">
-    <div @click="isSelectedStatus && data.isBuiltIn !== 1 && clickCard(data,$event)"  @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)" v-for="data in tableData" :key="data.knowledgeId" class="card-item"  :class="data.isSelected ? 'card-selected' : ''">
+    <div class="card-type-title" v-if="aiTaggingList.length > 0">{{$t('knowledgeBase.intelligenceLearning')}}</div>
+    <el-checkbox-group v-model="checkList" >
+      <div @click="isSelectedStatus && data.isBuiltIn !== 1 && clickCard(data,$event)"  @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)" v-for="data in aiTaggingList" :key="data.knowledgeId" class="card-item"  :class="data.isSelected ? 'card-selected' : ''">
         <div class="card-content">
-        <div class="card-title">
+          <div class="card-operate">
-          <div class="card-title-name" :title="data.name">{{data.name}}</div>
+            <el-switch v-model="data.status"
-          <div class="card-title-more">
+                       class="card-enable"
-            <span v-show="!isSelectedStatus && data.showMore && data.isBuiltIn !== 1"><i class="cn-icon cn-icon-more-dark" @mouseenter="mouseenterMore(data)" test-id="mouseenter-dark"></i></span>
-            <div class="card-operate" v-show="!isSelectedStatus && data.moreOptions" @mouseleave="mouseleaveMore(data)">
-              <div class="card-title-more-edit" @click="edit(data.knowledgeId)" >{{$t('overall.edit')}}</div>
-              <div class="card-title-more-delete" @click="del(data)" >{{$t('overall.delete')}}</div>
-            </div>
-            <el-checkbox @click.stop="" :disabled="data.isBuiltIn === 1" @change="(val) => {checkboxStatusChange(val,data)}" style="position: absolute;right: -12px;" v-if="isSelectedStatus" :key="data.knowledgeId" :label="data"><br></el-checkbox>
-
-          </div>
-        </div>
-        <div class="card-id">ID:{{data.knowledgeId}}</div>
-        <div class="card-desc" :title="data.description">{{data.description?data.description:'—'}}</div>
-      </div>
-      <div class="card-operate__footer">
-        <div class="card-type">
-          <div class="card-category">{{tagCategoryText(data.category)}}</div>
-          <div class="card-source">{{tagSourceText(data.source)}}</div>
-        </div>
-        <el-switch class="card-enable"
-                   v-model="data.status"
                        active-color="#38ACD2"
                        inactive-color="#C0CEDB"
                        :active-value="1"
@@ -32,16 +15,169 @@
             >
             </el-switch>
           </div>
+          <div class="card-icon">
+            <i class="cn-icon-add-knowledge-base cn-icon" ></i>
+          </div>
+          <div class="card-title">
+            <div class="card-title-name" :title="data.name">{{data.name}}</div>
+          </div>
+          <div class="card-desc" :title="data.description">{{data.description?data.description:'—'}}</div>
+        </div>
+        <div class="card-operate__footer">
+          <button v-if="data.showUpdate"
+                  :title="$t('overall.update')" class="top-tool-btn--update"
+                  @click="jumpToUpdatePage(data,true)">
+            <i class="cn-icon-update-knowledge-base cn-icon"></i>
+            <span>{{$t('overall.update')}}</span>
+          </button>
+        </div>
       </div>
     </el-checkbox-group>
+    <div class="card-type-title" style="margin-top:4px;"  v-if="websketchList.length > 0">{{$t('knowledgeBase.websketchIntegration')}}</div>
+    <el-checkbox-group v-model="checkList" >
+      <div @click="isSelectedStatus && data.isBuiltIn !== 1 && clickCard(data,$event)"  @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)" v-for="data in websketchList" :key="data.knowledgeId" class="card-item"  :class="data.isSelected ? 'card-selected' : ''">
+        <div class="card-content">
+          <div class="card-icon">
+            <i class="cn-icon-add-knowledge-base cn-icon" ></i>
+          </div>
+          <div class="card-title">
+            <div class="card-title-name" :title="data.name">{{data.name}}</div>
+          </div>
+          <div class="card-desc" :title="data.description">{{data.description?data.description:'—'}}</div>
+        </div>
+        <div class="card-operate__footer">
+          <button v-if="data.showUpdate" :title="$t('overall.update')" class="top-tool-btn--update"
+                  @click="jumpToUpdatePage(data,false)">
+            <i class="cn-icon-update-knowledge-base cn-icon"></i>
+            <span>{{$t('overall.update')}}</span>
+          </button>
+        </div>
+      </div>
+    </el-checkbox-group>
+  </template>
+
   <div class="table-no-data" v-else="isNoData">
     <div class="table-no-data__title">{{ $t('npm.noData') }}</div>
   </div>
+
+  <div class="center-dialog">
+    <el-dialog v-model="showUpdateDialog"
+               custom-class="update-knowledge"
+               :before-close="handleClose">
+      <div class="knowledge-update__top" >
+        <div class="update-left__icon">
+          <i class="cn-icon-add-knowledge-base cn-icon" ></i>
+        </div>
+        <div class="update-right">
+          <div class="knowledge-enable">
+            <div class="update-title">
+              <div class="card-title-name" :title="updateKnowledge.name">{{updateKnowledge.name}}</div>
+            </div>
+            <el-switch v-model="updateKnowledge.status"
+                       v-if="showEnable"
+                       active-color="#38ACD2"
+                       inactive-color="#C0CEDB"
+                       :active-value="1"
+                       :inactive-value="0"
+                       @change="changeStatus($event,updateKnowledge.knowledgeId)"
+            >
+            </el-switch>
+          </div>
+          <div class="knowledge-desc" :title="updateKnowledge.description">{{updateKnowledge.description?updateKnowledge.description:'—'}}</div>
+        </div>
+      </div>
+      <template v-if="!showAddUpdateDialog">
+        <div class="knowledge-update" >
+          <div class="update-title">
+            <div class="card-title-name">update record</div>
+          </div>
+          <div class="update-operate">
+            <button :title="$t('overall.update')" class="top-tool-btn--update"
+                    @click="uploadRecord()">
+              <i class="cn-icon-update-knowledge-base cn-icon"></i>
+              <span>{{$t('overall.update')}}</span>
+            </button>
+          </div>
+        </div>
+        <el-table ref="updateDataTable"
+                  border
+                  :data="updateHistoryList"
+                  @selection-change="secondSelectionChange"
+                  max-height="653px"
+                  width="100%"
+                  class="update-dialog__table"
+                  cell-style="padding:6px 0px;font-size: 12px;color: #353636;font-weight: 400;line-height: 20px;border-right:none;"
+                  header-cell-style="padding:8px 0px;font-size: 12px;color: #353636;font-weight: 500;border-right:none;">
+          <el-table-column property="opTime" label="Update time" width="150" ></el-table-column>
+          <el-table-column property="opUser" label="Operating user" width="150" ></el-table-column>
+          <el-table-column property="version" label="Version information" width="150"  ></el-table-column>
+          <el-table-column property="description" label="Description"></el-table-column>
+        </el-table>
+      </template>
+      <template v-if="showAddUpdateDialog">
+        <div class="update-knowledge-form"  >
+          <el-form :model="updateObject" label-position="top" ref="form" :rules="rules">
+            <!--name-->
+            <el-form-item :label="$t('overall.name')" prop="name">
+              <el-input class="form-input" maxlength="64" placeholder="" disabled show-word-limit
+                        size="mini" type="text" v-model="updateObject.name" @blur="tagNameBlur"></el-input>
+            </el-form-item>
+            <el-form-item :label="$t('knowledge.upload')" prop="file">
+              <el-upload :action="`${baseUrl}${apiVersion}/knowledgeBase/items/batch`"
+                         :headers="uploadHeaders"
+                         :multiple="false"
+                         :file-list="fileList"
+                         :data="uploadParams"
+                         :on-change="fileChange"
+                         :on-success="uploadSuccess"
+                         :before-upload="beforeUpload"
+                         :on-progress="onUpload"
+                         :on-error="uploadError"
+                         :class="uploadErrorTip ? 'el-upload--error' : ''"
+                         :accept="fileTypeLimit"
+                         ref="knowledgeUpload"
+                         id="knowledgeUpload"
+              >
+                <el-button type="primary" class="uploadBtn"><i class="cn-icon cn-icon-a-1"></i></el-button>
+              </el-upload>
+            </el-form-item>
+
+            <el-form-item :label="$t('knowledge.version')" prop="version">
+              <el-input class="form-input" maxlength="64" placeholder="" disabled show-word-limit
+                        size="mini" type="text" v-model="updateObject.version" @blur="tagNameBlur"></el-input>
+            </el-form-item>
+            <el-form-item :label="$t('overall.remark')" prop="description" class="knowledge-remark">
+              <el-input  maxlength="255" show-word-limit :rows="4" size='mini' type="textarea" resize='none'
+                         v-model="updateObject.description" id="role-box-input-remark"/>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="dialog-footer">
+          <el-button @click="showAddUpdateDialog = false">{{ $t('overall.cancel') }}</el-button>
+          <el-button type="primary" @click="submitConfirm">{{ $t('tip.confirm') }}</el-button>
+        </div>
+      </template>
+    </el-dialog>
+    <el-dialog v-model="showConfirmDialog"
+               :title="$t('overall.tips')"
+               custom-class="update-knowledge-tip"
+               :before-close="handleConfirmClose">
+      <div class="dialog-message">{{$t('knowledge.updateTips')}}</div>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="showConfirmDialog = false">{{ $t('overall.cancel') }}</el-button>
+          <el-button type="primary" @click="submit">{{ $t('tip.confirm') }}</el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
 import table from '@/mixins/table'
-import { knowledgeBaseCategory, knowledgeBaseSource } from '@/utils/constants'
+import { knowledgeCategoryValue, storageKey } from '@/utils/constants'
+import { ref } from 'vue'
+import { updateKnowledgeUrl } from '@/utils/api'
 export default {
   name: 'knowledgeBaseTableForCard',
   mixins: [table],
@@ -57,10 +193,78 @@ export default {
   data () {
     return {
       tableTitle: [],
-      checkList: []
+      checkList: [],
+      aiTaggingList: [],
+      websketchList: [],
+      showUpdateDialog: false,
+      showConfirmDialog: false,
+      showAddUpdateDialog: false,
+      updateKnowledge: {},
+      showEnable: false,
+      updateHistoryList: [],
+      updateObject: {},
+      updateKnowledgeUrl: updateKnowledgeUrl
+    }
+  },
+  setup () {
+    // 没上传过文件的提示
+    const uploadErrorTip = ref('')
+    return {
+      baseUrl: BASE_CONFIG.baseUrl,
+      apiVersion: BASE_CONFIG.apiVersion,
+      uploadHeaders: {
+        'Cn-Authorization': localStorage.getItem(storageKey.token)
+      },
+      uploadErrorTip,
+      fileTypeLimit: '.csv',
+      fileList: ref([])
     }
   },
   methods: {
+    fileChange (files, fileList) {
+      this.fileList = fileList.slice(-1)
+    },
+    uploadError () {
+      this.$message.error(this.$t('tip.uploadFailed', { msg: 'error' }))
+    },
+    uploadSuccess (response) {
+      const uploadFile = this.fileList ? this.fileList[0] : null
+      let fileName = uploadFile ? uploadFile.name : ''
+      fileName = fileName.substring(0, fileName.indexOf('.'))
+      this.updateObject.version = fileName.length >= 8 ? fileName.substring(fileName.length - 8) : fileName
+      this.uploaded = response.code === 200
+      if (response.code === 200) {
+
+      } else {
+        this.$message.error(this.$t('tip.uploadFailed', { msg: response.message }))
+      }
+    },
+    beforeUpload (file) {
+
+    },
+    onUpload () {
+
+    },
+    updateKnowledgeBase () {
+      axios.post(this.updateKnowledgeUrl + '?knowledgeIds=' + ids).then(response => {
+        if (response.data.code === 200) {
+          this.$message({ duration: 2000, type: 'success', message: this.$t('tip.success') })
+          // 重新查询历史记录
+        } else {
+          this.$message.error(response.data.message)
+        }
+      }).finally(() => {
+
+      })
+    },
+    submitConfirm () {
+      this.showConfirmDialog = true
+    },
+    submit () {
+      // this.updateKnowledgeBase()//更新列表数据
+      this.showConfirmDialog = false
+      this.showAddUpdateDialog = false
+    },
     clickCard (data, event) {
       if (data.isSelected) { // 原来为选中，当前点击后未选中
         const index = this.checkList.indexOf(data)
@@ -81,11 +285,29 @@ export default {
       data.isSelected = val
       this.$emit('checkboxStatusChange', val, data)
     },
-    showSelect () {
+    handleClose () {
-      // this.isSelectedStatus = true
+      this.showUpdateDialog = false
+      this.showAddUpdateDialog = false
     },
-    hideSelect () {
+    handleConfirmClose () {
-      // this.isSelectedStatus = false
+      this.showConfirmDialog = false
+    },
+    handleUpdateClose () {
+      this.showAddUpdateDialog = false
+    },
+    showUpdate () {
+      this.showUpdateDialog = true
+      this.showAddUpdateDialog = false
+    },
+    jumpToUpdatePage (data, showEnable) {
+      this.updateKnowledge = data
+      this.showEnable = showEnable
+      this.showUpdate()
+    },
+    uploadRecord () {
+      this.showAddUpdateDialog = true
+      this.updateObject.name = this.updateKnowledge.name
+      this.updateObject.version = ''
     },
     clearSelect () {
       this.$nextTick(() => {
@@ -97,32 +319,17 @@ export default {
         }
       })
     },
-    mouseenterMore (card) {
-      this.tableData.forEach(t => {
-        if (t.knowledgeId === card.knowledgeId) {
-          t.moreOptions = true
-        }
-      })
-    },
-    mouseleaveMore (card) {
-      this.tableData.forEach(t => {
-        if (t.knowledgeId === card.knowledgeId) {
-          t.moreOptions = false
-        }
-      })
-    },
     mouseenter (card) {
       this.tableData.forEach(t => {
         if (t.knowledgeId === card.knowledgeId) {
-          t.showMore = true
+          t.showUpdate = true
         }
       })
     },
     mouseleave (card) {
       this.tableData.forEach(t => {
         if (t.knowledgeId === card.knowledgeId) {
-          t.showMore = false
+          t.showUpdate = false
-          t.moreOptions = false
         }
       })
     },
@@ -131,38 +338,74 @@ export default {
     },
     edit (id) {
       const pageNo = this.$router.currentRoute.value.query.pageNo
-      const listMode = this.$router.currentRoute.value.query.listMode
+      const dataType = this.$router.currentRoute.value.query.dataType
       this.$router.push({
         path: '/knowledgeBase/edit',
         query: {
           t: +new Date(),
           pageNoForTable: pageNo || 1,
           id: id,
-          listMode: listMode
+          dataType: dataType
         }
       })
     }
   },
+  watch: {
+    tableData: {
+      handler (n) {
+        if (this.tableData && this.tableData.length > 0) {
+          this.aiTaggingList = []
+          this.websketchList = []
+          this.tableData.forEach(item => {
+            item.showUpdate = false
+            if (item.category === knowledgeCategoryValue.aiTagging) {
+              this.aiTaggingList.push(item)
+            } else if (item.category === knowledgeCategoryValue.webSketch) {
+              this.websketchList.push(item)
+            }
+          })
+        }
+      }
+    },
+    showAddUpdateDialog: {
+      handler (n) {
+        if (!n) {
+          this.fileList = []
+        }
+      }
+    }
+  },
   mounted () {
+    this.aiTaggingList = []
+    this.websketchList = []
     this.tableData.forEach(item => {
-      item.showMore = false
+      item.showUpdate = false
-      item.moreOptions = false
+      if (item.category === knowledgeCategoryValue.aiTagging) {
+        this.aiTaggingList.push(item)
+      } else if (item.category === knowledgeCategoryValue.webSketch) {
+        this.websketchList.push(item)
+      }
     })
+
+    const update = {
+      opTime: '2023-07-26 16:27:55',
+      opUser: 'admin',
+      version: 'v2.8',
+      description: ' It can\'t be identified by the payload signature.'
+    }
+    this.updateHistoryList.push(update)
+    this.updateHistoryList.push(update)
+    this.updateHistoryList.push(update)
+    this.updateHistoryList.push(update)
+    this.updateHistoryList.push(update)
   },
   computed: {
-    tagCategoryText () {
+    uploadParams () {
-      return function (type) {
+      return {
-        const t = knowledgeBaseCategory.find(t => t.value === type)
+        knowledgeId: this.updateKnowledge.knowledgeId,
-        return t ? t.name : ''
+        action: 'update'
-      }
-    },
-    tagSourceText () {
-      return function (type) {
-        const t = knowledgeBaseSource.find(t => t.value === type)
-        return t ? t.name : ''
       }
     }
-
   }
 }
 </script>

src/mixins/data-list.js

@@ -107,10 +107,10 @@ export default {
       } else if (isClearType) {
         this.searchLabel.type = ''// 换新接口需要修改的属性名称
       }
+      this.searchLabel = { ...this.searchLabel, ...this.pageObj }
       if (params) {
         this.searchLabel = { ...this.searchLabel, ...params }
       }
-      this.searchLabel = { ...this.searchLabel, ...this.pageObj }
       this.isNoData = false
       this.toggleLoading(true)
       delete this.searchLabel.total
@@ -442,7 +442,7 @@ export default {
       }
     }
     this.tools.customTableTitle = localStorageTableTitle
-    if (localStorageTableTitle && (localStorageTableTitle.length > this.$refs.dataTable.tableTitle.length)) {
+    if (localStorageTableTitle && this.$refs.dataTable && this.$refs.dataTable.tableTitle && (localStorageTableTitle.length > this.$refs.dataTable.tableTitle.length)) {
       const arr = localStorageTableTitle.splice(this.$refs.dataTable.tableTitle.length, localStorageTableTitle.length)
       this.tools.customTableTitle = this.tools.customTableTitle.concat(arr)
     }

src/mixins/table.js

@@ -1,4 +1,4 @@
-import { chartTableOrderOptionsMapping, storageKey } from '@/utils/constants'
+import { chartTableOrderOptionsMapping, storageKey,knowledgeCategoryValue } from '@/utils/constants'
 import { getWidthByLanguage } from '@/utils/tools'
 import { put, patch } from '@/utils/http'
 import { api } from '@/utils/api'
@@ -40,13 +40,6 @@ export default {
           }
         }, 200)
       }
-    },
-    tableData: {
-      handler (n) {
-        if (this.tableData && this.tableData.length > 0) {
-          // this.isInit = false
-        }
-      }
     }
   },
   data () {

src/router/index.js

@@ -48,11 +48,15 @@ const routes = [
         component: () => import('@/views/setting/KnowledgeBase')
       },
       {
-        path: '/knowledgeBase/create',
+        path: '/knowledgeBase/userDefinedLibrary',
+        component: () => import('@/views/setting/KnowledgeBase')
+      },
+      {
+        path: '/knowledgeBase/userDefinedLibrary/create',
         component: () => import('@/views/setting/KnowledgeBaseForm')
       },
       {
-        path: '/knowledgeBase/edit',
+        path: '/knowledgeBase/userDefinedLibrary/edit',
         component: () => import('@/views/setting/KnowledgeBaseForm')
       },
       {

src/utils/api.js

@@ -40,6 +40,7 @@ export const api = {
   knowledgeBaseList: BASE_CONFIG.apiVersion + '/knowledgeBase/list',
   knowledgeBaseEnable: BASE_CONFIG.apiVersion + '/knowledgeBase/status',
   knowledgeBaseStatistics: BASE_CONFIG.apiVersion + '/knowledgeBase/statistics',
+  updateKnowledgeUrl: BASE_CONFIG.apiVersion + '/knowledgeBase/audit/log',
 
   // 报告相关
   reportJob: '/report/job',

src/views/setting/KnowledgeBase.vue

@@ -1,15 +1,39 @@
 <template>
-  <div style="height: 100%;overflow:auto;" class="knowledge-base">
+  <div class="knowledge-base">
+    <div class="knowledge-base__top">
       <div class="top-title">
         {{$t('overall.knowledgeBase')}}
       </div>
-    <div class="knowledge-base__content" >
+      <div class="builtIn-to-user-defined" v-if="dataType === 'builtInList'">
-      <div class="left-filter" style="">
+        <button :title="$t('knowledgeBase.userDefinedLibrary')" class="top-tool-btn--user_defined_library"
-          <knowledge-filter ref="knowledgeFilter"
+                @click="changeToUserDefinedList">
-                            :keyWord="keyWord"
+          <i class="cn-icon-add-knowledge-base cn-icon" ></i>
-                  @reload="reload"
+          <span>{{$t('knowledgeBase.userDefinedLibrary')}}</span>
-                  @clearList="clearList"></knowledge-filter>
+        </button>
       </div>
+    </div>
+
+    <!-- 内置库列表 -->
+    <div class="knowledge-base-built-in__content" v-if="dataType === 'builtInList'">
+      <div class="list-card" >
+        <div class="list-mode__card" >
+          <loading :loading="loading"></loading>
+          <knowledge-base-table-for-card
+                  ref="dataTableCard"
+                  :api="url"
+                  :isNoData="isNoData"
+                  :table-data="tableData"
+                  :is-selected-status="isSelectedStatus"
+                  @delete="toDelete"
+                  @checkboxStatusChange="checkboxStatusChange"
+                  @reload="getBuiltInData"
+                  @toggleLoading="toggleLoading"
+          ></knowledge-base-table-for-card>
+        </div>
+      </div>
+    </div>
+    <!-- 用户自定义列表 -->
+    <div class="knowledge-base-user-defined__content" v-else-if="dataType === 'userDefinedList'">
       <div class="right-list-card" >
         <div class="top-tools" >
           <div class="top-tools__left">
@@ -19,13 +43,7 @@
               <i class="cn-icon-xinjian cn-icon"></i>
               <span>{{$t('overall.create')}}</span>
             </button>
-            <button v-if="listMode === 'block'" id="knowledge-base-select" :title="$t('knowledgeBase.select')" class="top-tool-btn margin-r-10"
+            <button id="knowledge-base-edit" :title="$t('knowledgeBase.editKnowledgeBase')" class="top-tool-btn margin-r-10"  :disabled="disableEdit"
-                    style="width:72px;"
-                    @click="toSelect">
-              <i class="cn-icon-select cn-icon" ></i>
-              <span>{{$t('overall.select')}}</span>
-            </button>
-            <button v-if="listMode === 'list'" id="knowledge-base-edit" :title="$t('knowledgeBase.editKnowledgeBase')" class="top-tool-btn margin-r-10"  :disabled="disableEdit"
                     style="width:72px;"
                     @click="editSelectRecord">
               <i class="cn-icon-edit cn-icon" ></i>
@@ -37,22 +55,14 @@
               <i class="cn-icon-delete cn-icon"></i>
               <span>{{$t('overall.delete')}}</span>
             </button>
-            <div class="top-tool-search margin-l-10" style="">
+            <div class="top-tool-search margin-l-10" >
               <el-input v-model="keyWord"  size="small" @keyup.enter="onSearch"></el-input>
               <button class="top-tool-btn  top-tool-btn--search" style="border-radius: 0 2px 2px 0 !important;" @click="onSearch">
                 <i class="el-icon-search"></i>
               </button>
             </div>
           </div>
-          <div class="top-tools__right" >
-            <el-button-group size="mini">
-              <el-button size="mini" @click="modeChange('list')" :class="{'active': listMode === 'list'}"><i class="cn-icon cn-icon-list"></i></el-button>
-              <el-button size="mini" @click="modeChange('block')" :class="{'active': listMode === 'block'}"><i class="cn-icon cn-icon-blocks"></i></el-button>
-            </el-button-group>
         </div>
-        </div>
-        <!-- 列表式 -->
-        <template v-if="listMode === 'list'">
         <div class="list-mode__row" style="position:relative;">
           <loading :loading="loading"></loading>
           <knowledge-base-table-for-row
@@ -63,7 +73,6 @@
                   :custom-table-title="tools.customTableTitle"
                   :table-data="tableData"
                   :is-selected-status="isSelectedStatus"
-                    :all-count="18"
                   @delete="toDelete"
                   @selectionChange="selectionChange"
                   @edit="edit"
@@ -72,27 +81,7 @@
                   @toggleLoading="toggleLoading"
           ></knowledge-base-table-for-row>
         </div>
-        </template>
+        <div class="knowledge-pagination" >
-        <!-- 卡片式 -->
-        <template v-else-if="listMode === 'block'">
-          <div class="list-mode__card" style="position:relative;">
-            <loading :loading="loading"></loading>
-            <knowledge-base-table-for-card
-                    ref="dataTableCard"
-                    :api="url"
-                    :isNoData="isNoData"
-                    :custom-table-title="tools.customTableTitle"
-                    :table-data="tableData"
-                    :is-selected-status="isSelectedStatus"
-                    :all-count="18"
-                    @delete="toDelete"
-                    @checkboxStatusChange="checkboxStatusChange"
-                    @reload="reloadRowList"
-                    @toggleLoading="toggleLoading"
-            ></knowledge-base-table-for-card>
-          </div>
-        </template>
-        <div class="knowledge-pagination" style="">
           <pagination ref="pagination" :page-obj="pageObj" :table-id="tableId" @pageNo='pageNo' @pageSize='pageSize'></pagination>
         </div>
       </div>
@@ -111,20 +100,18 @@
               height="156px"
               width="100%"
               class="dialog-table"
-              :row-style="rowStyle"
               cell-style="padding:4px 0px;font-size: 12px;color: #353636;font-weight: 400;"
-              header-cell-style="padding:4px 0px;background: #F5F8FA;font-size: 12px;color: #353636;font-weight: 500;"
+              header-cell-style="padding:4px 0px;background: #F5F8FA;font-size: 12px;color: #353636;font-weight: 500;">
-              :header-row-style="tableHeaderRowStyle">
       <el-table-column
               :resizable="false"
               align="center"
               type="selection"
               width="50">
       </el-table-column>
-      <el-table-column property="knowledgeId" label="ID" width="50"></el-table-column>
+      <el-table-column property="knowledgeId" label="ID" width="150"></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="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-column property="source" label="Source" width="110" :formatter = "sourceFormat"></el-table-column> -->
     </el-table>
     <template #footer>
         <span class="dialog-footer">
@@ -139,17 +126,16 @@ import dataListMixin from '@/mixins/data-list'
 import KnowledgeBaseTableForCard from '@/components/table/setting/knowledgeBaseTableForCard'
 import KnowledgeBaseTableForRow from '@/components/table/setting/KnowledgeBaseTableForRow'
 import { api } from '@/utils/api'
+import { get } from '@/utils/http'
 import { urlParamsHandler, overwriteUrl } from '@/utils/tools'
-import { knowledgeBaseCategory, knowledgeBaseSource } from '@/utils/constants'
+import { knowledgeBaseCategory, knowledgeBaseSource, knowledgeCategoryValue } from '@/utils/constants'
 import axios from 'axios'
-import KnowledgeFilter from '@/views/setting/KnowledgeFilter'
 
 export default {
   name: 'knowledgeBase',
   components: {
     KnowledgeBaseTableForCard,
-    KnowledgeBaseTableForRow,
+    KnowledgeBaseTableForRow
-    KnowledgeFilter
   },
   mixins: [dataListMixin],
   data () {
@@ -165,7 +151,7 @@ export default {
       showConfirmDialog: false,
       delItemList: [],
       secondBatchDeleteObjs: [],
-      listMode: 'list' // 列表的模式，list|block
+      dataType: 'builtInList' // userDefinedList|builtInList
     }
   },
   watch: {
@@ -176,13 +162,15 @@ export default {
         ...this.filterParams,
         name: this.keyWord
       }
+      if (this.dataType === 'userDefinedList') {
+        params.category = knowledgeCategoryValue.userDefined
+      }
       this.clearList()
       this.search(params)
-      this.$refs.knowledgeFilter.reloadFilter(this.checkedCategoryIds, this.checkedStatusIds)
     },
     reloadRowList () {
+      this.searchLabel.category = knowledgeCategoryValue.userDefined
       this.getTableData()
-      this.$refs.knowledgeFilter.reloadFilter()
     },
     categoryFormat (row, column) {
       const category = row.category
@@ -257,11 +245,22 @@ export default {
           ids.push(item.knowledgeId)
         })
       }
+      let hasReference = false
+      let referenceKnowledge = null
+      this.batchDeleteObjs.forEach(item => {
+        if (item.reference && item.reference.length > 0) {
+          hasReference = true
+          referenceKnowledge = item
+        }
+      })
+
       if (ids.length === 0) {
         this.$alert(this.$t('tip.pleaseSelect'), {
           confirmButtonText: this.$t('tip.yes'),
           type: 'warning'
         }).catch(() => {})
+      } else if (hasReference) {
+        this.$message.error(this.$t('knowledgeBase.deleteReferenceObjects', { name: referenceKnowledge.name }))
       } else {
         this.toggleLoading(true)
         axios.delete(this.url + '?knowledgeIds=' + ids).then(response => {
@@ -271,11 +270,11 @@ export default {
             this.secondBatchDeleteObjs.forEach((item) => {
               this.$refs.delDataTable.toggleRowSelection(item, false)
             })
-            this.$refs.knowledgeFilter.reloadFilter()
             this.secondBatchDeleteObjs = []
             this.batchDeleteObjs = []
-            delete this.searchLabel.category
+            // delete this.searchLabel.category
             delete this.searchLabel.source
+            this.searchLabel.category = knowledgeCategoryValue.userDefined
             this.getTableData()
           } else {
             this.$message.error(response.data.message)
@@ -292,14 +291,6 @@ export default {
         })
       }
     },
-    tableHeaderRowStyle ({ row, rowIndex }) {
-      // if (rowIndex === 0) {
-      // return 'font-weight: 500;font-size: 14px;'
-      // }
-    },
-    rowStyle ({ row, rowIndex }) {
-      // return 'height:32px !important;'//font-size: 14px;color: #666666;font-weight: 400;
-    },
     submit () {
       this.delBatchKnowledge()
       this.showConfirmDialog = false
@@ -358,6 +349,16 @@ export default {
         this.jumpToEditPage(this.batchDeleteObjs[0].knowledgeId)
       }
     },
+    changeToUserDefinedList () {
+      this.dataType = 'userDefinedList'
+      this.$router.push({
+        path: '/knowledgeBase/userDefinedLibrary',
+        query: {
+          t: +new Date(),
+          dataType: 'userDefinedList'
+        }
+      })
+    },
     toDelete (data) {
       if (data && data.knowledgeId) {
         this.secondBatchDeleteObjs = []
@@ -372,12 +373,12 @@ export default {
       this.isSelectedStatus = false
       this.batchDeleteObjs = []
       this.secondBatchDeleteObjs = []
-      this.listMode = mode
+      this.dataType = mode
       if (this.$refs.dataTableCard) {
         this.$refs.dataTableCard.clearSelect()
       }
       const { query } = this.$route
-      const newUrl = urlParamsHandler(window.location.href, query, { listMode: mode })
+      const newUrl = urlParamsHandler(window.location.href, query, { dataType: mode })
       overwriteUrl(newUrl)
     },
     del (row) {
@@ -391,8 +392,9 @@ 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.category
             delete this.searchLabel.source
+            this.searchLabel.category = knowledgeCategoryValue.userDefined
             this.getTableData()
           } else {
             this.$message.error(response.data.message)
@@ -412,29 +414,64 @@ export default {
     jumpToEditPage (id) {
       const pageNo = this.$router.currentRoute.value.query.pageNo
       this.$router.push({
-        path: '/knowledgeBase/edit',
+        path: '/knowledgeBase/userDefinedLibrary/edit',
         query: {
           t: +new Date(),
           pageNoForTable: pageNo || 1,
           id: id,
-          listMode: this.listMode
+          dataType: this.dataType
         }
       })
     },
     jumpToCreatePage () {
       this.$router.push({
-        path: '/knowledgeBase/create',
+        path: '/knowledgeBase/userDefinedLibrary/create',
         query: {
           t: +new Date(),
-          listMode: this.listMode
+          dataType: this.dataType
         }
       })
+    },
+    getBuiltInData () {
+      this.isNoData = false
+      this.toggleLoading(true)
+      const params = {
+        category: knowledgeCategoryValue.aiTagging + ',' + knowledgeCategoryValue.webSketch,
+        pageSize: -1
+      }
+      get(this.listUrl, params).then(response => {
+        if (response.code === 200) {
+          this.tableData = response.data.list
+          if (!this.tableData || this.tableData.length === 0) {
+            this.isNoData = true
+          } else {
+            this.isNoData = false
+          }
+        } else {
+          console.error(response)
+          this.isNoData = true
+          if (response.message) {
+            this.$message.error(response.message)
+          } else {
+            this.$message.error(this.$t('tip.somethingWentWrong'))
+          }
+        }
+      }).catch(() => {
+        this.isNoData = true
+      }).finally(() => {
+        this.toggleLoading(false)
+      })
     }
   },
   mounted () {
-    const curMode = this.$router.currentRoute.value.query.listMode
+    const curMode = this.$router.currentRoute.value.query.dataType
-    this.listMode = curMode || 'list'
+    this.dataType = curMode || 'builtInList'
     this.filterParams = {}
+    if (this.dataType === 'builtInList') {
+      this.getBuiltInData()
+    } else if (this.dataType === 'userDefinedList') {
+      this.searchLabel.category = knowledgeCategoryValue.userDefined
+    }
   },
   computed: {
   }

src/views/setting/KnowledgeBaseForm.vue

@@ -136,7 +136,7 @@
                       <span v-else>{{ d.tagValue }}</span>
                     </td>
                     <td class="imported-data-msg" :title="d.msg">
-                      <i :class="d.isValid === 1 ? 'el-icon-success' : (d.isValid === 0 ? 'el-icon-error' : '')"></i>&nbsp;&nbsp;{{(d.isValid === 1 && (d.msg==='' || !d.msg) )? 'success': d.msg }}
+                      <i :class="d.isValid === 1 ? 'el-icon-success' : (d.isValid === 0 ? 'el-icon-error' : '')"></i>&nbsp;&nbsp;{{(d.isValid === 1 && (d.msg==='' || !d.msg) )? $t('overall.success'): d.msg }}
                     </td>
                     <!--返回和保存按钮:修改记录-->
                     <td v-if="backEditFlag && !addEditFlag && editIndex === i" class="imported-data-btn">
@@ -214,7 +214,7 @@
 import { useRoute } from 'vue-router'
 import { nextTick, reactive, ref } from 'vue'
 import _ from 'lodash'
-import { knowledgeBaseType, storageKey, unitTypes, knowledgeSourceValue, itemListHeight } from '@/utils/constants'
+import { knowledgeBaseType, storageKey, unitTypes, knowledgeSourceValue, itemListHeight, knowledgeCategoryValue } from '@/utils/constants'
 import Pagination from '@/components/common/Pagination'
 import ChartNoData from '@/views/charts/charts/ChartNoData'
 import axios from 'axios'
@@ -490,7 +490,7 @@ export default {
       isPreviewChange: false,
       isClick: false,
       pageNoForTable: 1,
-      listMode: 'list',
+      dataType: 'builtInList',
       status: 1,
       oldItemIds: [],
       oldTagItem: {}
@@ -545,6 +545,15 @@ export default {
         this.importedType = this.editObject.source
         const originalImportedData = _.cloneDeep(response.data.data)
         this.importedDataNoData = originalImportedData.length === 0
+        if (originalImportedData.length > 0) {
+          originalImportedData.forEach(data => {
+            if (data.isValid === 1) {
+              data.msg = this.$t('overall.success')
+            } else if (data.isValid === 0) {
+              data.msg = this.$t('validate.wrongFormat')
+            }
+          })
+        }
         this.originalImportInfo = {
           total: originalImportedData.length,
           succeeded: originalImportedData.filter(d => d.isValid === 1).length,
@@ -765,21 +774,21 @@ export default {
           customClass: 'del-model'
         }).then(() => {
           this.$router.push({
-            path: '/knowledgeBase',
+            path: '/knowledgeBase/userDefinedLibrary',
             query: {
               pageNo: self.pageNoForTable ? Number(self.pageNoForTable) : 1,
               t: +new Date(),
-              listMode: this.listMode
+              dataType: this.dataType
             }
           })
         }).catch(() => {})
       } else {
         this.$router.push({
-          path: '/knowledgeBase',
+          path: '/knowledgeBase/userDefinedLibrary',
           query: {
             pageNo: self.pageNoForTable ? Number(self.pageNoForTable) : 1,
             t: +new Date(),
-            listMode: this.listMode
+            dataType: this.dataType
           }
         })
       }
@@ -816,7 +825,7 @@ export default {
                     const userId = localStorage.getItem(storageKey.userId)
                     const postData = {
                       name: this.editObject.name,
-                      category: 'user_defined',
+                      category: knowledgeCategoryValue.userDefined,
                       source: this.editObject.source,
                       description: this.editObject.description,
                       status: this.editObject.status,
@@ -840,11 +849,11 @@ export default {
                             message: this.$t('tip.saveSuccess')
                           })
                           this.$router.push({
-                            path: '/knowledgeBase',
+                            path: '/knowledgeBase/userDefinedLibrary',
                             query: {
                               pageNo: self.pageNoForTable ? Number(self.pageNoForTable) : 1,
                               t: +new Date(),
-                              listMode: this.listMode
+                              dataType: this.dataType
                             }
                           })
                         } else {
@@ -869,11 +878,11 @@ export default {
                             message: this.$t('tip.saveSuccess')
                           })
                           this.$router.push({
-                            path: '/knowledgeBase',
+                            path: '/knowledgeBase/userDefinedLibrary',
                             query: {
                               pageNo: self.pageNoForTable ? Number(self.pageNoForTable) : 1,
                               t: +new Date(),
-                              listMode: this.listMode
+                              dataType: this.dataType
                             }
                           })
                         } else {
@@ -1095,7 +1104,7 @@ export default {
         if (valid) {
           this.editTagErrorTip = ''
           this.showImportedData[index].isValid = 1
-          this.showImportedData[index].msg = 'success'
+          this.showImportedData[index].msg = this.$t('overall.success')
         } else {
           this.showImportedData[index].isValid = 0
         }
@@ -1151,9 +1160,9 @@ export default {
   },
   mounted () {
     const pageNo = this.$router.currentRoute.value.query.pageNoForTable
-    const listMode = this.$router.currentRoute.value.query.listMode
+    const dataType = this.$router.currentRoute.value.query.dataType
     this.pageNoForTable = pageNo || 1
-    this.listMode = listMode || 'list'
+    this.dataType = dataType || 'builtInList'
     const div = document.getElementsByClassName('el-upload-dragger')[0]
     const self = this
     div.addEventListener('click', function (event) {
@@ -1192,11 +1201,11 @@ export default {
         console.error(e)
         this.$message.error(this.errorMsgHandler(e))
         this.$router.push({
-          path: '/knowledgeBase',
+          path: '/knowledgeBase/userDefinedLibrary',
           query: {
             pageNo: self.pageNoForTable ? Number(self.pageNoForTable) : 1,
             t: +new Date(),
-            listMode: this.listMode
+            dataType: this.dataType
           }
         })
       })