diff --git a/ui/src/api/chat-user/chat-user.ts b/ui/src/api/chat-user/chat-user.ts index 0c8a39073..f9f0d1739 100644 --- a/ui/src/api/chat-user/chat-user.ts +++ b/ui/src/api/chat-user/chat-user.ts @@ -3,13 +3,20 @@ import { Result } from '@/request/Result' import { get, put } from '@/request/index' import type { ChatUserGroupItem, ChatUserGroupUserItem, ChatUserResourceParams, putUserGroupUserParams } from '@/api/type/workspaceChatUser' import type { pageRequest, PageList } 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() + }, +}) /** * 获取用户组列表 */ const getUserGroupList: (resource: ChatUserResourceParams, loading?: Ref) => Promise> = (resource, loading) => { - return get(`${prefix}/${resource.resource_type}/${resource.resource_id}/user_group`, undefined, loading) + return get(`${prefix.value}/${resource.resource_type}/${resource.resource_id}/user_group`, undefined, loading) } /** @@ -23,7 +30,7 @@ const getUserGroupUserList: ( loading?: Ref, ) => Promise>> = (resource, user_group_id, page, username_or_nickname, loading) => { return get( - `${prefix}/${resource.resource_type}/${resource.resource_id}/user_group_id/${user_group_id}/${page.current_page}/${page.page_size}`, + `${prefix.value}/${resource.resource_type}/${resource.resource_id}/user_group_id/${user_group_id}/${page.current_page}/${page.page_size}`, username_or_nickname ? { username_or_nickname } : undefined, loading, ) @@ -38,11 +45,11 @@ const putUserGroupUser: ( data: putUserGroupUserParams[], loading?: Ref, ) => Promise> = (resource, user_group_id, data, loading) => { - return put(`${prefix}/${resource.resource_type}/${resource.resource_id}/user_group_id/${user_group_id}`, data, undefined, loading) + return put(`${prefix.value}/${resource.resource_type}/${resource.resource_id}/user_group_id/${user_group_id}`, data, undefined, loading) } export default { getUserGroupList, getUserGroupUserList, putUserGroupUser -} \ No newline at end of file +} diff --git a/ui/src/api/shared/model.ts b/ui/src/api/shared/model.ts index d9594fc30..8e2d53aa7 100644 --- a/ui/src/api/shared/model.ts +++ b/ui/src/api/shared/model.ts @@ -10,7 +10,6 @@ import type { import type { FormField } from '@/components/dynamics-form/type' const prefix = '/system/shared' -const workspace_id = localStorage.getItem('workspace_id') || 'default' /** * 获得模型列表 diff --git a/ui/src/layout/layout-header/workspace-dropdown/index.vue b/ui/src/layout/layout-header/workspace-dropdown/index.vue index b1731a73f..f794f64c2 100644 --- a/ui/src/layout/layout-header/workspace-dropdown/index.vue +++ b/ui/src/layout/layout-header/workspace-dropdown/index.vue @@ -11,13 +11,21 @@