Skip to content

Commit e0bbf06

Browse files
wangdan-fit2cloudwangdan-fit2cloud
committed
fix: Fix document routing issues
1 parent caafea2 commit e0bbf06

File tree

11 files changed

+33
-26
lines changed

11 files changed

+33
-26
lines changed

‎ui/src/router/modules/document.ts‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@ import { SourceTypeEnum } from '@/enums/common'
22
import { get_next_route } from '@/utils/permission'
33
import { EditionConst, PermissionConst, RoleConst } from '@/utils/permission/data'
44
import { ComplexPermission } from '@/utils/permission/type'
5+
/* type 类型
6+
BASE = 0, '通用类型'
7+
WEB = 1, 'web站点类型'
8+
LARK = 2, '飞书类型'
9+
YUQUE = 3, '语雀类型'
10+
WORKFLOW = 4, '工作流类型'
11+
*/
512
const DocumentRouter = {
613
path: '/knowledge/:id/:folderId/:type',
714
name: 'KnowledgeDetail',
@@ -186,9 +193,11 @@ const DocumentRouter = {
186193
return PermissionConst.RESOURCE_KNOWLEDGE_WORKFLOW_READ
187194
}
188195
},
189-
].map(p => () => {
196+
].map((p) => () => {
190197
const to: any = get_next_route()
191-
if (to.params.type !== '4') {return false}
198+
if (to.params.type !== '4') {
199+
return false
200+
}
192201
return p()
193202
}),
194203
},

