From 12bc39ff65fb69c3c34633d25684690c76283ffa Mon Sep 17 00:00:00 2001 From: wangdan-fit2cloud Date: Tue, 2 Dec 2025 14:21:32 +0800 Subject: [PATCH] fix: Fix import document router error --- ui/src/router/modules/knowledge.ts | 4 ++-- ui/src/views/document/ImportLarkDocument.vue | 11 +++++------ ui/src/views/document/ImportWorkflowDocument.vue | 13 +++++++++---- ui/src/views/document/UploadDocument.vue | 8 ++++++-- ui/src/views/document/index.vue | 8 ++++++-- 5 files changed, 28 insertions(+), 16 deletions(-) diff --git a/ui/src/router/modules/knowledge.ts b/ui/src/router/modules/knowledge.ts index 8234c22da..ab3e46dfc 100644 --- a/ui/src/router/modules/knowledge.ts +++ b/ui/src/router/modules/knowledge.ts @@ -35,7 +35,7 @@ const ModelRouter = { }, // 上传文档 - 飞书文档 { - path: '/knowledge/import/lark/:knowledgeId', + path: '/knowledge/import/lark/:folderId', name: 'ImportLarkDocument', meta: { activeMenu: '/knowledge' }, component: () => import('@/views/document/ImportLarkDocument.vue'), @@ -43,7 +43,7 @@ const ModelRouter = { }, // 上传文档 - 工作流 { - path: '/knowledge/import/workflow/:knowledgeId', + path: '/knowledge/import/workflow/:folderId', name: 'ImportWorkflowDocument', meta: { activeMenu: '/knowledge' }, component: () => import('@/views/document/ImportWorkflowDocument.vue'), diff --git a/ui/src/views/document/ImportLarkDocument.vue b/ui/src/views/document/ImportLarkDocument.vue index 45b6e0b34..d5f13142b 100644 --- a/ui/src/views/document/ImportLarkDocument.vue +++ b/ui/src/views/document/ImportLarkDocument.vue @@ -147,8 +147,8 @@ import { loadSharedApi } from '@/utils/dynamics-api/shared-api' const router = useRouter() const route = useRoute() const { - params: { knowledgeId }, - query: { folder_token }, // id为knowledgeID，有id的是上传文档 folder_token为飞书文件夹token + params: { folderId }, + query: { id, folder_token }, // id为knowledgeID，有id的是上传文档 folder_token为飞书文件夹token } = route const apiType = computed(() => { if (route.path.includes('shared')) { @@ -159,7 +159,6 @@ const apiType = computed(() => { return 'workspace' } }) -const folderToken = folder_token as string const loading = ref(false) const disabled = ref(false) @@ -193,9 +192,9 @@ const props = { } const loadNode = (node: Node, resolve: (nodeData: Tree[]) => void) => { - const token = node.level === 0 ? folderToken : node.data.token // 根节点使用 folder_token，其他节点使用 node.data.token + const token = node.level === 0 ? folder_token : node.data.token // 根节点使用 folder_token，其他节点使用 node.data.token loadSharedApi({ type: 'document', systemType: apiType.value }) - .getLarkDocumentList(knowledgeId, token, {}, loading) + .getLarkDocumentList(id, token, {}, loading) .then((res: any) => { const nodes = res.data.files as Tree[] resolve(nodes) @@ -246,7 +245,7 @@ function submit() { return } loadSharedApi({ type: 'document', systemType: apiType.value }) - .importLarkDocument(knowledgeId, newList, loading) + .importLarkDocument(id, newList, loading) .then(() => { MsgSuccess(t('views.document.tip.importMessage')) disabled.value = false diff --git a/ui/src/views/document/ImportWorkflowDocument.vue b/ui/src/views/document/ImportWorkflowDocument.vue index 55196b1c0..1896f3f78 100644 --- a/ui/src/views/document/ImportWorkflowDocument.vue +++ b/ui/src/views/document/ImportWorkflowDocument.vue @@ -59,12 +59,17 @@ import KnowledgeBase from '@/views/knowledge-workflow/component/action/Knowledge import { loadSharedApi } from '@/utils/dynamics-api/shared-api.ts' import { WorkflowType } from '@/enums/application' provide('upload', (file: any, loading?: Ref) => { - return applicationApi.postUploadFile(file, knowledgeId as string, 'KNOWLEDGE', loading) + return applicationApi.postUploadFile(file, id as string, 'KNOWLEDGE', loading) }) const router = useRouter() const route = useRoute() const { - params: { knowledgeId }, + params: { folderId }, + query: { id }, + /* + id为knowledgeID + folderId 可以区分 resource-management shared还是 workspace + */ } = route const apiType = computed(() => { if (route.path.includes('shared')) { @@ -111,7 +116,7 @@ const upload = () => { ActionRef.value.validate().then(() => { form_data.value[active.value] = ActionRef.value.get_data() loadSharedApi({ type: 'knowledge', systemType: apiType.value }) - .workflowUpload(knowledgeId, form_data.value, loading) + .workflowUpload(id, form_data.value, loading) .then((ok: any) => { router.go(-1) }) @@ -119,7 +124,7 @@ const upload = () => { } function getDetail() { loadSharedApi({ type: 'knowledge', systemType: apiType.value }) - .getKnowledgeDetail(knowledgeId, loading) + .getKnowledgeDetail(id, loading) .then((res: any) => { _workflow.value = res.data.work_flow }) diff --git a/ui/src/views/document/UploadDocument.vue b/ui/src/views/document/UploadDocument.vue index 8f95d345c..b8f19c458 100644 --- a/ui/src/views/document/UploadDocument.vue +++ b/ui/src/views/document/UploadDocument.vue @@ -71,8 +71,12 @@ const documentsType = computed(() => knowledge.documentsType) const router = useRouter() const route = useRoute() const { - params: { folderId, type }, // type为知识库类型的类型 - query: { id }, // id为knowledgeID，有id的是上传文档 + params: { folderId, type }, + query: { id }, + /* + id为knowledgeID，有id的是上传文档; type为知识库类型的类型 + folderId 可以区分 resource-management shared还是 workspace + */ } = route const apiType = computed(() => { diff --git a/ui/src/views/document/index.vue b/ui/src/views/document/index.vue index 18beaae8d..7c649fb52 100644 --- a/ui/src/views/document/index.vue +++ b/ui/src/views/document/index.vue @@ -29,8 +29,9 @@ type="primary" @click=" router.push({ - path: `/knowledge/import/lark/${id}`, + path: `/knowledge/import/lark/${folderId}`, query: { + id: id, folder_token: knowledgeDetail?.meta.folder_token, }, }) @@ -42,7 +43,10 @@ type="primary" @click=" router.push({ - path: `/knowledge/import/workflow/${id}`, + path: `/knowledge/import/workflow/${folderId}`, + query: { + id: id, + }, }) " >{{ $t('views.document.importDocument') }}