From 37c9ef30871feaf114b5696325141d5904c1ddbe Mon Sep 17 00:00:00 2001 From: wangdan-fit2cloud Date: Thu, 19 Jun 2025 18:39:52 +0800 Subject: [PATCH] fix: document --- ui/src/layout/components/breadcrumb/index.vue | 2 +- .../modules-resource-management/knowledge.ts | 2 +- .../stores/modules-shared-system/knowledge.ts | 2 +- ui/src/stores/modules/knowledge.ts | 84 +++++++++---------- .../views/application/ApplicationSetting.vue | 2 +- .../component/AddKnowledgeDialog.vue | 12 ++- .../component/SelectKnowledgeDialog.vue | 58 +++++++------ .../component/SelectDocumentDialog.vue | 2 +- .../component/SelectKnowledgeDialog.vue | 2 +- .../component/SelectDocumentDialog.vue | 2 +- .../component/SelectDocumentDialog.vue | 2 +- .../nodes/search-knowledge-node/index.vue | 2 +- 12 files changed, 91 insertions(+), 81 deletions(-) diff --git a/ui/src/layout/components/breadcrumb/index.vue b/ui/src/layout/components/breadcrumb/index.vue index baec9483d..e1f8cbfe8 100644 --- a/ui/src/layout/components/breadcrumb/index.vue +++ b/ui/src/layout/components/breadcrumb/index.vue @@ -165,7 +165,7 @@ function changeMenu(id: string) { function getKnowledge() { loading.value = true knowledge - .asyncGetRootKnowledge() + .asyncGetFolderKnowledge() .then((res: any) => { list.value = res.data common.saveBreadcrumb(list.value) diff --git a/ui/src/stores/modules-resource-management/knowledge.ts b/ui/src/stores/modules-resource-management/knowledge.ts index 17825f919..26c630643 100644 --- a/ui/src/stores/modules-resource-management/knowledge.ts +++ b/ui/src/stores/modules-resource-management/knowledge.ts @@ -31,7 +31,7 @@ const useKnowledgeStore = defineStore('knowled', { saveDocumentsFile(file: UploadUserFile[]) { this.documentsFiles = file }, - async asyncGetRootKnowledge(loading?: Ref) { + async asyncGetFolderKnowledge(loading?: Ref) { return new Promise((resolve, reject) => { const params = { folder_id: localStorage.getItem('workspace_id'), diff --git a/ui/src/stores/modules-shared-system/knowledge.ts b/ui/src/stores/modules-shared-system/knowledge.ts index 312ae52a7..0fac3120a 100644 --- a/ui/src/stores/modules-shared-system/knowledge.ts +++ b/ui/src/stores/modules-shared-system/knowledge.ts @@ -31,7 +31,7 @@ const useKnowledgeStore = defineStore('knowledg', { saveDocumentsFile(file: UploadUserFile[]) { this.documentsFiles = file }, - async asyncGetRootKnowledge(loading?: Ref) { + async asyncGetFolderKnowledge(loading?: Ref) { return new Promise((resolve, reject) => { const params = { folder_id: 'default', diff --git a/ui/src/stores/modules/knowledge.ts b/ui/src/stores/modules/knowledge.ts index a5129eb3f..c9bfd1b4b 100644 --- a/ui/src/stores/modules/knowledge.ts +++ b/ui/src/stores/modules/knowledge.ts @@ -32,10 +32,10 @@ const useKnowledgeStore = defineStore('knowledge', { saveDocumentsFile(file: UploadUserFile[]) { this.documentsFiles = file }, - async asyncGetRootKnowledge(loading?: Ref) { + async asyncGetFolderKnowledge(folder_id?: string, loading?: Ref) { return new Promise((resolve, reject) => { const params = { - folder_id: localStorage.getItem('workspace_id'), + folder_id: folder_id || localStorage.getItem('workspace_id'), } knowledgeApi .getKnowledgeList(params, loading) @@ -47,46 +47,46 @@ const useKnowledgeStore = defineStore('knowledge', { }) }) }, - async asyncGetTreeRootKnowledge(loading?: Ref) { - const folder = useFolderStore() - return Promise.all([ - folder.asyncGetFolder('KNOWLEDGE', {}, loading), - this.asyncGetRootKnowledge(loading), - ]) - .then((res: any) => { - const folderList = res[0].data - const knowledgeList = res[1].data - const arrMap: any = {} - function buildIdMap(arr: any) { - arr.forEach((item: any) => { - arrMap[item.id] = item - // 递归处理子节点 - if (item.children && item.children.length > 0) { - buildIdMap(item.children) - } - }) - } - buildIdMap(folderList) - knowledgeList - .filter((v: any) => v.resource_type !== 'folder') - .forEach((item: any) => { - const targetFolder = arrMap[item.folder_id] - if (targetFolder) { - // 检查是否已有相同ID的子节点(避免重复插入) - const existingChild = targetFolder.children.find( - (child: any) => child.id === item.id, - ) - if (!existingChild) { - targetFolder.children.push(item) - } - } - }) - return Promise.resolve(folderList) - }) - .catch((error) => { - return Promise.reject(error) - }) - }, + // async asyncGetTreeRootKnowledge(loading?: Ref) { + // const folder = useFolderStore() + // return Promise.all([ + // folder.asyncGetFolder('KNOWLEDGE', {}, loading), + // this.asyncGetFolderKnowledge(loading), + // ]) + // .then((res: any) => { + // const folderList = res[0].data + // const knowledgeList = res[1].data + // const arrMap: any = {} + // function buildIdMap(arr: any) { + // arr.forEach((item: any) => { + // arrMap[item.id] = item + // // 递归处理子节点 + // if (item.children && item.children.length > 0) { + // buildIdMap(item.children) + // } + // }) + // } + // buildIdMap(folderList) + // knowledgeList + // .filter((v: any) => v.resource_type !== 'folder') + // .forEach((item: any) => { + // const targetFolder = arrMap[item.folder_id] + // if (targetFolder) { + // // 检查是否已有相同ID的子节点(避免重复插入) + // const existingChild = targetFolder.children.find( + // (child: any) => child.id === item.id, + // ) + // if (!existingChild) { + // targetFolder.children.push(item) + // } + // } + // }) + // return Promise.resolve(folderList) + // }) + // .catch((error) => { + // return Promise.reject(error) + // }) + // }, async asyncGetKnowledgeDetail(knowledge_id: string, loading?: Ref) { return new Promise((resolve, reject) => { knowledgeApi diff --git a/ui/src/views/application/ApplicationSetting.vue b/ui/src/views/application/ApplicationSetting.vue index cd4925f4e..8adc5291c 100644 --- a/ui/src/views/application/ApplicationSetting.vue +++ b/ui/src/views/application/ApplicationSetting.vue @@ -633,7 +633,7 @@ function getDetail() { } function getKnowledge() { - knowledge.asyncGetRootKnowledge(knowledgeLoading).then((res: any) => { + knowledge.asyncGetFolderKnowledge(knowledgeLoading).then((res: any) => { knowledgeList.value = res.data }) } diff --git a/ui/src/views/application/component/AddKnowledgeDialog.vue b/ui/src/views/application/component/AddKnowledgeDialog.vue index 71a2e6319..3c319ef81 100644 --- a/ui/src/views/application/component/AddKnowledgeDialog.vue +++ b/ui/src/views/application/component/AddKnowledgeDialog.vue @@ -49,13 +49,17 @@
- + {{ item.name }} @@ -100,7 +104,7 @@ const props = defineProps({ }) const emit = defineEmits(['addData', 'refresh']) -const { folder, user } = useStore() +const { folder, user,knowledge } = useStore() const dialogVisible = ref(false) const checkList = ref([]) @@ -191,7 +195,7 @@ function getList() { const params = { folder_id: currentFolder.value?.id || user.getWorkspaceId(), } - KnowledgeApi.getKnowledgeList(params, loading).then((res) => { + knowledge.asyncGetFolderKnowledge(params, loading).then((res) => { searchDate.value = res.data }) } diff --git a/ui/src/views/document/component/SelectKnowledgeDialog.vue b/ui/src/views/document/component/SelectKnowledgeDialog.vue index e587a1f0c..f42d996a2 100644 --- a/ui/src/views/document/component/SelectKnowledgeDialog.vue +++ b/ui/src/views/document/component/SelectKnowledgeDialog.vue @@ -11,23 +11,28 @@

{{ '文档迁移到' }}