‎ui/src/router/modules/knowledge.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ const ModelRouter = {
2727

2828
// 上传文档
2929
{
30-
path: '/knowledge/document/upload/:folderId',
30+
path: '/knowledge/document/upload/:folderId/:type',
3131
name: 'UploadDocument',
3232
meta: { activeMenu: '/knowledge' },
3333
component: () => import('@/views/document/UploadDocument.vue'),
3434
hidden: true,
3535
},
3636
{
37-
path: '/knowledge/import/:folderId',
37+
path: '/knowledge/import/:folderId/:type',
3838
name: 'ImportLarkDocument',
3939
meta: { activeMenu: '/knowledge' },
4040
component: () => import('@/views/document/ImportLarkDocument.vue'),

‎ui/src/router/routes.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export const routes: Array<RouteRecordRaw> = [
3636
meta: { activeMenu: '/application' },
3737
component: () => import('@/views/application-workflow/index.vue'),
3838
},
39-
// 高级编排
39+
// 知识库工作流
4040
{
4141
path: '/knowledge/:from/:id/:folderId/workflow',
4242
name: 'KnowledgeWorkflow',

‎ui/src/views/document/UploadDocument.vue‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ const documentsType = computed(() => knowledge.documentsType)
7171
const router = useRouter()
7272
const route = useRoute()
7373
const {
74-
params: { folderId },
74+
params: { folderId, type }, // type为知识库类型的类型
7575
query: { id }, // id为knowledgeID，有id的是上传文档
7676
} = route
7777
@@ -110,7 +110,7 @@ async function next() {
110110
MsgSuccess(t('common.submitSuccess'))
111111
clearStore()
112112
router.push({
113-
path: `/knowledge/${id}/${folderId}/document`,
113+
path: `/knowledge/${id}/${folderId}/${type}/document`,
114114
})
115115
})
116116
}
@@ -129,7 +129,7 @@ async function next() {
129129
MsgSuccess(t('common.submitSuccess'))
130130
clearStore()
131131
router.push({
132-
path: `/knowledge/${id}/${folderId}/document`,
132+
path: `/knowledge/${id}/${folderId}/${type}/document`,
133133
})
134134
})
135135
}
@@ -172,7 +172,7 @@ function submit() {
172172
MsgSuccess(t('common.submitSuccess'))
173173
clearStore()
174174
router.push({
175-
path: `/knowledge/${id}/${folderId}/document`,
175+
path: `/knowledge/${id}/${folderId}/${type}/document`,
176176
})
177177
})
178178
.catch(() => {

‎ui/src/views/document/index.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
type="primary"
1313
@click="
1414
router.push({
15-
path: `/knowledge/document/upload/${folderId}`,
15+
path: `/knowledge/document/upload/${folderId}/${type}`,
1616
query: { id: id },
1717
})
1818
"
@@ -29,7 +29,7 @@
2929
type="primary"
3030
@click="
3131
router.push({
32-
path: `/knowledge/import/${folderId}`,
32+
path: `/knowledge/import/${folderId}/${type}`,
3333
query: {
3434
id: id,
3535
folder_token: knowledgeDetail?.meta.folder_token,
@@ -739,7 +739,7 @@ import AddTagDialog from '@/views/document/tag/MulAddTagDialog.vue'
739739
const route = useRoute()
740740
const router = useRouter()
741741
const {
742-
params: { id, folderId }, // id为knowledgeID
742+
params: { id, folderId, type }, // id为knowledgeID
743743
} = route as any
744744
const { common } = useStore()
745745
const storeKey = 'documents'

‎ui/src/views/document/upload/ResultSuccess.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
type="primary"
3939
@click="
4040
router.push({
41-
path: `/knowledge/${data?.id}/${folderId}/document`,
41+
path: `/knowledge/${data?.id}/${folderId}/${type}/document`,
4242
})
4343
"
4444
>{{ $t('views.knowledge.ResultSuccess.buttons.toDocument') }}</el-button
@@ -96,7 +96,7 @@ const props = defineProps({
9696
const router = useRouter()
9797
const route = useRoute()
9898
const {
99-
params: { id, folderId }, // id为knowledgeID
99+
params: { id, folderId, type }, // id为knowledgeID
100100
} = route as any
101101
102102
const apiType = computed(() => {

‎ui/src/views/knowledge-workflow/index.vue‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -365,9 +365,7 @@ const publish = () => {
365365
const node = res.node
366366
const err_message = res.errMessage
367367
if (typeof err_message == 'string') {
368-
MsgError(
369-
res.node.properties?.stepName + ` ${t('views.workflow.node')}，` + err_message,
370-
)
368+
MsgError(res.node.properties?.stepName + ` ${t('views.workflow.node')}，` + err_message)
371369
} else {
372370
const keys = Object.keys(err_message)
373371
MsgError(
@@ -402,9 +400,7 @@ const clickShowDebug = () => {
402400
const node = res.node
403401
const err_message = res.errMessage
404402
if (typeof err_message == 'string') {
405-
MsgError(
406-
res.node.properties?.stepName + ` ${t('views.workflow.node')}，` + err_message,
407-
)
403+
MsgError(res.node.properties?.stepName + ` ${t('views.workflow.node')}，` + err_message)
408404
} else {
409405
const keys = Object.keys(err_message)
410406
MsgError(
@@ -499,7 +495,9 @@ const go = () => {
499495
}
500496
501497
const get_resource_management_route = () => {
502-
return `/knowledge/${from}/${id}/WORK_FLOW/document`
498+
return `/knowledge/${id}/${folderId}/4/document`
499+
500+
// return `/system/resource-management/knowledge`
503501
}
504502
505503
const get_route = () => {

‎ui/src/views/knowledge/create-component/CreateKnowledgeDialog.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ const submitHandle = async () => {
7676
.then((res: any) => {
7777
MsgSuccess(t('common.createSuccess'))
7878
router.push({
79-
path: `/knowledge/${res.data.id}/${currentFolder.value.id || 'shared'}/document`,
79+
path: `/knowledge/${res.data.id}/${currentFolder.value.id || 'shared'}/0/document`,
8080
})
8181
emit('refresh')
8282
})

‎ui/src/views/knowledge/create-component/CreateLarkKnowledgeDialog.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ const submitHandle = async () => {
168168
.then((res: any) => {
169169
MsgSuccess(t('common.createSuccess'))
170170
router.push({
171-
path: `/knowledge/${res.data.id}/${currentFolder.value.id || 'shared'}/document`,
171+
path: `/knowledge/${res.data.id}/${currentFolder.value.id || 'shared'}/2/document`,
172172
query: {
173173
from: apiType.value,
174174
},

‎ui/src/views/knowledge/create-component/CreateWebKnowledgeDialog.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ const submitHandle = async () => {
122122
.then((res: any) => {
123123
MsgSuccess(t('common.createSuccess'))
124124
router.push({
125-
path: `/knowledge/${res.data.id}/${currentFolder.value.id || 'shared'}/document`,
125+
path: `/knowledge/${res.data.id}/${currentFolder.value.id || 'shared'}/1/document`,
126126
query: {
127127
from: apiType.value,
128128
},

0 commit comments

Comments
 (0)