Skip to content

Commit 12bc39f

Browse files
fix: Fix import document router error
1 parent 848b48b commit 12bc39f

File tree

5 files changed

+28
-16
lines changed

5 files changed

+28
-16
lines changed

ui/src/router/modules/knowledge.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ const ModelRouter = {
3535
},
3636
// 上传文档 - 飞书文档
3737
{
38-
path: '/knowledge/import/lark/:knowledgeId',
38+
path: '/knowledge/import/lark/:folderId',
3939
name: 'ImportLarkDocument',
4040
meta: { activeMenu: '/knowledge' },
4141
component: () => import('@/views/document/ImportLarkDocument.vue'),
4242
hidden: true,
4343
},
4444
// 上传文档 - 工作流
4545
{
46-
path: '/knowledge/import/workflow/:knowledgeId',
46+
path: '/knowledge/import/workflow/:folderId',
4747
name: 'ImportWorkflowDocument',
4848
meta: { activeMenu: '/knowledge' },
4949
component: () => import('@/views/document/ImportWorkflowDocument.vue'),

ui/src/views/document/ImportLarkDocument.vue

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ import { loadSharedApi } from '@/utils/dynamics-api/shared-api'
147147
const router = useRouter()
148148
const route = useRoute()
149149
const {
150-
params: { knowledgeId },
151-
query: { folder_token }, // id为knowledgeID,有id的是上传文档 folder_token为飞书文件夹token
150+
params: { folderId },
151+
query: { id, folder_token }, // id为knowledgeID,有id的是上传文档 folder_token为飞书文件夹token
152152
} = route
153153
const apiType = computed(() => {
154154
if (route.path.includes('shared')) {
@@ -159,7 +159,6 @@ const apiType = computed(() => {
159159
return 'workspace'
160160
}
161161
})
162-
const folderToken = folder_token as string
163162
164163
const loading = ref(false)
165164
const disabled = ref(false)
@@ -193,9 +192,9 @@ const props = {
193192
}
194193
195194
const loadNode = (node: Node, resolve: (nodeData: Tree[]) => void) => {
196-
const token = node.level === 0 ? folderToken : node.data.token // 根节点使用 folder_token,其他节点使用 node.data.token
195+
const token = node.level === 0 ? folder_token : node.data.token // 根节点使用 folder_token,其他节点使用 node.data.token
197196
loadSharedApi({ type: 'document', systemType: apiType.value })
198-
.getLarkDocumentList(knowledgeId, token, {}, loading)
197+
.getLarkDocumentList(id, token, {}, loading)
199198
.then((res: any) => {
200199
const nodes = res.data.files as Tree[]
201200
resolve(nodes)
@@ -246,7 +245,7 @@ function submit() {
246245
return
247246
}
248247
loadSharedApi({ type: 'document', systemType: apiType.value })
249-
.importLarkDocument(knowledgeId, newList, loading)
248+
.importLarkDocument(id, newList, loading)
250249
.then(() => {
251250
MsgSuccess(t('views.document.tip.importMessage'))
252251
disabled.value = false

ui/src/views/document/ImportWorkflowDocument.vue

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,17 @@ import KnowledgeBase from '@/views/knowledge-workflow/component/action/Knowledge
5959
import { loadSharedApi } from '@/utils/dynamics-api/shared-api.ts'
6060
import { WorkflowType } from '@/enums/application'
6161
provide('upload', (file: any, loading?: Ref<boolean>) => {
62-
return applicationApi.postUploadFile(file, knowledgeId as string, 'KNOWLEDGE', loading)
62+
return applicationApi.postUploadFile(file, id as string, 'KNOWLEDGE', loading)
6363
})
6464
const router = useRouter()
6565
const route = useRoute()
6666
const {
67-
params: { knowledgeId },
67+
params: { folderId },
68+
query: { id },
69+
/*
70+
id为knowledgeID
71+
folderId 可以区分 resource-management shared还是 workspace
72+
*/
6873
} = route
6974
const apiType = computed(() => {
7075
if (route.path.includes('shared')) {
@@ -111,15 +116,15 @@ const upload = () => {
111116
ActionRef.value.validate().then(() => {
112117
form_data.value[active.value] = ActionRef.value.get_data()
113118
loadSharedApi({ type: 'knowledge', systemType: apiType.value })
114-
.workflowUpload(knowledgeId, form_data.value, loading)
119+
.workflowUpload(id, form_data.value, loading)
115120
.then((ok: any) => {
116121
router.go(-1)
117122
})
118123
})
119124
}
120125
function getDetail() {
121126
loadSharedApi({ type: 'knowledge', systemType: apiType.value })
122-
.getKnowledgeDetail(knowledgeId, loading)
127+
.getKnowledgeDetail(id, loading)
123128
.then((res: any) => {
124129
_workflow.value = res.data.work_flow
125130
})

ui/src/views/document/UploadDocument.vue

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,12 @@ const documentsType = computed(() => knowledge.documentsType)
7171
const router = useRouter()
7272
const route = useRoute()
7373
const {
74-
params: { folderId, type }, // type为知识库类型的类型
75-
query: { id }, // id为knowledgeID,有id的是上传文档
74+
params: { folderId, type },
75+
query: { id },
76+
/*
77+
id为knowledgeID,有id的是上传文档; type为知识库类型的类型
78+
folderId 可以区分 resource-management shared还是 workspace
79+
*/
7680
} = route
7781
7882
const apiType = computed(() => {

ui/src/views/document/index.vue

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@
2929
type="primary"
3030
@click="
3131
router.push({
32-
path: `/knowledge/import/lark/${id}`,
32+
path: `/knowledge/import/lark/${folderId}`,
3333
query: {
34+
id: id,
3435
folder_token: knowledgeDetail?.meta.folder_token,
3536
},
3637
})
@@ -42,7 +43,10 @@
4243
type="primary"
4344
@click="
4445
router.push({
45-
path: `/knowledge/import/workflow/${id}`,
46+
path: `/knowledge/import/workflow/${folderId}`,
47+
query: {
48+
id: id,
49+
},
4650
})
4751
"
4852
>{{ $t('views.document.importDocument') }}

0 commit comments

Comments
 (0)