diff --git a/ui/src/api/knowledge/document.ts b/ui/src/api/knowledge/document.ts index f841e5517..037a684c4 100644 --- a/ui/src/api/knowledge/document.ts +++ b/ui/src/api/knowledge/document.ts @@ -21,7 +21,7 @@ Object.defineProperty(prefix, 'value', { } */ -const getDocument: ( +const getDocumentPage: ( knowledge_id: string, page: pageRequest, param: any, @@ -89,10 +89,16 @@ const delDocument: ( const putBatchCancelTask: ( knowledge_id: string, + document_id: string, data: any, loading?: Ref, -) => Promise> = (knowledge_id, data, loading) => { - return put(`${prefix.value}/${knowledge_id}/document/cancel_task/_batch`, data, undefined, loading) +) => Promise> = (knowledge_id, document_id, data, loading) => { + return put( + `${prefix.value}/${knowledge_id}/document/${document_id}/batch_cancel_task`, + data, + undefined, + loading, + ) } /** @@ -235,7 +241,13 @@ const putMulDocument: ( data: any, loading?: Ref, ) => Promise> = (knowledge_id, data, loading) => { - return put(`${prefix.value}/${knowledge_id}/document/batch_create`, data, {}, loading, 1000 * 60 * 5) + return put( + `${prefix.value}/${knowledge_id}/document/batch_create`, + data, + {}, + loading, + 1000 * 60 * 5, + ) } /** @@ -277,7 +289,12 @@ const putBatchGenerateRelated: ( data: any, loading?: Ref, ) => Promise> = (knowledge_id, data, loading) => { - return put(`${prefix.value}/${knowledge_id}/document/batch_generate_related`, data, undefined, loading) + return put( + `${prefix.value}/${knowledge_id}/document/batch_generate_related`, + data, + undefined, + loading, + ) } /** @@ -293,7 +310,12 @@ const putBatchEditHitHandling: ( data: any, loading?: Ref, ) => Promise> = (knowledge_id, data, loading) => { - return put(`${prefix.value}/${knowledge_id}/document/batch_hit_handling`, data, undefined, loading) + return put( + `${prefix.value}/${knowledge_id}/document/batch_hit_handling`, + data, + undefined, + loading, + ) } /** @@ -334,7 +356,12 @@ const putMulSyncDocument: ( data: any, loading?: Ref, ) => Promise> = (knowledge_id, data, loading) => { - return put(`${prefix.value}/${knowledge_id}/document/batch_sync`, { id_list: data }, undefined, loading) + return put( + `${prefix.value}/${knowledge_id}/document/batch_sync`, + { id_list: data }, + undefined, + loading, + ) } /** @@ -374,8 +401,17 @@ const postQADocument: ( * 分段预览（上传文档） * @param 参数 file:file,limit:number,patterns:array,with_filter:boolean */ -const postSplitDocument: (data: any, id: string) => Promise> = (data, id) => { - return post(`${prefix.value}/${id}/document/split`, data, undefined, undefined, 1000 * 60 * 60) +const postSplitDocument: (knowledge_id: string, data: any) => Promise> = ( + knowledge_id, + data, +) => { + return post( + `${prefix.value}/${knowledge_id}/document/split`, + data, + undefined, + undefined, + 1000 * 60 * 60, + ) } /** @@ -384,9 +420,10 @@ const postSplitDocument: (data: any, id: string) => Promise> = (data * @returns 分段标识列表 */ const listSplitPattern: ( + knowledge_id: string, loading?: Ref, -) => Promise>>> = (loading) => { - return get(`${prefix.value}/document/split_pattern`, {}, loading) +) => Promise>>> = (knowledge_id, loading) => { + return get(`${prefix.value}/${knowledge_id}/document/split_pattern`, {}, loading) } /** @@ -411,7 +448,7 @@ const exportQATemplate: (fileName: string, type: string, loading?: Ref) type, loading, ) => { - return exportExcel(fileName, `${prefix.value}/document/template/export`, { type }, loading) + return exportExcel(fileName, `/workspace/knowledge/document/template/export`, { type }, loading) } /** @@ -423,7 +460,12 @@ const exportTableTemplate: (fileName: string, type: string, loading?: Ref { - return exportExcel(fileName, `${prefix.value}/document/table_template/export`, { type }, loading) + return exportExcel( + fileName, + `/workspace/knowledge/document/table_template/export`, + { type }, + loading, + ) } /** @@ -445,13 +487,34 @@ const postWebDocument: ( return post(`${prefix.value}/${knowledge_id}/document/web`, data, undefined, loading) } -const getAllDocument: (knowledge_id: string, loading?: Ref) => Promise> = ( - knowledge_id, - loading, -) => { - return get(`${prefix.value}/${knowledge_id}/document`, undefined, loading) +/** + * 飞书导入获得相关文档 + * @param 参数 + * { + "source_url_list": [ + "string" + ], + "selector": "string" + } + } + */ +const getLarkDocumentList: ( + knowledge_id: string, + folder_token: string, + data: any, + loading?: Ref, +) => Promise> = (knowledge_id, folder_token, data, loading) => { + return post( + `${prefix.value}/lark/${knowledge_id}/${folder_token}/doc_list`, + data, + undefined, + loading, + ) } +/** + * 同步飞书文档 + */ const putLarkDocumentSync: ( knowledge_id: string, document_id: string, @@ -465,7 +528,10 @@ const putLarkDocumentSync: ( ) } -const delMulLarkSyncDocument: ( +/** + * 批量同步飞书文档 + */ +const putMulLarkSyncDocument: ( knowledge_id: string, data: any, loading?: Ref, @@ -473,8 +539,27 @@ const delMulLarkSyncDocument: ( return put(`${prefix.value}/lark/${knowledge_id}/_batch`, { id_list: data }, undefined, loading) } +/** + * 导入飞书文档 + */ +const importLarkDocument: ( + knowledge_id: string, + data: any, + loading?: Ref +) => Promise>> = (knowledge_id, data, loading) => { + return post(`${prefix.value}/lark/${knowledge_id}/import`, data, null, loading) +} + +// todo +const getAllDocument: (knowledge_id: string, loading?: Ref) => Promise> = ( + knowledge_id, + loading, +) => { + return get(`${prefix.value}/${knowledge_id}/document`, undefined, loading) +} + export default { - getDocument, + getDocumentPage, getDocumentDetail, putDocument, delDocument, @@ -499,8 +584,8 @@ export default { exportQATemplate, exportTableTemplate, postWebDocument, - - getAllDocument, + getLarkDocumentList, putLarkDocumentSync, - delMulLarkSyncDocument, + putMulLarkSyncDocument, + importLarkDocument } diff --git a/ui/src/api/knowledge/knowledge.ts b/ui/src/api/knowledge/knowledge.ts index bd8b44261..18c064f0c 100644 --- a/ui/src/api/knowledge/knowledge.ts +++ b/ui/src/api/knowledge/knowledge.ts @@ -255,30 +255,6 @@ const postWebKnowledge: (data: any, loading?: Ref) => Promise, -) => Promise>> = (knowledge_id, folder_token, data, loading) => { - return post(`${prefix.value}/lark/${knowledge_id}/${folder_token}/doc_list`, data, null, loading) -} - -const importLarkDocument: ( - knowledge_id: string, - data: any, - loading?: Ref, -) => Promise>> = (knowledge_id, data, loading) => { - return post(`${prefix.value}/lark/${knowledge_id}/import`, data, null, loading) -} - const postLarkKnowledge: (data: any, loading?: Ref) => Promise>> = ( data, loading, @@ -303,7 +279,5 @@ export default { getKnowledgeModel, postWebKnowledge, - getLarkDocumentList, - importLarkDocument, postLarkKnowledge, } diff --git a/ui/src/api/knowledge/paragraph.ts b/ui/src/api/knowledge/paragraph.ts index 9a7f9d8b0..e1287cb06 100644 --- a/ui/src/api/knowledge/paragraph.ts +++ b/ui/src/api/knowledge/paragraph.ts @@ -41,14 +41,14 @@ const postParagraph: ( } /** - * 段落列表 + * 段落分页列表 * @param 参数 knowledge_id document_id * param { "title": "string", "content": "string", } */ -const getParagraph: ( +const getParagraphPage: ( knowledge_id: string, document_id: string, page: pageRequest, @@ -145,6 +145,30 @@ const postParagraphProblem: ( ) } + +/** + * 段落调整顺序 + * @param knowledge_id 数据集id + * @param document_id 文档id + * @param loading 加载器 + * @query data { + * paragraph_id 段落id new_position 新顺序 + * } + */ +const putAdjustPosition: ( + knowledge_id: string, + document_id: string, + data: any, + loading?: Ref, +) => Promise> = (knowledge_id, document_id, data, loading) => { + return put( + `${prefix.value}/${knowledge_id}/document/${document_id}/paragraph/adjust_position`, + {}, + data, + loading, + ) +} + /** * 添加某段落关联问题 * @param knowledge_id 数据集id @@ -262,7 +286,7 @@ const putDisassociationProblem: ( export default { postParagraph, - getParagraph, + getParagraphPage, putParagraph, delParagraph, getParagraphProblem, diff --git a/ui/src/api/knowledge/problem.ts b/ui/src/api/knowledge/problem.ts index c1f10ae27..8e885c249 100644 --- a/ui/src/api/knowledge/problem.ts +++ b/ui/src/api/knowledge/problem.ts @@ -33,7 +33,7 @@ const postProblems: ( } */ -const getProblems: ( +const getProblemsPage: ( knowledge_id: string, page: pageRequest, param: any, @@ -119,7 +119,7 @@ const putMulProblem: ( export default { postProblems, - getProblems, + getProblemsPage, putProblems, delProblems, getDetailProblems, diff --git a/ui/src/api/shared/document.ts b/ui/src/api/shared/document.ts index 4b3a03810..87fda4787 100644 --- a/ui/src/api/shared/document.ts +++ b/ui/src/api/shared/document.ts @@ -14,7 +14,7 @@ const prefix = '/system/shared/knowledge' } */ -const getDocument: ( +const getDocumentPage: ( knowledge_id: string, page: pageRequest, param: any, @@ -82,10 +82,16 @@ const delDocument: ( const putBatchCancelTask: ( knowledge_id: string, + document_id: string, data: any, loading?: Ref, -) => Promise> = (knowledge_id, data, loading) => { - return put(`${prefix}/${knowledge_id}/document/cancel_task/_batch`, data, undefined, loading) +) => Promise> = (knowledge_id, document_id, data, loading) => { + return put( + `${prefix}/${knowledge_id}/document/${document_id}/batch_cancel_task`, + data, + undefined, + loading, + ) } /** @@ -367,8 +373,17 @@ const postQADocument: ( * 分段预览（上传文档） * @param 参数 file:file,limit:number,patterns:array,with_filter:boolean */ -const postSplitDocument: (data: any, id:string) => Promise> = (data, id) => { - return post(`${prefix}/${id}/document/split`, data, undefined, undefined, 1000 * 60 * 60) +const postSplitDocument: (knowledge_id: string, data: any) => Promise> = ( + knowledge_id, + data, +) => { + return post( + `${prefix}/${knowledge_id}/document/split`, + data, + undefined, + undefined, + 1000 * 60 * 60, + ) } /** @@ -377,9 +392,10 @@ const postSplitDocument: (data: any, id:string) => Promise> = (data, * @returns 分段标识列表 */ const listSplitPattern: ( + knowledge_id: string, loading?: Ref, -) => Promise>>> = (loading) => { - return get(`${prefix}/document/split_pattern`, {}, loading) +) => Promise>>> = (knowledge_id, loading) => { + return get(`${prefix}/${knowledge_id}/document/split_pattern`, {}, loading) } /** @@ -438,13 +454,34 @@ const postWebDocument: ( return post(`${prefix}/${knowledge_id}/document/web`, data, undefined, loading) } -const getAllDocument: (knowledge_id: string, loading?: Ref) => Promise> = ( - knowledge_id, - loading, -) => { - return get(`${prefix}/${knowledge_id}/document`, undefined, loading) +/** + * 飞书导入获得相关文档 + * @param 参数 + * { + "source_url_list": [ + "string" + ], + "selector": "string" + } + } + */ +const getLarkDocumentList: ( + knowledge_id: string, + folder_token: string, + data: any, + loading?: Ref, +) => Promise> = (knowledge_id, folder_token, data, loading) => { + return post( + `${prefix}/lark/${knowledge_id}/${folder_token}/doc_list`, + data, + undefined, + loading, + ) } +/** + * 同步飞书文档 + */ const putLarkDocumentSync: ( knowledge_id: string, document_id: string, @@ -458,7 +495,10 @@ const putLarkDocumentSync: ( ) } -const delMulLarkSyncDocument: ( +/** + * 批量同步飞书文档 + */ +const putMulLarkSyncDocument: ( knowledge_id: string, data: any, loading?: Ref, @@ -466,8 +506,26 @@ const delMulLarkSyncDocument: ( return put(`${prefix}/lark/${knowledge_id}/_batch`, { id_list: data }, undefined, loading) } +/** + * 导入飞书文档 + */ +const importLarkDocument: ( + knowledge_id: string, + data: any, + loading?: Ref, +) => Promise>> = (knowledge_id, data, loading) => { + return post(`${prefix}/lark/${knowledge_id}/import`, data, null, loading) +} + +const getAllDocument: (knowledge_id: string, loading?: Ref) => Promise> = ( + knowledge_id, + loading, +) => { + return get(`${prefix}/${knowledge_id}/document`, undefined, loading) +} + export default { - getDocument, + getDocumentPage, getDocumentDetail, putDocument, delDocument, @@ -489,11 +547,11 @@ export default { postSplitDocument, listSplitPattern, postTableDocument, + postWebDocument, exportQATemplate, exportTableTemplate, - postWebDocument, - - getAllDocument, + getLarkDocumentList, putLarkDocumentSync, - delMulLarkSyncDocument, + putMulLarkSyncDocument, + importLarkDocument, } diff --git a/ui/src/api/shared/knowledge.ts b/ui/src/api/shared/knowledge.ts index 1426afa0a..a6df3fcc0 100644 --- a/ui/src/api/shared/knowledge.ts +++ b/ui/src/api/shared/knowledge.ts @@ -247,31 +247,6 @@ const postWebKnowledge: (data: any, loading?: Ref) => Promise { return post(`${prefix}/knowledge/web`, data, undefined, loading) } - -/** - * 获取飞书文档列表 - * @param knowledge_id - * @param folder_token - * @param loading - * @returns - */ -const getLarkDocumentList: ( - knowledge_id: string, - folder_token: string, - data: any, - loading?: Ref, -) => Promise>> = (knowledge_id, folder_token, data, loading) => { - return post(`${prefix}/lark/${knowledge_id}/${folder_token}/doc_list`, data, null, loading) -} - -const importLarkDocument: ( - knowledge_id: string, - data: any, - loading?: Ref, -) => Promise>> = (knowledge_id, data, loading) => { - return post(`${prefix}/lark/${knowledge_id}/import`, data, null, loading) -} - const postLarkKnowledge: (data: any, loading?: Ref) => Promise>> = ( data, loading, @@ -296,8 +271,6 @@ export default { getKnowledgeModel, postWebKnowledge, - getLarkDocumentList, - importLarkDocument, postLarkKnowledge, } as { [key: string]: any diff --git a/ui/src/api/shared/paragraph.ts b/ui/src/api/shared/paragraph.ts index ff4bbb435..e340ea3e6 100644 --- a/ui/src/api/shared/paragraph.ts +++ b/ui/src/api/shared/paragraph.ts @@ -41,7 +41,7 @@ const postParagraph: ( "content": "string", } */ -const getParagraph: ( +const getParagraphPage: ( knowledge_id: string, document_id: string, page: pageRequest, @@ -255,7 +255,7 @@ const putDisassociationProblem: ( export default { postParagraph, - getParagraph, + getParagraphPage, putParagraph, delParagraph, getParagraphProblem, diff --git a/ui/src/api/shared/problem.ts b/ui/src/api/shared/problem.ts index 0675f1948..c2aca0bf6 100644 --- a/ui/src/api/shared/problem.ts +++ b/ui/src/api/shared/problem.ts @@ -26,7 +26,7 @@ const postProblems: ( } */ -const getProblems: ( +const getProblemsPage: ( knowledge_id: string, page: pageRequest, param: any, @@ -112,7 +112,7 @@ const putMulProblem: ( export default { postProblems, - getProblems, + getProblemsPage, putProblems, delProblems, getDetailProblems, diff --git a/ui/src/api/shared/tool.ts b/ui/src/api/shared/tool.ts index 17f14ad67..caaaec6c6 100644 --- a/ui/src/api/shared/tool.ts +++ b/ui/src/api/shared/tool.ts @@ -7,10 +7,10 @@ import type { toolData } from '@/api/type/tool' const prefix = '/system/shared' /** - * 获得工具文件夹列表 + * 工具列表带分页（无分页） * @params 参数 {folder_id: string} */ -const getToolByFolder: (data?: any, loading?: Ref) => Promise>> = ( +const getToolList: (data?: any, loading?: Ref) => Promise>> = ( data, loading, ) => { @@ -18,7 +18,7 @@ const getToolByFolder: (data?: any, loading?: Ref) => Promise) => Promise, @@ -123,8 +123,8 @@ const postPylint: (code: string, loading?: Ref) => Promise> export default { - getToolByFolder, getToolList, + getToolListPage, putTool, getToolById, postTool, diff --git a/ui/src/api/tool/tool.ts b/ui/src/api/tool/tool.ts index 79f2242e6..c2f7b6981 100644 --- a/ui/src/api/tool/tool.ts +++ b/ui/src/api/tool/tool.ts @@ -15,10 +15,10 @@ Object.defineProperty(prefix, 'value', { }) /** - * 获得工具文件夹列表 + * 工具列表带分页（无分页） * @params 参数 {folder_id: string} */ -const getToolByFolder: (data?: any, loading?: Ref) => Promise>> = ( +const getToolList: (data?: any, loading?: Ref) => Promise>> = ( data, loading, ) => { @@ -26,7 +26,7 @@ const getToolByFolder: (data?: any, loading?: Ref) => Promise) => Promise, @@ -129,8 +129,8 @@ const postPylint: (code: string, loading?: Ref) => Promise> } export default { - getToolByFolder, getToolList, + getToolListPage, putTool, getToolById, postTool, diff --git a/ui/src/api/user/resource-authorization.ts b/ui/src/api/user/resource-authorization.ts index f5c027aab..d73813097 100644 --- a/ui/src/api/user/resource-authorization.ts +++ b/ui/src/api/user/resource-authorization.ts @@ -11,15 +11,6 @@ Object.defineProperty(prefix, 'value', { return this._value + user.getWorkspaceId() }, }) - -/** - * 获取成员列表 - * @query 参数 - */ -const getUserList: (loading?: Ref) => Promise> = (loading) => { - return get(`${prefix.value}/user_list`, undefined, loading) -} - /** * 获取资源权限 * @query 参数 @@ -56,9 +47,20 @@ const putResourceAuthorization: ( ) => Promise> = (user_id, body, loading) => { return put(`${prefix.value}/user_resource_permission/user/${user_id}`, body, loading) } + + +/** + * 获取成员列表 + * @query 参数 + */ +const getUserList: (loading?: Ref) => Promise> = (loading) => { + return get(`${prefix.value}/user_list`, undefined, loading) +} + const getUserMember: (loading?: Ref) => Promise> = (loading) => { return get(`${prefix.value}/user_member`, undefined, loading) } + export default { getResourceAuthorization, putResourceAuthorization, diff --git a/ui/src/stores/modules-shared-system/problem.ts b/ui/src/stores/modules-shared-system/problem.ts index 538546dfc..68d706ae1 100644 --- a/ui/src/stores/modules-shared-system/problem.ts +++ b/ui/src/stores/modules-shared-system/problem.ts @@ -26,7 +26,7 @@ const useProblemStore = defineStore('proble', { ) { return new Promise((resolve, reject) => { problemApi - .getProblems(knowledgeId, page, param, loading) + .getProblemsPage(knowledgeId, page, param, loading) .then((data) => { resolve(data) }) diff --git a/ui/src/stores/modules/problem.ts b/ui/src/stores/modules/problem.ts index ff7413711..a84ab980b 100644 --- a/ui/src/stores/modules/problem.ts +++ b/ui/src/stores/modules/problem.ts @@ -26,7 +26,7 @@ const useProblemStore = defineStore('problem', { ) { return new Promise((resolve, reject) => { problemApi - .getProblems(knowledgeId, page, param, loading) + .getProblemsPage(knowledgeId, page, param, loading) .then((data) => { resolve(data) }) diff --git a/ui/src/views/chat-log/component/EditContentDialog.vue b/ui/src/views/chat-log/component/EditContentDialog.vue index 1e0b0f83b..284ea1508 100644 --- a/ui/src/views/chat-log/component/EditContentDialog.vue +++ b/ui/src/views/chat-log/component/EditContentDialog.vue @@ -229,18 +229,18 @@ function getDocument(knowledge_id: string) { } function getKnowledge_id() { - // application.asyncGetApplicationKnowledge(id, loading).then((res: any) => { - // knowledgeList.value = res.data - // if (localStorage.getItem(id + 'chat_knowledge_id')) { - // form.value.knowledge_id = localStorage.getItem(id + 'chat_knowledge_id') as string - // if (!knowledgeList.value.find((v) => v.id === form.value.knowledge_id)) { - // form.value.knowledge_id = '' - // form.value.document_id = '' - // } else { - // getDocument(form.value.knowledge_id) - // } - // } - // }) + application.asyncGetApplicationKnowledge(id, loading).then((res: any) => { + knowledgeList.value = res.data + if (localStorage.getItem(id + 'chat_knowledge_id')) { + form.value.knowledge_id = localStorage.getItem(id + 'chat_knowledge_id') as string + if (!knowledgeList.value.find((v) => v.id === form.value.knowledge_id)) { + form.value.knowledge_id = '' + form.value.document_id = '' + } else { + getDocument(form.value.knowledge_id) + } + } + }) } const open = (data: any) => { diff --git a/ui/src/views/chat-log/index.vue b/ui/src/views/chat-log/index.vue index 9bc64e136..157fcd97b 100644 --- a/ui/src/views/chat-log/index.vue +++ b/ui/src/views/chat-log/index.vue @@ -554,7 +554,7 @@ function saveCleanTime() { function changeKnowledge(knowledge_id: string) { localStorage.setItem(id + 'chat_knowledge_id', knowledge_id) form.value.document_id = '' - getDocument(knowledge_id) + getDocumentPage(knowledge_id) } function changeDocument(document_id: string) { @@ -564,18 +564,18 @@ function changeDocument(document_id: string) { const knowledgeList = ref([]) function getKnowledge() { - // application.asyncGetApplicationKnowledge(id, documentLoading).then((res: any) => { - // knowledgeList.value = res.data - // if (localStorage.getItem(id + 'chat_knowledge_id')) { - // form.value.knowledge_id = localStorage.getItem(id + 'chat_knowledge_id') as string - // if (!knowledgeList.value.find((v) => v.id === form.value.knowledge_id)) { - // form.value.knowledge_id = '' - // form.value.document_id = '' - // } else { - // getDocument(form.value.knowledge_id) - // } - // } - // }) + application.asyncGetApplicationKnowledge(id, documentLoading).then((res: any) => { + knowledgeList.value = res.data + if (localStorage.getItem(id + 'chat_knowledge_id')) { + form.value.knowledge_id = localStorage.getItem(id + 'chat_knowledge_id') as string + if (!knowledgeList.value.find((v) => v.id === form.value.knowledge_id)) { + form.value.knowledge_id = '' + form.value.document_id = '' + } else { + getDocument(form.value.knowledge_id) + } + } + }) } const submitForm = async (formEl: FormInstance | undefined) => { diff --git a/ui/src/views/document/index.vue b/ui/src/views/document/index.vue index 51381ff9b..afa7aa0d4 100644 --- a/ui/src/views/document/index.vue +++ b/ui/src/views/document/index.vue @@ -505,10 +505,10 @@
- + {{ $t('views.document.setting.cancelVectorization') }} - + {{ $t('views.document.setting.cancelGenerate') }} @@ -616,7 +616,7 @@ const exportDocumentZip = (document: any) => { }) } -function cancelTaskHandle(val: any) { +function cancelTaskHandle(val: any, row: any) { const arr: string[] = [] multipleSelection.value.map((v) => { if (v) { @@ -627,7 +627,7 @@ function cancelTaskHandle(val: any) { id_list: arr, type: val, } - documentApi.putBatchCancelTask(id, obj, loading).then(() => { + documentApi.putBatchCancelTask(id, row.id, obj, loading).then(() => { MsgSuccess(t('views.document.tip.cancelSuccess')) multipleTableRef.value?.clearSelection() }) @@ -670,7 +670,7 @@ function beforeCommand(attr: string, val: any, task_type?: number) { } const cancelTask = (row: any, task_type: number) => { - documentApi.putCancelTask(row.knowledge_id, row.id, { type: task_type }).then(() => { + documentApi.putCancelTask(id, row.id, { type: task_type }).then(() => { MsgSuccess(t('views.document.tip.sendMessage')) }) } @@ -932,7 +932,7 @@ function getList(bool?: boolean) { folder_id: folderId, } documentApi - .getDocument(id as string, paginationConfig.value, param, bool ? undefined : loading) + .getDocumentPage(id as string, paginationConfig.value, param, bool ? undefined : loading) .then((res) => { documentData.value = res.data.records paginationConfig.value.total = res.data.total diff --git a/ui/src/views/document/upload/SetRules.vue b/ui/src/views/document/upload/SetRules.vue index 6dccd94d2..add06c0f3 100644 --- a/ui/src/views/document/upload/SetRules.vue +++ b/ui/src/views/document/upload/SetRules.vue @@ -131,7 +131,7 @@ const documentsFiles = computed(() => knowledge.documentsFiles) const splitPatternList = ref>>([]) const route = useRoute() const { - query: { id }, // id为datasetID + query: { id }, // id为knowledgeID } = route as any const radio = ref('1') const loading = ref(false) @@ -188,7 +188,7 @@ function splitDocument() { }) } documentApi - .postSplitDocument(fd, id) + .postSplitDocument(id, fd) .then((res: any) => { const list = res.data @@ -218,7 +218,7 @@ function splitDocument() { } const initSplitPatternList = () => { - documentApi.listSplitPattern(patternLoading).then((ok) => { + documentApi.listSplitPattern(id,patternLoading).then((ok) => { splitPatternList.value = ok.data }) } diff --git a/ui/src/views/knowledge/ImportDocumentKnowledge.vue b/ui/src/views/knowledge/ImportDocumentKnowledge.vue index 55a3de33e..abfa829ec 100644 --- a/ui/src/views/knowledge/ImportDocumentKnowledge.vue +++ b/ui/src/views/knowledge/ImportDocumentKnowledge.vue @@ -140,7 +140,7 @@ import { MsgConfirm, MsgSuccess, MsgWarning } from '@/utils/message' import { getImgUrl } from '@/utils/utils' import { t } from '@/locales' import type Node from 'element-plus/es/components/tree/src/model/node' -import knowledgeApi from '@/api/knowledge/knowledge' +import documentApi from '@/api/knowledge/document' const router = useRouter() const route = useRoute() @@ -183,7 +183,7 @@ const props = { const loadNode = (node: Node, resolve: (nodeData: Tree[]) => void) => { const token = node.level === 0 ? folderToken : node.data.token // 根节点使用 folder_token，其他节点使用 node.data.token - knowledgeApi + documentApi .getLarkDocumentList(knowledgeId, token, {}, loading) .then((res: any) => { const nodes = res.data.files as Tree[] @@ -234,7 +234,7 @@ function submit() { loading.value = false return } - knowledgeApi + documentApi .importLarkDocument(knowledgeId, newList, loading) .then((res) => { MsgSuccess(t('views.document.tip.importMessage')) diff --git a/ui/src/views/paragraph/index.vue b/ui/src/views/paragraph/index.vue index d3cd75d5b..5c96346c0 100644 --- a/ui/src/views/paragraph/index.vue +++ b/ui/src/views/paragraph/index.vue @@ -268,7 +268,7 @@ function getDetail() { function getParagraphList() { paragraphApi - .getParagraph( + .getParagraphPage( id, documentId, paginationConfig, diff --git a/ui/src/views/problem/component/RelateProblemDialog.vue b/ui/src/views/problem/component/RelateProblemDialog.vue index 92b5154de..6ca95c012 100644 --- a/ui/src/views/problem/component/RelateProblemDialog.vue +++ b/ui/src/views/problem/component/RelateProblemDialog.vue @@ -224,7 +224,7 @@ function getDocument() { function getParagraphList(documentId: string) { paragraphApi - .getParagraph( + .getParagraphPage( id, (documentId || currentDocument.value) as string, paginationConfig, diff --git a/ui/src/views/shared/document-shared/index.vue b/ui/src/views/shared/document-shared/index.vue index c0849c425..fe3899deb 100644 --- a/ui/src/views/shared/document-shared/index.vue +++ b/ui/src/views/shared/document-shared/index.vue @@ -510,10 +510,10 @@
- + {{ $t('views.document.setting.cancelVectorization') }} - + {{ $t('views.document.setting.cancelGenerate') }} @@ -621,7 +621,7 @@ const exportDocumentZip = (document: any) => { }) } -function cancelTaskHandle(val: any) { +function cancelTaskHandle(val: any, row: any) { const arr: string[] = [] multipleSelection.value.map((v) => { if (v) { @@ -632,7 +632,7 @@ function cancelTaskHandle(val: any) { id_list: arr, type: val, } - documentApi.putBatchCancelTask(id, obj, loading).then(() => { + documentApi.putBatchCancelTask(id, row.id, obj, loading).then(() => { MsgSuccess(t('views.document.tip.cancelSuccess')) multipleTableRef.value?.clearSelection() }) @@ -937,7 +937,7 @@ function getList(bool?: boolean) { folder_id: folderId, } documentApi - .getDocument(id as string, paginationConfig.value, param, bool ? undefined : loading) + .getDocumentPage(id as string, paginationConfig.value, param, bool ? undefined : loading) .then((res) => { documentData.value = res.data.records paginationConfig.value.total = res.data.total diff --git a/ui/src/views/shared/document-shared/upload/SetRules.vue b/ui/src/views/shared/document-shared/upload/SetRules.vue index e675a296d..13093a9a1 100644 --- a/ui/src/views/shared/document-shared/upload/SetRules.vue +++ b/ui/src/views/shared/document-shared/upload/SetRules.vue @@ -132,7 +132,7 @@ const splitPatternList = ref>>([]) const route = useRoute() const { - query: { id }, // id为datasetID + query: { id }, // id为knowledgeID } = route as any const radio = ref('1') const loading = ref(false) @@ -150,7 +150,7 @@ const form = reactive<{ }>({ patterns: [], limit: 500, - with_filter: true + with_filter: true, }) function changeHandle(val: boolean) { @@ -162,11 +162,11 @@ function changeHandle(val: boolean) { problem_list: v.title.trim() ? [ { - content: v.title.trim() - } + content: v.title.trim(), + }, ] - : [] - })) + : [], + })), })) firstChecked.value = false } @@ -189,7 +189,7 @@ function splitDocument() { }) } documentApi - .postSplitDocument(fd, id) + .postSplitDocument(id, fd) .then((res: any) => { const list = res.data @@ -202,8 +202,8 @@ function splitDocument() { v['problem_list'] = v.title.trim() ? [ { - content: v.title.trim() - } + content: v.title.trim(), + }, ] : [] }) @@ -219,7 +219,7 @@ function splitDocument() { } const initSplitPatternList = () => { - documentApi.listSplitPattern(patternLoading).then((ok) => { + documentApi.listSplitPattern(id, patternLoading).then((ok) => { splitPatternList.value = ok.data }) } @@ -237,7 +237,7 @@ onMounted(() => { defineExpose({ paragraphList, checkedConnect, - loading + loading, })