diff --git a/ui/src/api/folder.ts b/ui/src/api/folder.ts index f4c5ba777..f543ce501 100644 --- a/ui/src/api/folder.ts +++ b/ui/src/api/folder.ts @@ -44,7 +44,57 @@ const postFolder: ( return post(`${prefix.value}/${source}/folder`, data, loading) } +/** + * 获得文件夹详情 + * @params 参数 + * folder_id + * source : APPLICATION, KNOWLEDGE, TOOL + */ +const getFolderDetail: ( + folder_id: string, + source: string, + loading?: Ref, +) => Promise>> = (folder_id, source, loading) => { + return get(`${prefix.value}/${source}/folder/${folder_id}`, null, loading) +} +/** + * 修改文件夹 + * @params 参数 + * folder_id: string, + * source : APPLICATION, KNOWLEDGE, TOOL + { + "name": "string", + "desc": "string", + "parent_id": "root" + } + */ +const putFolder: ( + folder_id: string, + source: string, + data?: any, + loading?: Ref, +) => Promise>> = (folder_id, source, data, loading) => { + return put(`${prefix.value}/${source}/folder/${folder_id}`, data, {}, loading) +} + +/** + * 删除文件夹 + * @params 参数 + * folder_id + * source : APPLICATION, KNOWLEDGE, TOOL + */ +const delFolder: ( + folder_id: string, + source: string, + loading?: Ref, +) => Promise> = (folder_id, source, loading) => { + return del(`${prefix.value}/${source}/folder${folder_id}`, undefined, {}, loading) +} + export default { getFolder, postFolder, + getFolderDetail, + putFolder, + delFolder, } diff --git a/ui/src/api/shared/authorization.ts b/ui/src/api/shared/authorization.ts index 68c042430..18a47bcbe 100644 --- a/ui/src/api/shared/authorization.ts +++ b/ui/src/api/shared/authorization.ts @@ -1,8 +1,6 @@ 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' diff --git a/ui/src/api/shared/knowledge.ts b/ui/src/api/shared/knowledge.ts index a8ef430c4..a7949f898 100644 --- a/ui/src/api/shared/knowledge.ts +++ b/ui/src/api/shared/knowledge.ts @@ -190,7 +190,7 @@ const postKnowledge: (data: knowledgeData, loading?: Ref) => Promise) => Promise { return post(`${prefix}/web`, data, undefined, loading) } + +// 创建飞书知识库 const postLarkKnowledge: (data: any, loading?: Ref) => Promise>> = ( data, loading, diff --git a/ui/src/api/shared/model.ts b/ui/src/api/shared/model.ts index 8e2d53aa7..6d56ea4d5 100644 --- a/ui/src/api/shared/model.ts +++ b/ui/src/api/shared/model.ts @@ -9,7 +9,7 @@ import type { } from '@/api/type/model' import type { FormField } from '@/components/dynamics-form/type' -const prefix = '/system/shared' +const prefix = '/system/shared/model' /** * 获得模型列表 @@ -19,7 +19,7 @@ const getModel: ( request?: ListModelRequest, loading?: Ref, ) => Promise>> = (data, loading) => { - return get(`${prefix}/model`, data, loading) + return get(`${prefix}`, data, loading) } /** @@ -32,7 +32,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}/${model_id}/model_params_form`, {}, loading) } /** @@ -45,7 +45,7 @@ const createModel: ( request: CreateModelRequest, loading?: Ref, ) => Promise> = (request, loading) => { - return post(`${prefix}/model`, request, {}, loading) + return post(`${prefix}`, request, {}, loading) } /** @@ -59,7 +59,7 @@ const updateModel: ( request: EditModelRequest, loading?: Ref, ) => Promise> = (model_id, request, loading) => { - return put(`${prefix}/model/${model_id}`, request, {}, loading) + return put(`${prefix}/${model_id}`, request, {}, loading) } /** @@ -73,7 +73,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}/${model_id}/model_params_form`, request, {}, loading) } /** @@ -86,7 +86,7 @@ const getModelById: (model_id: string, loading?: Ref) => Promise { - return get(`${prefix}/model/${model_id}`, {}, loading) + return get(`${prefix}/${model_id}`, {}, loading) } /** * 获取模型信息不包括认证信息根据模型id @@ -98,7 +98,7 @@ const getModelMetaById: (model_id: string, loading?: Ref) => Promise { - return get(`${prefix}/model/${model_id}/meta`, {}, loading) + return get(`${prefix}/${model_id}/meta`, {}, loading) } /** * 暂停下载 @@ -110,13 +110,13 @@ const pauseDownload: (model_id: string, loading?: Ref) => Promise { - return put(`${prefix}/model/${model_id}/pause_download`, undefined, {}, loading) + return put(`${prefix}/${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}/${model_id}`, undefined, {}, loading) } export default { diff --git a/ui/src/api/shared/paragraph.ts b/ui/src/api/shared/paragraph.ts index e340ea3e6..785e4381b 100644 --- a/ui/src/api/shared/paragraph.ts +++ b/ui/src/api/shared/paragraph.ts @@ -138,6 +138,29 @@ 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}/${knowledge_id}/document/${document_id}/paragraph/adjust_position`, + {}, + data, + loading, + ) +} + /** * 添加某段落关联问题 * @param knowledge_id 数据集id diff --git a/ui/src/api/shared/tool.ts b/ui/src/api/shared/tool.ts index caaaec6c6..d91549aac 100644 --- a/ui/src/api/shared/tool.ts +++ b/ui/src/api/shared/tool.ts @@ -4,7 +4,7 @@ import { type Ref } from 'vue' import type { pageRequest } from '@/api/type/common' import type { toolData } from '@/api/type/tool' -const prefix = '/system/shared' +const prefix = '/system/shared/tool' /** * 工具列表带分页(无分页) @@ -14,7 +14,7 @@ const getToolList: (data?: any, loading?: Ref) => Promise { - return get(`${prefix}/tool`, data, loading) + return get(`${prefix}`, data, loading) } /** @@ -31,7 +31,7 @@ const getToolListPage: ( param?: any, loading?: Ref, ) => Promise> = (page, param, loading) => { - return get(`${prefix}/tool/${page.current_page}/${page.page_size}`, param, loading) + return get(`${prefix}/${page.current_page}/${page.page_size}`, param, loading) } /** @@ -42,7 +42,7 @@ const postTool: (data: toolData, loading?: Ref) => Promise> data, loading, ) => { - return post(`${prefix}/tool`, data, undefined, loading) + return post(`${prefix}`, data, undefined, loading) } /** @@ -55,7 +55,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}/${tool_id}`, data, undefined, loading) } /** @@ -68,7 +68,7 @@ const getToolById: (tool_id: string, loading?: Ref) => Promise { - return get(`${prefix}/tool/${tool_id}`, undefined, loading) + return get(`${prefix}/${tool_id}`, undefined, loading) } /** @@ -117,7 +117,7 @@ const postPylint: (code: string, loading?: Ref) => Promise> code, loading, ) => { - return post(`${prefix}/tool/pylint`, { code }, {}, loading) + return post(`${prefix}/pylint`, { code }, {}, loading) } diff --git a/ui/src/api/system-api-key.ts b/ui/src/api/system/api-key.ts similarity index 100% rename from ui/src/api/system-api-key.ts rename to ui/src/api/system/api-key.ts diff --git a/ui/src/api/workspace/role.ts b/ui/src/api/workspace/role.ts index 9d091fbd2..c0aba7c0e 100644 --- a/ui/src/api/workspace/role.ts +++ b/ui/src/api/workspace/role.ts @@ -1,7 +1,13 @@ import { get, post, del } from '@/request/index' import type { Ref } from 'vue' import { Result } from '@/request/Result' -import type { RoleItem, RolePermissionItem, CreateOrUpdateParams, RoleMemberItem, CreateMemberParamsItem } from '@/api/type/role' +import type { + RoleItem, + RolePermissionItem, + CreateOrUpdateParams, + RoleMemberItem, + CreateMemberParamsItem, +} from '@/api/type/role' import { RoleTypeEnum } from '@/enums/system' import type { pageRequest, PageList } from '@/api/type/common' @@ -9,7 +15,9 @@ const prefix = '/workspace/role' /** * 获取角色列表 */ -const getRoleList: (loading?: Ref) => Promise> = (loading) => { +const getRoleList: ( + loading?: Ref, +) => Promise> = (loading) => { return get(`${prefix}`, undefined, loading) } @@ -24,7 +32,36 @@ const CreateMember: ( return post(`${prefix}/${role_id}/add_member`, data, undefined, loading) } +/** + * 获取角色成员列表 + */ +const getRoleMemberList: ( + role_id: string, + page: pageRequest, + param: any, + loading?: Ref, +) => Promise>> = (role_id, page, param, loading) => { + return get( + `${prefix}/${role_id}/user_list/${page.current_page}/${page.page_size}`, + param, + loading, + ) +} + +/** + * 删除角色成员 + */ +const deleteRoleMember: ( + role_id: string, + user_relation_id: string, + loading?: Ref, +) => Promise> = (role_id, user_relation_id, loading) => { + return del(`${prefix}/${role_id}/remove_member/${user_relation_id}`, undefined, {}, loading) +} + export default { getRoleList, CreateMember, + getRoleMemberList, + deleteRoleMember, } diff --git a/ui/src/api/workspace.ts b/ui/src/api/workspace/workspace.ts similarity index 100% rename from ui/src/api/workspace.ts rename to ui/src/api/workspace/workspace.ts diff --git a/ui/src/layout/layout-header/avatar/APIKeyDialog.vue b/ui/src/layout/layout-header/avatar/APIKeyDialog.vue index 64dd08548..d38784db5 100644 --- a/ui/src/layout/layout-header/avatar/APIKeyDialog.vue +++ b/ui/src/layout/layout-header/avatar/APIKeyDialog.vue @@ -70,7 +70,7 @@ import { ref, watch } from 'vue' import { useRoute } from 'vue-router' import { copyClick } from '@/utils/clipboard' -import systemKeyApi from '@/api/system-api-key' +import systemKeyApi from '@/api/system/api-key' import { datetimeFormat } from '@/utils/time' import { MsgSuccess, MsgConfirm } from '@/utils/message' import { t } from '@/locales' diff --git a/ui/src/layout/layout-header/workspace-dropdown/index.vue b/ui/src/layout/layout-header/workspace-dropdown/index.vue index f794f64c2..126c389d7 100644 --- a/ui/src/layout/layout-header/workspace-dropdown/index.vue +++ b/ui/src/layout/layout-header/workspace-dropdown/index.vue @@ -36,7 +36,7 @@ diff --git a/ui/src/views/workspace/component/AddMemberDrawer.vue b/ui/src/views/workspace/component/AddMemberDrawer.vue index 354103dde..900843dac 100644 --- a/ui/src/views/workspace/component/AddMemberDrawer.vue +++ b/ui/src/views/workspace/component/AddMemberDrawer.vue @@ -21,7 +21,7 @@ \ No newline at end of file + diff --git a/ui/src/views/workspace/index.vue b/ui/src/views/workspace/index.vue index aaca24189..7e118e7d4 100644 --- a/ui/src/views/workspace/index.vue +++ b/ui/src/views/workspace/index.vue @@ -75,7 +75,7 @@