diff --git a/ui/src/api/application/chat-log.ts b/ui/src/api/application/chat-log.ts index 508ad2796..7d06f5b8c 100644 --- a/ui/src/api/application/chat-log.ts +++ b/ui/src/api/application/chat-log.ts @@ -13,8 +13,14 @@ import { import type { pageRequest } from '@/api/type/common' import type { ApplicationFormType } from '@/api/type/application' import { type Ref } from 'vue' - -const prefix = '/workspace/' + localStorage.getItem('workspace_id') + '/application' +import useStore from '@/stores' +const prefix: any = { _value: '/workspace/' } +Object.defineProperty(prefix, 'value', { + get: function () { + const { user } = useStore() + return this._value + user.getWorkspaceId() + '/application' + }, +}) /** * 对话记录提交至知识库 * @param data @@ -28,7 +34,7 @@ const postChatLogAddKnowledge: ( data: any, loading?: Ref, ) => Promise> = (application_id, data, loading) => { - return post(`${prefix}/${application_id}/add_knowledge`, data, undefined, loading) + return post(`${prefix.value}/${application_id}/add_knowledge`, data, undefined, loading) } /** @@ -47,7 +53,7 @@ const getChatLog: ( loading?: Ref, ) => Promise> = (application_id, page, param, loading) => { return get( - `${prefix}/${application_id}/chat/${page.current_page}/${page.page_size}`, + `${prefix.value}/${application_id}/chat/${page.current_page}/${page.page_size}`, param, loading, ) @@ -66,7 +72,7 @@ const getChatRecordLog: ( order_asc?: boolean, ) => Promise> = (application_id, chart_id, page, loading, order_asc) => { return get( - `${prefix}/${application_id}/chat/${chart_id}/chat_record/${page.current_page}/${page.page_size}`, + `${prefix.value}/${application_id}/chat/${chart_id}/chat_record/${page.current_page}/${page.page_size}`, { order_asc: order_asc !== undefined ? order_asc : true }, loading, ) @@ -93,7 +99,7 @@ const getMarkChatRecord: ( loading, ) => { return get( - `${prefix}/${application_id}/chat/${chart_id}/chat_record/${chart_record_id}/knowledge/${knowledge_id}/document/${document_id}/improve`, + `${prefix.value}/${application_id}/chat/${chart_id}/chat_record/${chart_record_id}/knowledge/${knowledge_id}/document/${document_id}/improve`, undefined, loading, ) @@ -127,7 +133,7 @@ const putChatRecordLog: ( loading, ) => { return put( - `${prefix}/${application_id}/chat/${chart_id}/chat_record/${chart_record_id}/knowledge/${knowledge_id}/document/${document_id}/improve`, + `${prefix.value}/${application_id}/chat/${chart_id}/chat_record/${chart_record_id}/knowledge/${knowledge_id}/document/${document_id}/improve`, data, undefined, loading, @@ -157,7 +163,7 @@ const delMarkChatRecord: ( loading, ) => { return del( - `${prefix}/${application_id}/chat/${chart_id}/chat_record/${chart_record_id}/knowledge/${knowledge_id}/document/${document_id}/paragraph/${paragraph_id}/improve`, + `${prefix.value}/${application_id}/chat/${chart_id}/chat_record/${chart_record_id}/knowledge/${knowledge_id}/document/${document_id}/paragraph/${paragraph_id}/improve`, undefined, {}, loading, @@ -182,7 +188,7 @@ const postExportChatLog: ( ) => void = (application_id, application_name, param, data, loading) => { exportExcelPost( application_name + '.xlsx', - `${prefix}/${application_id}/chat/export`, + `${prefix.value}/${application_id}/chat/export`, param, data, loading, @@ -195,7 +201,7 @@ const getChatRecordDetails: ( loading?: Ref, ) => Promise = (application_id, chat_id, chat_record_id, loading) => { return get( - `${prefix}/${application_id}/chat/${chat_id}/chat_record/${chat_record_id}`, + `${prefix.value}/${application_id}/chat/${chat_id}/chat_record/${chat_record_id}`, {}, loading, ) diff --git a/ui/src/api/application/work-flow-version.ts b/ui/src/api/application/work-flow-version.ts index 3fec23610..aa6d46a3b 100644 --- a/ui/src/api/application/work-flow-version.ts +++ b/ui/src/api/application/work-flow-version.ts @@ -2,7 +2,14 @@ import { Result } from '@/request/Result' import { get, put } from '@/request/index' import { type Ref } from 'vue' -const prefix = '/workspace/' + localStorage.getItem('workspace_id') + '/application' +import useStore from '@/stores' +const prefix: any = { _value: '/workspace/' } +Object.defineProperty(prefix, 'value', { + get: function () { + const { user } = useStore() + return this._value + user.getWorkspaceId() + '/application' + }, +}) /** * workflow历史版本 @@ -11,7 +18,7 @@ const getWorkFlowVersion: ( application_id: string, loading?: Ref, ) => Promise> = (application_id, loading) => { - return get(`${prefix}/${application_id}/work_flow_version`, undefined, loading) + return get(`${prefix.value}/${application_id}/work_flow_version`, undefined, loading) } /** @@ -23,7 +30,7 @@ const getWorkFlowVersionDetail: ( loading?: Ref, ) => Promise> = (application_id, application_version_id, loading) => { return get( - `${prefix}/${application_id}/work_flow_version/${application_version_id}`, + `${prefix.value}/${application_id}/work_flow_version/${application_version_id}`, undefined, loading, ) @@ -38,7 +45,7 @@ const putWorkFlowVersion: ( loading?: Ref, ) => Promise> = (application_id, application_version_id, data, loading) => { return put( - `${prefix}/${application_id}/work_flow_version/${application_version_id}`, + `${prefix.value}/${application_id}/work_flow_version/${application_version_id}`, data, undefined, loading, diff --git a/ui/src/api/chat/chat.ts b/ui/src/api/chat/chat.ts index 82cbbc402..3db1548aa 100644 --- a/ui/src/api/chat/chat.ts +++ b/ui/src/api/chat/chat.ts @@ -12,7 +12,14 @@ import { import { type Ref } from 'vue' -const prefix = '/workspace/' + localStorage.getItem('workspace_id') + '/application' +import useStore from '@/stores' +const prefix: any = { _value: '/workspace/' } +Object.defineProperty(prefix, 'value', { + get: function () { + const { user } = useStore() + return this._value + user.getWorkspaceId() + '/application' + }, +}) /** * 打开调试对话id @@ -24,7 +31,7 @@ const open: (application_id: string, loading?: Ref) => Promise { - return get(`${prefix}/${application_id}/open`, {}, loading) + return get(`${prefix.value}/${application_id}/open`, {}, loading) } /** * 对话 diff --git a/ui/src/api/folder.ts b/ui/src/api/folder.ts index 7933d19c6..f4c5ba777 100644 --- a/ui/src/api/folder.ts +++ b/ui/src/api/folder.ts @@ -1,9 +1,16 @@ -import {Result} from '@/request/Result' -import {get, post, del, put} from '@/request/index' -import {type Ref} from 'vue' -import type {pageRequest} from '@/api/type/common' +import { Result } from '@/request/Result' +import { get, post, del, put } from '@/request/index' +import { type Ref } from 'vue' +import type { pageRequest } from '@/api/type/common' -const prefix = '/workspace/' + localStorage.getItem('workspace_id') +import useStore from '@/stores' +const prefix: any = { _value: '/workspace/' } +Object.defineProperty(prefix, 'value', { + get: function () { + const { user } = useStore() + return this._value + user.getWorkspaceId() + }, +}) /** * 获得文件夹列表 @@ -16,7 +23,7 @@ const getFolder: ( data?: any, loading?: Ref, ) => Promise>> = (source, data, loading) => { - return get(`${prefix}/${source}/folder`, data, loading) + return get(`${prefix.value}/${source}/folder`, data, loading) } /** @@ -34,7 +41,7 @@ const postFolder: ( data?: any, loading?: Ref, ) => Promise>> = (source, data, loading) => { - return post(`${prefix}/${source}/folder`, data, loading) + return post(`${prefix.value}/${source}/folder`, data, loading) } export default { diff --git a/ui/src/api/knowledge/document.ts b/ui/src/api/knowledge/document.ts index 9182e11f6..d381e1117 100644 --- a/ui/src/api/knowledge/document.ts +++ b/ui/src/api/knowledge/document.ts @@ -4,7 +4,14 @@ import type { Ref } from 'vue' import type { KeyValue } from '@/api/type/common' import type { pageRequest } from '@/api/type/common' -const prefix = '/workspace/' + localStorage.getItem('workspace_id') + '/knowledge' +import useStore from '@/stores' +const prefix: any = { _value: '/workspace/' } +Object.defineProperty(prefix, 'value', { + get: function () { + const { user } = useStore() + return this._value + user.getWorkspaceId() + '/knowledge' + }, +}) /** * 文档分页列表 @@ -21,7 +28,7 @@ const getDocument: ( loading?: Ref, ) => Promise> = (knowledge_id, page, param, loading) => { return get( - `${prefix}/${knowledge_id}/document/${page.current_page}/${page.page_size}`, + `${prefix.value}/${knowledge_id}/document/${page.current_page}/${page.page_size}`, param, loading, ) @@ -35,7 +42,7 @@ const getDocumentDetail: (knowledge_id: string, document_id: string) => Promise< knowledge_id, document_id, ) => { - return get(`${prefix}/${knowledge_id}/document/${document_id}`) + return get(`${prefix.value}/${knowledge_id}/document/${document_id}`) } /** @@ -54,7 +61,7 @@ const putDocument: ( data: any, loading?: Ref, ) => Promise> = (knowledge_id, document_id, data: any, loading) => { - return put(`${prefix}/${knowledge_id}/document/${document_id}`, data, undefined, loading) + return put(`${prefix.value}/${knowledge_id}/document/${document_id}`, data, undefined, loading) } /** @@ -66,7 +73,7 @@ const delDocument: ( document_id: string, loading?: Ref, ) => Promise> = (knowledge_id, document_id, loading) => { - return del(`${prefix}/${knowledge_id}/document/${document_id}`, loading) + return del(`${prefix.value}/${knowledge_id}/document/${document_id}`, loading) } /** @@ -85,7 +92,7 @@ const putBatchCancelTask: ( data: any, loading?: Ref, ) => Promise> = (knowledge_id, data, loading) => { - return put(`${prefix}/${knowledge_id}/document/cancel_task/_batch`, data, undefined, loading) + return put(`${prefix.value}/${knowledge_id}/document/cancel_task/_batch`, data, undefined, loading) } /** @@ -99,7 +106,7 @@ const putCancelTask: ( loading?: Ref, ) => Promise> = (knowledge_id, document_id, data, loading) => { return put( - `${prefix}/${knowledge_id}/document/${document_id}/cancel_task`, + `${prefix.value}/${knowledge_id}/document/${document_id}/cancel_task`, data, undefined, loading, @@ -114,7 +121,7 @@ const getDownloadSourceFile: (knowledge_id: string, document_id: string) => Prom knowledge_id, document_id, ) => { - return get(`${prefix}/${knowledge_id}/document/${document_id}/download_source_file`) + return get(`${prefix.value}/${knowledge_id}/document/${document_id}/download_source_file`) } /** @@ -133,7 +140,7 @@ const exportDocument: ( ) => Promise = (document_name, knowledge_id, document_id, loading) => { return exportExcel( document_name + '.xlsx', - `${prefix}/${knowledge_id}/document/${document_id}/export`, + `${prefix.value}/${knowledge_id}/document/${document_id}/export`, {}, loading, ) @@ -154,7 +161,7 @@ const exportDocumentZip: ( ) => Promise = (document_name, knowledge_id, document_id, loading) => { return exportFile( document_name + '.zip', - `${prefix}/${knowledge_id}/document/${document_id}/export_zip`, + `${prefix.value}/${knowledge_id}/document/${document_id}/export_zip`, {}, loading, ) @@ -177,7 +184,7 @@ const putDocumentRefresh: ( loading?: Ref, ) => Promise> = (knowledge_id, document_id, state_list, loading) => { return put( - `${prefix}/${knowledge_id}/document/${document_id}/refresh`, + `${prefix.value}/${knowledge_id}/document/${document_id}/refresh`, { state_list }, undefined, loading, @@ -195,7 +202,7 @@ const putDocumentSync: ( loading?: Ref, ) => Promise> = (knowledge_id, document_id, loading) => { return put( - `${prefix}/${knowledge_id}/document/${document_id}/sync`, + `${prefix.value}/${knowledge_id}/document/${document_id}/sync`, undefined, undefined, loading, @@ -228,7 +235,7 @@ const postMulDocument: ( data: any, loading?: Ref, ) => Promise> = (knowledge_id, data, loading) => { - return put(`${prefix}/${knowledge_id}/document/batch_create`, data, {}, loading, 1000 * 60 * 5) + return put(`${prefix.value}/${knowledge_id}/document/batch_create`, data, {}, loading, 1000 * 60 * 5) } /** @@ -244,7 +251,7 @@ const delMulDocument: ( loading?: Ref, ) => Promise> = (knowledge_id, data, loading) => { return del( - `${prefix}/${knowledge_id}/document/bach_delete`, + `${prefix.value}/${knowledge_id}/document/bach_delete`, undefined, { id_list: data }, loading, @@ -270,7 +277,7 @@ const putBatchGenerateRelated: ( data: any, loading?: Ref, ) => Promise> = (knowledge_id, data, loading) => { - return put(`${prefix}/${knowledge_id}/document/batch_generate_related`, data, undefined, loading) + return put(`${prefix.value}/${knowledge_id}/document/batch_generate_related`, data, undefined, loading) } /** @@ -286,7 +293,7 @@ const putBatchEditHitHandling: ( data: any, loading?: Ref, ) => Promise> = (knowledge_id, data, loading) => { - return put(`${prefix}/${knowledge_id}/document/batch_hit_handling`, data, undefined, loading) + return put(`${prefix.value}/${knowledge_id}/document/batch_hit_handling`, data, undefined, loading) } /** @@ -311,7 +318,7 @@ const putBatchRefresh: ( loading?: Ref, ) => Promise> = (knowledge_id, data, stateList, loading) => { return put( - `${prefix}/${knowledge_id}/document/batch_refresh`, + `${prefix.value}/${knowledge_id}/document/batch_refresh`, { id_list: data, state_list: stateList }, undefined, loading, @@ -327,7 +334,7 @@ const putMulSyncDocument: ( data: any, loading?: Ref, ) => Promise> = (knowledge_id, data, loading) => { - return put(`${prefix}/${knowledge_id}/document/batch_sync`, { id_list: data }, undefined, loading) + return put(`${prefix.value}/${knowledge_id}/document/batch_sync`, { id_list: data }, undefined, loading) } /** @@ -342,7 +349,7 @@ const putMigrateMulDocument: ( loading?: Ref, ) => Promise> = (knowledge_id, target_knowledge_id, data, loading) => { return put( - `${prefix}/${knowledge_id}/document/migrate/${target_knowledge_id}`, + `${prefix.value}/${knowledge_id}/document/migrate/${target_knowledge_id}`, data, undefined, loading, @@ -360,7 +367,7 @@ const postQADocument: ( data: any, loading?: Ref, ) => Promise> = (knowledge_id, data, loading) => { - return post(`${prefix}/${knowledge_id}/document/qa`, data, undefined, loading) + return post(`${prefix.value}/${knowledge_id}/document/qa`, data, undefined, loading) } /** @@ -368,7 +375,7 @@ const postQADocument: ( * @param 参数 file:file,limit:number,patterns:array,with_filter:boolean */ const postSplitDocument: (data: any) => Promise> = (data) => { - return post(`${prefix}/document/split`, data, undefined, undefined, 1000 * 60 * 60) + return post(`${prefix.value}/document/split`, data, undefined, undefined, 1000 * 60 * 60) } /** @@ -379,7 +386,7 @@ const postSplitDocument: (data: any) => Promise> = (data) => { const listSplitPattern: ( loading?: Ref, ) => Promise>>> = (loading) => { - return get(`${prefix}/document/split_pattern`, {}, loading) + return get(`${prefix.value}/document/split_pattern`, {}, loading) } /** @@ -392,7 +399,7 @@ const postTableDocument: ( data: any, loading?: Ref, ) => Promise> = (knowledge_id, data, loading) => { - return post(`${prefix}/${knowledge_id}/document/table`, data, undefined, loading) + return post(`${prefix.value}/${knowledge_id}/document/table`, data, undefined, loading) } /** @@ -404,7 +411,7 @@ const exportQATemplate: (fileName: string, type: string, loading?: Ref) type, loading, ) => { - return exportExcel(fileName, `${prefix}/document/template/export`, { type }, loading) + return exportExcel(fileName, `${prefix.value}/document/template/export`, { type }, loading) } /** @@ -416,7 +423,7 @@ const exportTableTemplate: (fileName: string, type: string, loading?: Ref { - return exportExcel(fileName, `${prefix}/document/table_template/export`, { type }, loading) + return exportExcel(fileName, `${prefix.value}/document/table_template/export`, { type }, loading) } /** @@ -435,14 +442,14 @@ const postWebDocument: ( data: any, loading?: Ref, ) => Promise> = (knowledge_id, data, loading) => { - return post(`${prefix}/${knowledge_id}/document/web`, data, undefined, loading) + 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}/${knowledge_id}/document`, undefined, loading) + return get(`${prefix.value}/${knowledge_id}/document`, undefined, loading) } const putLarkDocumentSync: ( @@ -451,7 +458,7 @@ const putLarkDocumentSync: ( loading?: Ref, ) => Promise> = (knowledge_id, document_id, loading) => { return put( - `${prefix}/lark/${knowledge_id}/document/${document_id}/sync`, + `${prefix.value}/lark/${knowledge_id}/document/${document_id}/sync`, undefined, undefined, loading, @@ -463,7 +470,7 @@ const delMulLarkSyncDocument: ( data: any, loading?: Ref, ) => Promise> = (knowledge_id, data, loading) => { - return put(`${prefix}/lark/${knowledge_id}/_batch`, { id_list: data }, undefined, loading) + return put(`${prefix.value}/lark/${knowledge_id}/_batch`, { id_list: data }, undefined, loading) } export default { diff --git a/ui/src/api/knowledge/knowledge.ts b/ui/src/api/knowledge/knowledge.ts index 4441fc219..fb28d0ba3 100644 --- a/ui/src/api/knowledge/knowledge.ts +++ b/ui/src/api/knowledge/knowledge.ts @@ -4,7 +4,14 @@ import { type Ref } from 'vue' import type { pageRequest } from '@/api/type/common' import type { knowledgeData } from '@/api/type/knowledge' -const prefix = '/workspace/' + localStorage.getItem('workspace_id') +import useStore from '@/stores' +const prefix: any = { _value: '/workspace/' } +Object.defineProperty(prefix, 'value', { + get: function () { + const { user } = useStore() + return this._value + user.getWorkspaceId() + '/knowledge' + }, +}) /** * 获得知识库文件夹列表 @@ -18,7 +25,7 @@ const getKnowledgeByFolder: (data?: any, loading?: Ref) => Promise { - return get(`${prefix}/knowledge`, data, loading) + return get(`${prefix.value}`, data, loading) } /** @@ -35,7 +42,7 @@ const getKnowledgeList: (param?: any, loading?: Ref) => Promise { - return get(`${prefix}/knowledge`, param, loading) + return get(`${prefix.value}`, param, loading) } /** @@ -53,7 +60,7 @@ const getKnowledgeListPage: ( param?: any, loading?: Ref, ) => Promise> = (page, param, loading) => { - return get(`${prefix}/knowledge/${page.current_page}/${page.page_size}`, param, loading) + return get(`${prefix.value}/${page.current_page}/${page.page_size}`, param, loading) } /** @@ -64,7 +71,7 @@ const getKnowledgeDetail: (knowledge_id: string, loading?: Ref) => Prom knowledge_id, loading, ) => { - return get(`${prefix}/knowledge/${knowledge_id}`, undefined, loading) + return get(`${prefix.value}/${knowledge_id}`, undefined, loading) } /** @@ -81,7 +88,7 @@ const putKnowledge: ( data: any, loading?: Ref, ) => Promise> = (knowledge_id, data, loading) => { - return put(`${prefix}/knowledge/${knowledge_id}`, data, undefined, loading) + return put(`${prefix.value}/${knowledge_id}`, data, undefined, loading) } /** @@ -92,7 +99,7 @@ const delKnowledge: (knowledge_id: String, loading?: Ref) => Promise { - return del(`${prefix}/${knowledge_id}`, undefined, {}, loading) + return del(`${prefix.value}/${knowledge_id}`, undefined, {}, loading) } /** @@ -103,7 +110,7 @@ const putReEmbeddingKnowledge: ( knowledge_id: string, loading?: Ref, ) => Promise> = (knowledge_id, loading) => { - return put(`${prefix}/knowledge/${knowledge_id}/embedding`, undefined, undefined, loading) + return put(`${prefix.value}/${knowledge_id}/embedding`, undefined, undefined, loading) } /** @@ -119,7 +126,7 @@ const exportKnowledge: ( ) => Promise = (knowledge_name, knowledge_id, loading) => { return exportExcel( knowledge_name + '.xlsx', - `${prefix}/${knowledge_id}/knowledge/${knowledge_id}/export`, + `${prefix.value}/${knowledge_id}/export`, undefined, loading, ) @@ -138,7 +145,7 @@ const exportZipKnowledge: ( ) => Promise = (knowledge_name, knowledge_id, loading) => { return exportFile( knowledge_name + '.zip', - `${prefix}/${knowledge_id}/knowledge/${knowledge_id}/export_zip`, + `${prefix.value}/${knowledge_id}/export_zip`, undefined, loading, ) @@ -156,7 +163,7 @@ const putGenerateRelated: ( data: any, loading?: Ref, ) => Promise>> = (knowledge_id, data, loading) => { - return put(`${prefix}/${knowledge_id}/generate_related`, data, null, loading) + return put(`${prefix.value}/${knowledge_id}/generate_related`, data, null, loading) } /** @@ -171,7 +178,7 @@ const getKnowledgeHitTest: ( data: any, loading?: Ref, ) => Promise>> = (knowledge_id, data, loading) => { - return get(`${prefix}/${knowledge_id}/hit_test`, data, loading) + return get(`${prefix.value}/${knowledge_id}/hit_test`, data, loading) } /** @@ -184,7 +191,7 @@ const putSyncWebKnowledge: ( sync_type: string, loading?: Ref, ) => Promise> = (knowledge_id, sync_type, loading) => { - return put(`${prefix}/knowledge/${knowledge_id}/sync`, undefined, { sync_type }, loading) + return put(`${prefix.value}/${knowledge_id}/sync`, undefined, { sync_type }, loading) } /** @@ -201,7 +208,7 @@ const postKnowledge: (data: knowledgeData, loading?: Ref) => Promise { - return post(`${prefix}/knowledge/base`, data, undefined, loading, 1000 * 60 * 5) + return post(`${prefix.value}/base`, data, undefined, loading, 1000 * 60 * 5) } /** @@ -215,7 +222,7 @@ const getKnowledgeEmdeddingModel: ( knowledge_id: string, loading?: Ref, ) => Promise>> = (knowledge_id, loading) => { - return get(`${prefix}/${knowledge_id}/emdedding_model`, loading) + return get(`${prefix.value}/${knowledge_id}/emdedding_model`, loading) } /** @@ -229,7 +236,7 @@ const getKnowledgeModel: ( knowledge_id: string, loading?: Ref, ) => Promise>> = (knowledge_id, loading) => { - return get(`${prefix}/${knowledge_id}/model`, loading) + return get(`${prefix.value}/${knowledge_id}/model`, loading) } /** @@ -248,7 +255,7 @@ const postWebKnowledge: (data: any, loading?: Ref) => Promise { - return post(`${prefix}/knowledge/web`, data, undefined, loading) + return post(`${prefix.value}/web`, data, undefined, loading) } /** @@ -264,7 +271,7 @@ const getLarkDocumentList: ( data: any, loading?: Ref, ) => Promise>> = (knowledge_id, folder_token, data, loading) => { - return post(`${prefix}/lark/${knowledge_id}/${folder_token}/doc_list`, data, null, loading) + return post(`${prefix.value}/lark/${knowledge_id}/${folder_token}/doc_list`, data, null, loading) } const importLarkDocument: ( @@ -272,14 +279,14 @@ const importLarkDocument: ( data: any, loading?: Ref, ) => Promise>> = (knowledge_id, data, loading) => { - return post(`${prefix}/lark/${knowledge_id}/import`, data, null, loading) + return post(`${prefix.value}/lark/${knowledge_id}/import`, data, null, loading) } const postLarkKnowledge: (data: any, loading?: Ref) => Promise>> = ( data, loading, ) => { - return post(`${prefix}/knowledge/lark/save`, data, null, loading) + return post(`${prefix.value}/lark/save`, data, null, loading) } export default { diff --git a/ui/src/api/knowledge/paragraph.ts b/ui/src/api/knowledge/paragraph.ts index b710a878c..9a7f9d8b0 100644 --- a/ui/src/api/knowledge/paragraph.ts +++ b/ui/src/api/knowledge/paragraph.ts @@ -2,7 +2,14 @@ import { Result } from '@/request/Result' import { get, post, del, put } from '@/request/index' import type { pageRequest } from '@/api/type/common' import type { Ref } from 'vue' -const prefix = '/workspace/' + localStorage.getItem('workspace_id') + '/knowledge' +import useStore from '@/stores' +const prefix: any = { _value: '/workspace/' } +Object.defineProperty(prefix, 'value', { + get: function () { + const { user } = useStore() + return this._value + user.getWorkspaceId() + '/knowledge' + }, +}) /** * 创建段落 @@ -26,7 +33,7 @@ const postParagraph: ( loading?: Ref, ) => Promise> = (knowledge_id, document_id, data, loading) => { return post( - `${prefix}/${knowledge_id}/document/${document_id}/paragraph`, + `${prefix.value}/${knowledge_id}/document/${document_id}/paragraph`, data, undefined, loading, @@ -49,7 +56,7 @@ const getParagraph: ( loading?: Ref, ) => Promise> = (knowledge_id, document_id, page, param, loading) => { return get( - `${prefix}/${knowledge_id}/document/${document_id}/paragraph/${page.current_page}/${page.page_size}`, + `${prefix.value}/${knowledge_id}/document/${document_id}/paragraph/${page.current_page}/${page.page_size}`, param, loading, ) @@ -78,7 +85,7 @@ const putParagraph: ( loading?: Ref, ) => Promise> = (knowledge_id, document_id, paragraph_id, data, loading) => { return put( - `${prefix}/${knowledge_id}/document/${document_id}/paragraph/${paragraph_id}`, + `${prefix.value}/${knowledge_id}/document/${document_id}/paragraph/${paragraph_id}`, data, undefined, loading, @@ -96,7 +103,7 @@ const delParagraph: ( loading?: Ref, ) => Promise> = (knowledge_id, document_id, paragraph_id, loading) => { return del( - `${prefix}/${knowledge_id}/document/${document_id}/paragraph/${paragraph_id}`, + `${prefix.value}/${knowledge_id}/document/${document_id}/paragraph/${paragraph_id}`, undefined, {}, loading, @@ -112,7 +119,7 @@ const getParagraphProblem: ( document_id: string, paragraph_id: string, ) => Promise> = (knowledge_id, document_id, paragraph_id: string) => { - return get(`${prefix}/${knowledge_id}/document/${document_id}/paragraph/${paragraph_id}/problem`) + return get(`${prefix.value}/${knowledge_id}/document/${document_id}/paragraph/${paragraph_id}/problem`) } /** @@ -131,7 +138,7 @@ const postParagraphProblem: ( loading?: Ref, ) => Promise> = (knowledge_id, document_id, paragraph_id, data: any, loading) => { return post( - `${prefix}/${knowledge_id}/document/${document_id}/paragraph/${paragraph_id}/problem`, + `${prefix.value}/${knowledge_id}/document/${document_id}/paragraph/${paragraph_id}/problem`, data, {}, loading, @@ -154,7 +161,7 @@ const putAssociationProblem: ( loading?: Ref, ) => Promise> = (knowledge_id, document_id, data, loading) => { return put( - `${prefix}/${knowledge_id}/document/${document_id}/paragraph/association`, + `${prefix.value}/${knowledge_id}/document/${document_id}/paragraph/association`, {}, data, loading, @@ -172,7 +179,7 @@ const putMulParagraph: ( loading?: Ref, ) => Promise> = (knowledge_id, document_id, data, loading) => { return put( - `${prefix}/${knowledge_id}/document/${document_id}/paragraph/batch_delete`, + `${prefix.value}/${knowledge_id}/document/${document_id}/paragraph/batch_delete`, { id_list: data }, undefined, loading, @@ -198,7 +205,7 @@ const putBatchGenerateRelated: ( loading?: Ref, ) => Promise> = (knowledge_id, document_id, data, loading) => { return put( - `${prefix}/${knowledge_id}/document/${document_id}/paragraph/batch_generate_related`, + `${prefix.value}/${knowledge_id}/document/${document_id}/paragraph/batch_generate_related`, data, undefined, loading, @@ -225,7 +232,7 @@ const putMigrateMulParagraph: ( loading, ) => { return put( - `${prefix}/${knowledge_id}/document/${document_id}/paragraph/migrate/knowledge/${target_knowledge_id}/document/${target_document_id}`, + `${prefix.value}/${knowledge_id}/document/${document_id}/paragraph/migrate/knowledge/${target_knowledge_id}/document/${target_document_id}`, data, undefined, loading, @@ -246,7 +253,7 @@ const putDisassociationProblem: ( loading?: Ref, ) => Promise> = (knowledge_id, document_id, data, loading) => { return put( - `${prefix}/${knowledge_id}/document/${document_id}/paragraph/unassociation`, + `${prefix.value}/${knowledge_id}/document/${document_id}/paragraph/unassociation`, {}, data, loading, diff --git a/ui/src/api/knowledge/problem.ts b/ui/src/api/knowledge/problem.ts index 4fea3b419..c1f10ae27 100644 --- a/ui/src/api/knowledge/problem.ts +++ b/ui/src/api/knowledge/problem.ts @@ -3,7 +3,14 @@ import { get, post, del, put } from '@/request/index' import type { Ref } from 'vue' import type { pageRequest } from '@/api/type/common' -const prefix = '/workspace/' + localStorage.getItem('workspace_id') + '/knowledge' +import useStore from '@/stores' +const prefix: any = { _value: '/workspace/' } +Object.defineProperty(prefix, 'value', { + get: function () { + const { user } = useStore() + return this._value + user.getWorkspaceId() + '/knowledge' + }, +}) /** * 创建问题 @@ -15,7 +22,7 @@ const postProblems: ( data: any, loading?: Ref, ) => Promise> = (knowledge_id, data, loading) => { - return post(`${prefix}/${knowledge_id}/problem`, data, undefined, loading) + return post(`${prefix.value}/${knowledge_id}/problem`, data, undefined, loading) } /** @@ -33,7 +40,7 @@ const getProblems: ( loading?: Ref, ) => Promise> = (knowledge_id, page, param, loading) => { return get( - `${prefix}/${knowledge_id}/problem/${page.current_page}/${page.page_size}`, + `${prefix.value}/${knowledge_id}/problem/${page.current_page}/${page.page_size}`, param, loading, ) @@ -53,7 +60,7 @@ const putProblems: ( data: any, loading?: Ref, ) => Promise> = (knowledge_id, problem_id, data: any, loading) => { - return put(`${prefix}/${knowledge_id}/problem/${problem_id}`, data, undefined, loading) + return put(`${prefix.value}/${knowledge_id}/problem/${problem_id}`, data, undefined, loading) } /** @@ -65,7 +72,7 @@ const delProblems: ( problem_id: string, loading?: Ref, ) => Promise> = (knowledge_id, problem_id, loading) => { - return del(`${prefix}/${knowledge_id}/problem/${problem_id}`, loading) + return del(`${prefix.value}/${knowledge_id}/problem/${problem_id}`, loading) } /** @@ -78,7 +85,7 @@ const getDetailProblems: ( problem_id: string, loading?: Ref, ) => Promise> = (knowledge_id, problem_id, loading) => { - return get(`${prefix}/${knowledge_id}/problem/${problem_id}/paragraph`, undefined, loading) + return get(`${prefix.value}/${knowledge_id}/problem/${problem_id}/paragraph`, undefined, loading) } /** @@ -94,7 +101,7 @@ const putMulAssociationProblem: ( data: any, loading?: Ref, ) => Promise> = (knowledge_id, data, loading) => { - return put(`${prefix}/${knowledge_id}/problem/batch_association`, data, undefined, loading) + return put(`${prefix.value}/${knowledge_id}/problem/batch_association`, data, undefined, loading) } /** @@ -107,7 +114,7 @@ const putMulProblem: ( data: any, loading?: Ref, ) => Promise> = (knowledge_id, data, loading) => { - return put(`${prefix}/${knowledge_id}/problem/batch_delete`, data, undefined, loading) + return put(`${prefix.value}/${knowledge_id}/problem/batch_delete`, data, undefined, loading) } export default { diff --git a/ui/src/api/model/model.ts b/ui/src/api/model/model.ts index 32e7d2639..45d22b97a 100644 --- a/ui/src/api/model/model.ts +++ b/ui/src/api/model/model.ts @@ -9,7 +9,15 @@ import type { } from '@/api/type/model' import type { FormField } from '@/components/dynamics-form/type' -const prefix = '/workspace/' + localStorage.getItem('workspace_id') + +import useStore from '@/stores' +const prefix: any = { _value: '/workspace/' } +Object.defineProperty(prefix, 'value', { + get: function () { + const { user } = useStore() + return this._value + user.getWorkspaceId() + '/model' + }, +}) /** * 获得模型列表 @@ -19,7 +27,7 @@ const getModel: ( request?: ListModelRequest, loading?: Ref, ) => Promise>> = (data, loading) => { - return get(`${prefix}/model`, data, loading) + return get(`${prefix.value}`, data, loading) } /** * 获取工作空间下重排模型列表 @@ -27,7 +35,7 @@ const getModel: ( * @returns 重排模型列表 */ const getRerankerModel: (loading?: Ref) => Promise>> = (loading) => { - return get(`${prefix}/model`, { model_type: 'RERANKER' }, loading) + return get(`${prefix.value}`, { model_type: 'RERANKER' }, loading) } /** @@ -36,7 +44,7 @@ const getRerankerModel: (loading?: Ref) => Promise>> * @returns 语音转文本模型列表 */ const getSTTModel: (loading?: Ref) => Promise>> = (loading) => { - return get(`${prefix}/model`, { model_type: 'STT' }, loading) + return get(`${prefix.value}`, { model_type: 'STT' }, loading) } /** @@ -45,7 +53,7 @@ const getSTTModel: (loading?: Ref) => Promise>> = (lo * @returns */ const getTTSModel: (loading?: Ref) => Promise>> = (loading) => { - return get(`${prefix}/model`, { model_type: 'TTS' }, loading) + return get(`${prefix.value}`, { model_type: 'TTS' }, loading) } /** * 获取图片理解模型列表 @@ -53,7 +61,7 @@ const getTTSModel: (loading?: Ref) => Promise>> = (lo * @returns 图片理解模型列表 */ const getImageModel: (loading?: Ref) => Promise>> = (loading) => { - return get(`${prefix}/model`, { model_type: 'IMAGE' }, loading) + return get(`${prefix.value}`, { model_type: 'IMAGE' }, loading) } /** * 获取图片生成模型列表 @@ -61,7 +69,7 @@ const getImageModel: (loading?: Ref) => Promise>> = ( * @returns 图片生成模型列表 */ const getTTIModel: (loading?: Ref) => Promise>> = (loading) => { - return get(`${prefix}/model`, { model_type: 'TTI' }, loading) + return get(`${prefix.value}`, { model_type: 'TTI' }, loading) } /** * 获取大语言模型列表 @@ -69,7 +77,7 @@ const getTTIModel: (loading?: Ref) => Promise>> = (lo * @returns 大语言模型列表 */ const getLLMModel: (loading?: Ref) => Promise>> = (loading) => { - return get(`${prefix}/model`, { model_type: 'LLM' }, loading) + return get(`${prefix.value}`, { model_type: 'LLM' }, loading) } /** * 获取模型参数表单 @@ -81,7 +89,7 @@ const getModelParamsForm: ( model_id: string, loading?: Ref, ) => Promise>> = (model_id, loading) => { - return get(`${prefix}/model/${model_id}/model_params_form`, {}, loading) + return get(`${prefix.value}/${model_id}/model_params_form`, {}, loading) } /** @@ -94,7 +102,7 @@ const createModel: ( request: CreateModelRequest, loading?: Ref, ) => Promise> = (request, loading) => { - return post(`${prefix}/model`, request, {}, loading) + return post(`${prefix.value}`, request, {}, loading) } /** @@ -108,7 +116,7 @@ const updateModel: ( request: EditModelRequest, loading?: Ref, ) => Promise> = (model_id, request, loading) => { - return put(`${prefix}/model/${model_id}`, request, {}, loading) + return put(`${prefix.value}/${model_id}`, request, {}, loading) } /** @@ -122,7 +130,7 @@ const updateModelParamsForm: ( request: any[], loading?: Ref, ) => Promise> = (model_id, request, loading) => { - return put(`${prefix}/model/${model_id}/model_params_form`, request, {}, loading) + return put(`${prefix.value}/${model_id}/model_params_form`, request, {}, loading) } /** @@ -135,7 +143,7 @@ const getModelById: (model_id: string, loading?: Ref) => Promise { - return get(`${prefix}/model/${model_id}`, {}, loading) + return get(`${prefix.value}/${model_id}`, {}, loading) } /** * 获取模型信息不包括认证信息根据模型id @@ -147,7 +155,7 @@ const getModelMetaById: (model_id: string, loading?: Ref) => Promise { - return get(`${prefix}/model/${model_id}/meta`, {}, loading) + return get(`${prefix.value}/${model_id}/meta`, {}, loading) } /** * 暂停下载 @@ -159,13 +167,13 @@ const pauseDownload: (model_id: string, loading?: Ref) => Promise { - return put(`${prefix}/model/${model_id}/pause_download`, undefined, {}, loading) + return put(`${prefix.value}/${model_id}/pause_download`, undefined, {}, loading) } const deleteModel: (model_id: string, loading?: Ref) => Promise> = ( model_id, loading, ) => { - return del(`${prefix}/model/${model_id}`, undefined, {}, loading) + return del(`${prefix.value}/${model_id}`, undefined, {}, loading) } export default { getModel, diff --git a/ui/src/api/shared/authorization.ts b/ui/src/api/shared/authorization.ts new file mode 100644 index 000000000..68c042430 --- /dev/null +++ b/ui/src/api/shared/authorization.ts @@ -0,0 +1,63 @@ +import { Result } from '@/request/Result' +import { get, post, del, put, exportFile, exportExcel } from '@/request/index' +import { type Ref } from 'vue' +import type { pageRequest } from '@/api/type/common' +import type { knowledgeData } from '@/api/type/knowledge' + +const prefix = '/system/shared' + +const getSharedAuthorizationKnowledge: ( + knowledge_id: string, + loading?: Ref, +) => Promise>> = (knowledge_id, loading) => { + return get(`${prefix}/knowledge/${knowledge_id}/authorization`, {}, loading) +} + +const postSharedAuthorizationKnowledge: ( + knowledge_id: string, + param?: any, + loading?: Ref, +) => Promise>> = (knowledge_id, param, loading) => { + return post(`${prefix}/knowledge/${knowledge_id}/authorization`, param, loading) +} + +const getSharedAuthorizationTool: ( + knowledge_id: string, + loading?: Ref, +) => Promise>> = (knowledge_id, loading) => { + return get(`${prefix}/tool/${knowledge_id}/authorization`, {}, loading) +} + +const postSharedAuthorizationTool: ( + knowledge_id: string, + param?: any, + loading?: Ref, +) => Promise>> = (knowledge_id, param, loading) => { + return post(`${prefix}/tool/${knowledge_id}/authorization`, param, loading) +} + +const getSharedAuthorizationModel: ( + knowledge_id: string, + loading?: Ref, +) => Promise>> = (knowledge_id, loading) => { + return get(`${prefix}/model/${knowledge_id}/authorization`, {}, loading) +} + +const postSharedAuthorizationModel: ( + knowledge_id: string, + param?: any, + loading?: Ref, +) => Promise>> = (knowledge_id, param, loading) => { + return post(`${prefix}/model/${knowledge_id}/authorization`, param, loading) +} + +export default { + getSharedAuthorizationKnowledge, + postSharedAuthorizationKnowledge, + getSharedAuthorizationTool, + postSharedAuthorizationTool, + getSharedAuthorizationModel, + postSharedAuthorizationModel, +} as { + [key: string]: any +} diff --git a/ui/src/api/shared/knowledge.ts b/ui/src/api/shared/knowledge.ts index 78e7a5256..4bd92e7a0 100644 --- a/ui/src/api/shared/knowledge.ts +++ b/ui/src/api/shared/knowledge.ts @@ -4,65 +4,8 @@ import { type Ref } from 'vue' import type { pageRequest } from '@/api/type/common' import type { knowledgeData } from '@/api/type/knowledge' +import useStore from '@/stores' const prefix = '/system/shared' -const workspace_id = localStorage.getItem('workspace_id') || 'default' -const getSharedWorkspaceKnowledge: (loading?: Ref) => Promise>> = ( - loading, -) => { - return get(`${prefix}/workspace/${workspace_id}/knowledge`, {}, loading) -} - -const getSharedWorkspaceKnowledgePage: ( - param: any, - loading?: Ref, -) => Promise>> = (param: any, loading) => { - return get(`${prefix}/workspace/${workspace_id}/knowledge`, param, loading) -} - -const getSharedAuthorizationKnowledgeGet: ( - knowledge_id: string, - loading?: Ref, -) => Promise>> = (knowledge_id, loading) => { - return get(`${prefix}/knowledge/${knowledge_id}/authorization`, {}, loading) -} - -const getSharedAuthorizationKnowledgePost: ( - knowledge_id: string, - param?: any, - loading?: Ref, -) => Promise>> = (knowledge_id, param, loading) => { - return post(`${prefix}/knowledge/${knowledge_id}/authorization`, param, loading) -} - -const getSharedAuthorizationToolGet: ( - knowledge_id: string, - loading?: Ref, -) => Promise>> = (knowledge_id, loading) => { - return get(`${prefix}/tool/${knowledge_id}/authorization`, {}, loading) -} - -const getSharedAuthorizationToolPost: ( - knowledge_id: string, - param?: any, - loading?: Ref, -) => Promise>> = (knowledge_id, param, loading) => { - return post(`${prefix}/tool/${knowledge_id}/authorization`, param, loading) -} - -const getSharedAuthorizationModelGet: ( - knowledge_id: string, - loading?: Ref, -) => Promise>> = (knowledge_id, loading) => { - return get(`${prefix}/model/${knowledge_id}/authorization`, {}, loading) -} - -const getSharedAuthorizationModelPost: ( - knowledge_id: string, - param?: any, - loading?: Ref, -) => Promise>> = (knowledge_id, param, loading) => { - return post(`${prefix}/model/${knowledge_id}/authorization`, param, loading) -} /** * 获得知识库文件夹列表 @@ -356,18 +299,10 @@ export default { postKnowledge, getKnowledgeModel, postWebKnowledge, - getSharedWorkspaceKnowledge, - getSharedWorkspaceKnowledgePage, - getSharedAuthorizationKnowledgeGet, - getSharedAuthorizationKnowledgePost, - getSharedAuthorizationToolGet, - getSharedAuthorizationToolPost, - getSharedAuthorizationModelGet, - getSharedAuthorizationModelPost, getLarkDocumentList, importLarkDocument, - postLarkKnowledge + postLarkKnowledge, } as { [key: string]: any } diff --git a/ui/src/api/shared/model.ts b/ui/src/api/shared/model.ts index 467294a0f..d9594fc30 100644 --- a/ui/src/api/shared/model.ts +++ b/ui/src/api/shared/model.ts @@ -120,20 +120,6 @@ const deleteModel: (model_id: string, loading?: Ref) => Promise) => Promise>> = ( - loading, -) => { - return get(`${prefix}/workspace/${workspace_id}/model`, {}, loading) -} - -const getSharedWorkspaceModelPage: ( - param: any, - loading?: Ref, -) => Promise>> = (param: any, loading) => { - return get(`${prefix}/workspace/${workspace_id}/model`, param, loading) -} export default { getModel, createModel, @@ -144,6 +130,4 @@ export default { pauseDownload, getModelParamsForm, updateModelParamsForm, - getSharedWorkspaceModel, - getSharedWorkspaceModelPage } diff --git a/ui/src/api/shared/tool.ts b/ui/src/api/shared/tool.ts index 17dc07244..17f14ad67 100644 --- a/ui/src/api/shared/tool.ts +++ b/ui/src/api/shared/tool.ts @@ -5,7 +5,6 @@ import type { pageRequest } from '@/api/type/common' import type { toolData } from '@/api/type/tool' const prefix = '/system/shared' -const workspace_id = localStorage.getItem('workspace_id') || 'default' /** * 获得工具文件夹列表 @@ -121,18 +120,7 @@ const postPylint: (code: string, loading?: Ref) => Promise> return post(`${prefix}/tool/pylint`, { code }, {}, loading) } -const getSharedWorkspaceTool: (loading?: Ref) => Promise>> = ( - loading, -) => { - return get(`${prefix}/workspace/${workspace_id}/tool`, {}, loading) -} -const getSharedWorkspaceToolPage: ( - param: any, - loading?: Ref, -) => Promise>> = (param: any, loading) => { - return get(`${prefix}/workspace/${workspace_id}/tool`, param, loading) -} export default { getToolByFolder, @@ -146,6 +134,4 @@ export default { exportTool, putToolIcon, delTool, - getSharedWorkspaceTool, - getSharedWorkspaceToolPage } diff --git a/ui/src/api/shared/workspace.ts b/ui/src/api/shared/workspace.ts new file mode 100644 index 000000000..dafe1260f --- /dev/null +++ b/ui/src/api/shared/workspace.ts @@ -0,0 +1,68 @@ +import { Result } from '@/request/Result' +import { get, post, del, put, exportFile, exportExcel } from '@/request/index' +import { type Ref } from 'vue' +import type { pageRequest } from '@/api/type/common' +import type { knowledgeData } from '@/api/type/knowledge' + +import useStore from '@/stores' +const prefix = '/system/shared' +const prefix_workspace: any = { _value: '/workspace/' } +Object.defineProperty(prefix, 'value', { + get: function () { + const { user } = useStore() + return this._value + user.getWorkspaceId() + }, +}) + +const getSharedWorkspaceKnowledge: (loading?: Ref) => Promise>> = ( + loading, +) => { + return get(`${prefix}/${prefix_workspace.value}/knowledge`, {}, loading) +} + +const getSharedWorkspaceKnowledgePage: ( + page: pageRequest, + param: any, + loading?: Ref, +) => Promise>> = (page, param, loading) => { + return get( + `${prefix}/${prefix_workspace.value}/knowledge/${page.current_page}/${page.page_size}`, + param, + loading, + ) +} + +const getSharedWorkspaceModel: (loading?: Ref) => Promise>> = ( + loading, +) => { + return get(`${prefix}/${prefix_workspace.value}/model`, {}, loading) +} + +const getSharedWorkspaceModelPage: ( + param: any, + loading?: Ref, +) => Promise>> = (param: any, loading) => { + return get(`${prefix}/${prefix_workspace.value}/model`, param, loading) +} + +const getSharedWorkspaceTool: (loading?: Ref) => Promise>> = ( + loading, +) => { + return get(`${prefix}/${prefix_workspace.value}/tool`, {}, loading) +} + +const getSharedWorkspaceToolPage: ( + param: any, + loading?: Ref, +) => Promise>> = (param: any, loading) => { + return get(`${prefix}/${prefix_workspace.value}/tool`, param, loading) +} + +export default { + getSharedWorkspaceKnowledge, + getSharedWorkspaceKnowledgePage, + getSharedWorkspaceModel, + getSharedWorkspaceModelPage, + getSharedWorkspaceTool, + getSharedWorkspaceToolPage, +} diff --git a/ui/src/api/tool/tool.ts b/ui/src/api/tool/tool.ts index 75d9bb0fe..79f2242e6 100644 --- a/ui/src/api/tool/tool.ts +++ b/ui/src/api/tool/tool.ts @@ -4,7 +4,15 @@ import { type Ref } from 'vue' import type { pageRequest } from '@/api/type/common' import type { toolData } from '@/api/type/tool' -const prefix = '/workspace/' + localStorage.getItem('workspace_id') + +import useStore from '@/stores' +const prefix: any = { _value: '/workspace/' } +Object.defineProperty(prefix, 'value', { + get: function () { + const { user } = useStore() + return this._value + user.getWorkspaceId() + '/tool' + }, +}) /** * 获得工具文件夹列表 @@ -14,7 +22,7 @@ const getToolByFolder: (data?: any, loading?: Ref) => Promise { - return get(`${prefix}/tool`, data, loading) + return get(`${prefix.value}`, data, loading) } /** @@ -31,7 +39,7 @@ const getToolList: ( param?: any, loading?: Ref, ) => Promise> = (page, param, loading) => { - return get(`${prefix}/tool/${page.current_page}/${page.page_size}`, param, loading) + return get(`${prefix.value}/${page.current_page}/${page.page_size}`, param, loading) } /** @@ -42,7 +50,7 @@ const postTool: (data: toolData, loading?: Ref) => Promise> data, loading, ) => { - return post(`${prefix}/tool`, data, undefined, loading) + return post(`${prefix.value}`, data, undefined, loading) } /** @@ -55,7 +63,7 @@ const putTool: (tool_id: string, data: toolData, loading?: Ref) => Prom data, loading, ) => { - return put(`${prefix}/tool/${tool_id}`, data, undefined, loading) + return put(`${prefix.value}/${tool_id}`, data, undefined, loading) } /** @@ -68,7 +76,7 @@ const getToolById: (tool_id: string, loading?: Ref) => Promise { - return get(`${prefix}/tool/${tool_id}`, undefined, loading) + return get(`${prefix.value}/${tool_id}`, undefined, loading) } /** @@ -79,7 +87,7 @@ const delTool: ( tool_id: String, loading?: Ref ) => Promise> = (tool_id, loading) => { - return del(`${prefix}/${tool_id}`, undefined, {}, loading) + return del(`${prefix.value}/${tool_id}`, undefined, {}, loading) } const putToolIcon: ( @@ -87,11 +95,11 @@ const putToolIcon: ( data: any, loading?: Ref ) => Promise> = (id, data, loading) => { - return put(`${prefix}/tool/${id}/edit_icon`, data, undefined, loading) + return put(`${prefix.value}/${id}/edit_icon`, data, undefined, loading) } const exportTool = (id: string, name: string, loading?: Ref) => { - return exportFile(name + '.fx', `${prefix}/${id}/export`, undefined, loading) + return exportFile(name + '.fx', `${prefix.value}/${id}/export`, undefined, loading) } /** @@ -103,21 +111,21 @@ const postToolDebug: (data: any, loading?: Ref) => Promise> data: any, loading, ) => { - return post(`${prefix}/tool/debug`, data, undefined, loading) + return post(`${prefix.value}/debug`, data, undefined, loading) } const postImportTool: (data: any, loading?: Ref) => Promise> = ( data, loading, ) => { - return post(`${prefix}/tool/import`, data, undefined, loading) + return post(`${prefix.value}/import`, data, undefined, loading) } const postPylint: (code: string, loading?: Ref) => Promise> = ( code, loading, ) => { - return post(`${prefix}/tool/pylint`, { code }, {}, loading) + return post(`${prefix.value}/pylint`, { code }, {}, loading) } export default { diff --git a/ui/src/api/user/resource-authorization.ts b/ui/src/api/user/resource-authorization.ts index 66ba67562..078d0154e 100644 --- a/ui/src/api/user/resource-authorization.ts +++ b/ui/src/api/user/resource-authorization.ts @@ -3,7 +3,15 @@ import { get, put, post, del } from '@/request/index' import type { pageRequest } from '@/api/type/common' import type { Ref } from 'vue' -const prefix = '/workspace/' + localStorage.getItem('workspace_id') +import useStore from '@/stores' +const prefix: any = { _value: '/workspace/' } +Object.defineProperty(prefix, 'value', { + get: function () { + const { user } = useStore() + return this._value + user.getWorkspaceId() + }, +}) + /** * 获取成员列表 diff --git a/ui/src/router/modules/2knowledge-shared-system.ts b/ui/src/router/modules/2knowledge-shared-system.ts index 82483c6fe..71c8a5fa5 100644 --- a/ui/src/router/modules/2knowledge-shared-system.ts +++ b/ui/src/router/modules/2knowledge-shared-system.ts @@ -6,12 +6,12 @@ const ModelRouter = { redirect: '/knowledge', component: () => import('@/layout/layout-template/SimpleLayout.vue'), children: [ - + { path: '/knowledge/system/document/upload/shared', name: 'UploadDocumentSharedSystem', meta: { activeMenu: '/knowledge1/system' }, - component: () => import('@/views/document-shared-system/UploadDocument.vue'), + component: () => import('@/views/shared/document-shared/UploadDocument.vue'), hidden: true, }, ], diff --git a/ui/src/router/modules/document-shared-system.ts b/ui/src/router/modules/document-shared-system.ts index b6b682310..e974494d1 100644 --- a/ui/src/router/modules/document-shared-system.ts +++ b/ui/src/router/modules/document-shared-system.ts @@ -16,7 +16,7 @@ const DocumentRouter = { parentPath: '/knowledge/system/:id/', parentName: 'KnowledgeDetailSharedSystem', }, - component: () => import('@/views/document-shared-system/index.vue'), + component: () => import('@/views/shared/document-shared/index.vue'), }, { path: 'problemShared', @@ -29,7 +29,7 @@ const DocumentRouter = { parentPath: '/knowledge/system/:id/', parentName: 'KnowledgeDetailSharedSystem', }, - component: () => import('@/views/problem-shared-system/index.vue'), + component: () => import('@/views/shared/problem-shared/index.vue'), }, { path: 'hit-test-shared', @@ -41,7 +41,7 @@ const DocumentRouter = { parentPath: '/knowledge/system/:id/', parentName: 'KnowledgeDetailSharedSystem', }, - component: () => import('@/views/hit-test-shared-system/index.vue'), + component: () => import('@/views/shared/hit-test-shared/index.vue'), }, { path: 'settingShared', @@ -54,7 +54,7 @@ const DocumentRouter = { parentPath: '/knowledge/system/:id/', parentName: 'KnowledgeDetailSharedSystem', }, - component: () => import('@/views/knowledge-shared-system/KnowledgeSetting.vue'), + component: () => import('@/views/shared/knowledge-shared/KnowledgeSetting.vue'), } ], } diff --git a/ui/src/router/modules/paragraph-shared-system.ts b/ui/src/router/modules/paragraph-shared-system.ts index 9a83d8222..c0258fce8 100644 --- a/ui/src/router/modules/paragraph-shared-system.ts +++ b/ui/src/router/modules/paragraph-shared-system.ts @@ -9,7 +9,7 @@ const ParagraphRouter = { path: '/paragraph/system/:id/:documentId/shared', name: 'ParagraphIndexSharedSystem', meta: { activeMenu: '/knowledge' }, - component: () => import('@/views/paragraph-shared-system/index.vue'), + component: () => import('@/views/shared/paragraph-shared/index.vue'), }, ], } diff --git a/ui/src/router/modules/system.ts b/ui/src/router/modules/system.ts index 2be64803e..9049a2a83 100644 --- a/ui/src/router/modules/system.ts +++ b/ui/src/router/modules/system.ts @@ -79,7 +79,7 @@ const systemRouter = { parentPath: '/system', parentName: 'system', }, - component: () => import('@/views/knowledge-shared-system/index.vue'), + component: () => import('@/views/shared/knowledge-shared/index.vue'), }, { path: '/system/shared/tool', @@ -90,7 +90,7 @@ const systemRouter = { parentPath: '/system', parentName: 'system', }, - component: () => import('@/views/tool-shared-system/index.vue'), + component: () => import('@/views/shared/tool-shared/index.vue'), }, { path: '/system/shared/model', @@ -101,7 +101,7 @@ const systemRouter = { parentPath: '/system', parentName: 'system', }, - component: () => import('@/views/model-shared-system/index.vue'), + component: () => import('@/views/shared/model-shared/index.vue'), }, ], }, diff --git a/ui/src/views/knowledge/index.vue b/ui/src/views/knowledge/index.vue index 7d82c36fc..1d0806be3 100644 --- a/ui/src/views/knowledge/index.vue +++ b/ui/src/views/knowledge/index.vue @@ -286,7 +286,7 @@ import CreateLarkKnowledgeDialog from './create-component/CreateLarkKnowledgeDia import CreateFolderDialog from '@/components/folder-tree/CreateFolderDialog.vue' import GenerateRelatedDialog from '@/components/generate-related-dialog/index.vue' import KnowledgeApi from '@/api/knowledge/knowledge' -import SharedWorkspace from '@/views/knowledge-shared-system/SharedWorkspace.vue' +import SharedWorkspace from '@/views/shared/knowledge-shared/SharedWorkspace.vue' import { MsgSuccess, MsgConfirm } from '@/utils/message' import useStore from '@/stores' import { numberFormat } from '@/utils/common' diff --git a/ui/src/views/model/index.vue b/ui/src/views/model/index.vue index 433d31c93..b1d8b8fe8 100644 --- a/ui/src/views/model/index.vue +++ b/ui/src/views/model/index.vue @@ -126,7 +126,7 @@ import ProviderComponent from '@/views/model/component/Provider.vue' import { splitArray } from '@/utils/common' import { modelTypeList, allObj } from '@/views/model/component/data' import CreateModelDialog from '@/views/model/component/CreateModelDialog.vue' -import SharedWorkspace from '@/views/model-shared-system/SharedWorkspace.vue' +import SharedWorkspace from '@/views/shared/model-shared/SharedWorkspace.vue' import SelectProviderDialog from '@/views/model/component/SelectProviderDialog.vue' import useStore from '@/stores' import { t } from '@/locales' diff --git a/ui/src/views/knowledge-shared-system/AuthorizedWorkspace.vue b/ui/src/views/shared/AuthorizedWorkspaceDialog.vue similarity index 97% rename from ui/src/views/knowledge-shared-system/AuthorizedWorkspace.vue rename to ui/src/views/shared/AuthorizedWorkspaceDialog.vue index d9f55ec71..3f9ad0054 100644 --- a/ui/src/views/knowledge-shared-system/AuthorizedWorkspace.vue +++ b/ui/src/views/shared/AuthorizedWorkspaceDialog.vue @@ -80,7 +80,7 @@ import { ref, computed } from 'vue' import type { CheckboxValueType } from 'element-plus' import iconMap from '@/components/app-icon/icons/common' import { Search } from '@element-plus/icons-vue' -import KnowledgeApi from '@/api/shared/knowledge' +import authorizationApi from '@/api/shared/authorization' const checkAll = ref(false) const isIndeterminate = ref(true) @@ -129,7 +129,7 @@ const open = ({ id }: any, type = 'Knowledge') => { listType.value = 'WHITE_LIST' loading.value = true currentType = type - KnowledgeApi[`getSharedAuthorization${type}Get`](id) + authorizationApi[`getSharedAuthorization${type}`](id) .then((res: any) => { auth_list = (res.data || {}).auth_list || [] un_auth_list = (res.data || {}).un_auth_list || [] @@ -143,7 +143,7 @@ const open = ({ id }: any, type = 'Knowledge') => { } const handleConfirm = () => { - KnowledgeApi[`getSharedAuthorization${currentType}Post`](knowledge_id, { + authorizationApi[`postSharedAuthorization${currentType}`](knowledge_id, { workspace_id_list: checkedWorkspace.value, authentication_type: listType.value, }).then(() => { diff --git a/ui/src/views/document-shared-system/UploadDocument.vue b/ui/src/views/shared/document-shared/UploadDocument.vue similarity index 100% rename from ui/src/views/document-shared-system/UploadDocument.vue rename to ui/src/views/shared/document-shared/UploadDocument.vue diff --git a/ui/src/views/document-shared-system/component/EmbeddingContentDialog.vue b/ui/src/views/shared/document-shared/component/EmbeddingContentDialog.vue similarity index 100% rename from ui/src/views/document-shared-system/component/EmbeddingContentDialog.vue rename to ui/src/views/shared/document-shared/component/EmbeddingContentDialog.vue diff --git a/ui/src/views/document-shared-system/component/ImportDocumentDialog.vue b/ui/src/views/shared/document-shared/component/ImportDocumentDialog.vue similarity index 100% rename from ui/src/views/document-shared-system/component/ImportDocumentDialog.vue rename to ui/src/views/shared/document-shared/component/ImportDocumentDialog.vue diff --git a/ui/src/views/document-shared-system/component/SelectKnowledgeDialog.vue b/ui/src/views/shared/document-shared/component/SelectKnowledgeDialog.vue similarity index 100% rename from ui/src/views/document-shared-system/component/SelectKnowledgeDialog.vue rename to ui/src/views/shared/document-shared/component/SelectKnowledgeDialog.vue diff --git a/ui/src/views/document-shared-system/component/Status.vue b/ui/src/views/shared/document-shared/component/Status.vue similarity index 97% rename from ui/src/views/document-shared-system/component/Status.vue rename to ui/src/views/shared/document-shared/component/Status.vue index 6b78d66d0..f73b823ac 100644 --- a/ui/src/views/document-shared-system/component/Status.vue +++ b/ui/src/views/shared/document-shared/component/Status.vue @@ -41,7 +41,7 @@