feat: folder

ui/src/components/folder-tree/CreateFolderDialog.vue

@@ -41,7 +41,7 @@
           {{ $t('common.cancel') }}
         </el-button>
         <el-button type="primary" @click="submitHandle" :loading="loading">
-          {{ $t('common.add') }}
+          {{ isEdit ? $t('common.confirm') : $t('common.add') }}
         </el-button>
       </span>
     </template>
@@ -67,6 +67,7 @@ const loading = ref(false)
 const dialogVisible = ref<boolean>(false)
 const sourceType = ref<any>('')
 const isEdit = ref<boolean>(false)
+const editId = ref<string>('')
 
 const folderForm = ref<any>({
   name: '',
@@ -98,11 +99,16 @@ watch(dialogVisible, (bool) => {
 
 const open = (source: string, id: string, data?: any) => {
   sourceType.value = source
-  folderForm.value.parent_id = id
   if (data) {
+    //  编辑当前id
+    editId.value = data.id
     folderForm.value.name = data.name
     folderForm.value.desc = data.desc
+    folderForm.value.parent_id = data.parent_id
     isEdit.value = true
+  } else {
+    //  给当前id添加子id
+    folderForm.value.parent_id = id
   }
   dialogVisible.value = true
 }
@@ -111,7 +117,9 @@ const submitHandle = async () => {
   await FolderFormRef.value.validate((valid: any) => {
     if (valid) {
       if (isEdit.value) {
-        folderApi.putFolder(sourceType.value, folderForm.value, loading).then((res) => {
+        folderApi
+          .putFolder(editId.value, sourceType.value, folderForm.value, loading)
+          .then((res) => {
             MsgSuccess(t('common.editSuccess'))
             emit('refresh')
             dialogVisible.value = false

ui/src/components/folder-tree/index.vue

@@ -27,6 +27,7 @@
       highlight-current
       class="overflow-inherit_node__children"
       node-key="id"
+      v-loading="loading"
     >
       <template #default="{ node, data }">
         <div class="flex-between w-full" @mouseenter.stop="handleMouseEnter(data)">
@@ -36,6 +37,7 @@
           </div>
 
           <div
+            v-if="canOperation"
             @click.stop
             v-show="hoverNodeId === data.id"
             @mouseenter.stop="handleMouseEnter(data)"
@@ -103,6 +105,10 @@ const props = defineProps({
     type: String,
     default: 'views.system.share_knowledge',
   },
+  canOperation: {
+    type: Boolean,
+    default: true,
+  },
 })
 interface Tree {
   name: string
@@ -122,11 +128,12 @@ const treeRef = ref<TreeInstance>()
 const filterText = ref('')
 const hoverNodeId = ref<string | undefined>('')
 const title = ref('')
+const loading = ref(false)
 
 watch(filterText, (val) => {
   treeRef.value!.filter(val)
 })
-let time
+let time: any
 
 function handleMouseEnter(data: Tree) {
   clearTimeout(time)
@@ -153,7 +160,7 @@ const handleSharedNodeClick = () => {
 }
 
 function deleteFolder(row: Tree) {
-  folderApi.delFolder(row.id as string, props.source).then(() => {
+  folderApi.delFolder(row.id as string, props.source, loading).then(() => {
     emit('refreshTree')
   })
 }

ui/src/components/infinite-scroll/index.vue

@@ -2,11 +2,11 @@
   <div v-infinite-scroll="loadData" :infinite-scroll-disabled="disabledScroll">
     <slot />
   </div>
-  <div style="padding: 16px 10px">
+  <div style="padding: 0 10px 16px">
-    <el-divider v-if="size > 0 && loading">
+    <el-divider v-if="size > 0 && loading" style="background: none">
       <el-text type="info"> {{ $t('components.loading') }}...</el-text>
     </el-divider>
-    <el-divider v-if="noMore">
+    <el-divider v-if="noMore" style="background: none !important">
       <el-text type="info"> {{ $t('components.noMore') }}</el-text>
     </el-divider>
   </div>
@@ -21,27 +21,27 @@ const props = defineProps({
    */
   size: {
     type: Number,
-    default: 0
+    default: 0,
   },
   /**
    * 总数
    */
   total: {
     type: Number,
-    default: 0
+    default: 0,
   },
   /**
    * 总数
    */
   page_size: {
     type: Number,
-    default: 0
+    default: 0,
   },
   current_page: {
     type: Number,
-    default: 0
+    default: 0,
   },
-  loading: Boolean
+  loading: Boolean,
 })
 
 const emit = defineEmits(['update:current_page', 'load'])
@@ -53,12 +53,12 @@ watch(
     if (val === 1) {
       current.value = 1
     }
-  }
+  },
 )
 
 const noMore = computed(
   () =>
-    props.size > 0 && props.size === props.total && props.total > props.page_size && !props.loading
+    props.size > 0 && props.size === props.total && props.total > props.page_size && !props.loading,
 )
 const disabledScroll = computed(() => props.size > 0 && (props.loading || noMore.value))
 

ui/src/components/layout-container/ContentContainer.vue

@@ -11,10 +11,11 @@
         <slot name="search"> </slot>
       </div>
     </div>
-
+    <el-scrollbar>
       <div class="content-container__main p-16">
         <slot></slot>
       </div>
+    </el-scrollbar>
   </div>
 </template>
 

ui/src/styles/element-plus.scss

@@ -241,3 +241,7 @@
 .el-form--label-top .el-form-item .el-form-item__label {
   padding-right: 0;
 }
+
+.el-divider__text {
+  background: var(--app-layout-bg-color);
+}

ui/src/views/application/component/AddKnowledgeDialog.vue

@@ -43,6 +43,7 @@
           @handleNodeClick="folderClickHandel"
           class="p-8"
           v-loading="folderLoading"
+          :canOperation="false"
         />
       </template>
       <el-scrollbar>

ui/src/views/application/index.vue

@@ -7,6 +7,7 @@
         :data="folderList"
         :currentNodeKey="currentFolder?.id"
         @handleNodeClick="folderClickHandel"
+        @refreshTree="refreshFolder"
         class="p-8"
       />
     </template>
@@ -129,7 +130,10 @@
           </el-dropdown>
         </div>
       </template>
-      <div v-loading.fullscreen.lock="paginationConfig.current_page === 1 && loading">
+      <div
+        v-loading.fullscreen.lock="paginationConfig.current_page === 1 && loading"
+        style="max-height: calc(100vh - 140px)"
+      >
         <InfiniteScroll
           :size="applicationList.length"
           :total="paginationConfig.total"
@@ -367,21 +371,6 @@ function getList() {
   })
 }
 
-function getFolder() {
-  const params = {}
-  folder.asyncGetFolder(FolderSource.APPLICATION, params, loading).then((res: any) => {
-    folderList.value = res.data
-    currentFolder.value = res.data?.[0] || {}
-    getList()
-  })
-}
-
-function folderClickHandel(row: any) {
-  currentFolder.value = row
-  applicationList.value = []
-  getList()
-}
-
 function clickFolder(item: any) {
   currentFolder.value.id = item.id
   applicationList.value = []
@@ -482,15 +471,6 @@ const exportApplication = (application: any) => {
   })
 }
 
-const CreateFolderDialogRef = ref()
-function openCreateFolder() {
-  CreateFolderDialogRef.value.open(FolderSource.APPLICATION, currentFolder.value.parent_id)
-}
-function refreshFolder() {
-  applicationList.value = []
-  getFolder()
-  getList()
-}
 const elUploadRef = ref()
 const importApplication = (file: any) => {
   const formData = new FormData()
@@ -515,8 +495,34 @@ const importApplication = (file: any) => {
     })
 }
 
-onMounted(() => {
+// 文件夹相关
+const CreateFolderDialogRef = ref()
+function openCreateFolder() {
+  CreateFolderDialogRef.value.open(FolderSource.APPLICATION, currentFolder.value.id)
+}
+
+function getFolder(bool?: boolean) {
+  const params = {}
+  folder.asyncGetFolder(FolderSource.APPLICATION, params, loading).then((res: any) => {
+    folderList.value = res.data
+    if (bool) {
+      // 初始化刷新
+      currentFolder.value = res.data?.[0] || {}
+    }
+    getList()
+  })
+}
+function folderClickHandel(row: any) {
+  currentFolder.value = row
+  applicationList.value = []
+  getList()
+}
+function refreshFolder() {
+  applicationList.value = []
   getFolder()
+}
+onMounted(() => {
+  getFolder(true)
 })
 </script>
 

ui/src/views/chat-log/component/ChatRecordDrawer.vue

@@ -61,14 +61,14 @@ const props = withDefaults(
 
     next_disable: boolean
   }>(),
-  {}
+  {},
 )
 
 const emit = defineEmits(['update:chatId', 'update:currentAbstract', 'refresh'])
 
 const route = useRoute()
 const {
-  params: { id }
+  params: { id },
 } = route
 const loading = ref(false)
 const visible = ref(false)
@@ -77,7 +77,7 @@ const recordList = ref<chatType[]>([])
 const paginationConfig = reactive({
   current_page: 1,
   page_size: 20,
-  total: 0
+  total: 0,
 })
 
 function closeHandle() {
@@ -93,7 +93,7 @@ function getChatRecord() {
       paginationConfig.total = res.data.total
       const list = res.data.records
       recordList.value = [...list, ...recordList.value].sort((a, b) =>
-        a.create_time.localeCompare(b.create_time)
+        a.create_time.localeCompare(b.create_time),
       )
       if (paginationConfig.current_page === 1) {
         nextTick(() => {
@@ -113,7 +113,7 @@ watch(
     if (props.chatId) {
       getChatRecord()
     }
-  }
+  },
 )
 
 watch(visible, (bool) => {
@@ -143,7 +143,7 @@ const open = () => {
 }
 
 defineExpose({
-  open
+  open,
 })
 </script>
 <style lang="scss">
@@ -158,9 +158,5 @@ defineExpose({
     background: var(--app-layout-bg-color);
     padding: 0;
   }
-
-  :deep(.el-divider__text) {
-    background: var(--app-layout-bg-color);
-  }
 }
 </style>

ui/src/views/knowledge/index.vue

@@ -146,7 +146,11 @@
           </el-dropdown>
         </div>
       </template>
-      <div v-loading.fullscreen.lock="paginationConfig.current_page === 1 && loading">
+
+      <div
+        v-loading.fullscreen.lock="paginationConfig.current_page === 1 && loading"
+        style="max-height: calc(100vh - 140px)"
+      >
         <InfiniteScroll
           :size="knowledgeList.length"
           :total="paginationConfig.total"
@@ -456,34 +460,12 @@ function getList() {
   })
 }
 
-function getFolder() {
-  const params = {}
-  folder.asyncGetFolder(FolderSource.KNOWLEDGE, params, loading).then((res: any) => {
-    folderList.value = res.data
-    currentFolder.value = res.data?.[0] || {}
-    getList()
-  })
-}
-
-function folderClickHandel(row: any) {
-  currentFolder.value = row
-  knowledgeList.value = []
-  if (currentFolder.value.id === 'share') return
-  getList()
-}
-
 function clickFolder(item: any) {
   currentFolder.value.id = item.id
   knowledgeList.value = []
   getList()
 }
 
-const CreateFolderDialogRef = ref()
-
-function openCreateFolder() {
-  CreateFolderDialogRef.value.open(FolderSource.KNOWLEDGE, currentFolder.value.parent_id)
-}
-
 const GenerateRelatedDialogRef = ref<InstanceType<typeof GenerateRelatedDialog>>()
 function openGenerateDialog(row: any) {
   if (GenerateRelatedDialogRef.value) {
@@ -521,14 +503,36 @@ function deleteKnowledge(row: any) {
     .catch(() => {})
 }
 
+// 文件夹相关
+const CreateFolderDialogRef = ref()
+function openCreateFolder() {
+  CreateFolderDialogRef.value.open(FolderSource.KNOWLEDGE, currentFolder.value.id)
+}
+function getFolder(bool?: boolean) {
+  const params = {}
+  folder.asyncGetFolder(FolderSource.KNOWLEDGE, params, loading).then((res: any) => {
+    folderList.value = res.data
+    if (bool) {
+      // 初始化刷新
+      currentFolder.value = res.data?.[0] || {}
+    }
+    getList()
+  })
+}
+function folderClickHandel(row: any) {
+  currentFolder.value = row
+  knowledgeList.value = []
+  if (currentFolder.value.id === 'share') return
+  getList()
+}
 function refreshFolder() {
+  console.log(currentFolder.value)
   knowledgeList.value = []
   getFolder()
-  getList()
 }
 
 onMounted(() => {
-  getFolder()
+  getFolder(true)
 })
 </script>
 

ui/src/views/resource-management/knowledge/index.vue

@@ -324,7 +324,7 @@ function clickFolder(item: any) {
 const CreateFolderDialogRef = ref()
 
 function openCreateFolder() {
-  CreateFolderDialogRef.value.open('KNOWLEDGE', currentFolder.value.parent_id)
+  CreateFolderDialogRef.value.open('KNOWLEDGE', currentFolder.value.id)
 }
 
 const GenerateRelatedDialogRef = ref<InstanceType<typeof GenerateRelatedDialog>>()

ui/src/views/resource-management/tool/index.vue

@@ -426,7 +426,7 @@ function configInitParams(item: any) {
 
 const CreateFolderDialogRef = ref()
 function openCreateFolder() {
-  CreateFolderDialogRef.value.open('TOOL', currentFolder.value.parent_id)
+  CreateFolderDialogRef.value.open('TOOL', currentFolder.value.id)
 }
 
 const elUploadRef = ref()

ui/src/views/shared/knowledge-shared/SharedWorkspace.vue

@@ -242,7 +242,7 @@ function folderClickHandel(row: any) {
 const CreateFolderDialogRef = ref()
 
 function openCreateFolder() {
-  CreateFolderDialogRef.value.open('KNOWLEDGE', currentFolder.value.parent_id)
+  CreateFolderDialogRef.value.open('KNOWLEDGE', currentFolder.value.id)
 }
 
 const GenerateRelatedDialogRef = ref<InstanceType<typeof GenerateRelatedDialog>>()

ui/src/views/shared/knowledge-shared/index.vue

@@ -386,7 +386,7 @@ function folderClickHandel(row: any) {
 const CreateFolderDialogRef = ref()
 
 function openCreateFolder() {
-  CreateFolderDialogRef.value.open('KNOWLEDGE', currentFolder.value.parent_id)
+  CreateFolderDialogRef.value.open('KNOWLEDGE', currentFolder.value.id)
 }
 
 const GenerateRelatedDialogRef = ref<InstanceType<typeof GenerateRelatedDialog>>()

ui/src/views/tool/index.vue

@@ -7,6 +7,7 @@
         :data="folderList"
         :currentNodeKey="currentFolder?.id"
         @handleNodeClick="folderClickHandel"
+        @refreshTree ="refreshFolder"
         shareTitle="views.system.share_tool"
         isShared
         class="p-8"
@@ -109,7 +110,18 @@
         </div>
       </template>
 
-      <div>
+      <div
+        v-loading.fullscreen.lock="paginationConfig.current_page === 1 && loading"
+        style="max-height: calc(100vh - 140px)"
+      >
+        <InfiniteScroll
+          :size="toolList.length"
+          :total="paginationConfig.total"
+          :page_size="paginationConfig.page_size"
+          v-model:current_page="paginationConfig.current_page"
+          @load="getList"
+          :loading="loading"
+        >
           <el-row v-if="toolList.length > 0" :gutter="15">
             <template v-for="(item, index) in toolList" :key="index">
               <el-col
@@ -286,6 +298,7 @@
             </template>
           </el-row>
           <el-empty :description="$t('common.noData')" v-else />
+        </InfiniteScroll>
       </div>
     </ContentContainer>
     <InitParamDrawer ref="InitParamDrawerRef" @refresh="refresh" />
@@ -373,15 +386,11 @@ function getList() {
   })
 }
 
-function getFolder() {
+function clickFolder(item: any) {
-  const params = {}
+  currentFolder.value.id = item.id
-  folder.asyncGetFolder(FolderSource.TOOL, params, loading).then((res: any) => {
+  toolList.value = []
-    folderList.value = res.data
-    currentFolder.value = res.data?.[0] || {}
   getList()
-  })
 }
-
 async function changeState(row: any) {
   if (row.is_active) {
     MsgConfirm(
@@ -444,24 +453,6 @@ function refresh(data: any) {
   getList()
 }
 
-function refreshFolder() {
-  toolList.value = []
-  getFolder()
-  getList()
-}
-
-function folderClickHandel(row: any) {
-  currentFolder.value = row
-  toolList.value = []
-  getList()
-}
-
-function clickFolder(item: any) {
-  currentFolder.value.id = item.id
-  toolList.value = []
-  getList()
-}
-
 function copyTool(row: any) {
   ToolDrawertitle.value = t('views.tool.copyTool')
   const obj = cloneDeep(row)
@@ -506,11 +497,6 @@ function configInitParams(item: any) {
   })
 }
 
-const CreateFolderDialogRef = ref()
-function openCreateFolder() {
-  CreateFolderDialogRef.value.open(FolderSource.TOOL, currentFolder.value.parent_id)
-}
-
 const elUploadRef = ref()
 function importTool(file: any) {
   const formData = new FormData()
@@ -535,8 +521,36 @@ function importTool(file: any) {
     })
 }
 
-onMounted(() => {
+// 文件夹相关
+const CreateFolderDialogRef = ref()
+function openCreateFolder() {
+  CreateFolderDialogRef.value.open(FolderSource.TOOL, currentFolder.value.id)
+}
+function getFolder(bool?: boolean) {
+  const params = {}
+  folder.asyncGetFolder(FolderSource.TOOL, params, loading).then((res: any) => {
+    folderList.value = res.data
+    if (bool) {
+      // 初始化刷新
+      currentFolder.value = res.data?.[0] || {}
+    }
+    getList()
+  })
+}
+function refreshFolder() {
+  toolList.value = []
   getFolder()
+}
+
+function folderClickHandel(row: any) {
+  currentFolder.value = row
+  toolList.value = []
+  getList()
+}
+
+
+onMounted(() => {
+  getFolder(true)
 })
 </script>