From 549aa62349fd9a571e585ffb15bf1addad48ddf8 Mon Sep 17 00:00:00 2001 From: wxg0103 <727495428@qq.com> Date: Wed, 30 Jul 2025 17:12:51 +0800 Subject: [PATCH] refactor: update user search parameters and improve code formatting in chat user components --- ui/src/api/chat-user/chat-user.ts | 6 +- ui/src/api/shared-workspace.ts | 46 +++---- .../system-resource-management/chat-user.ts | 6 +- ui/src/api/system-shared/chat-user.ts | 16 +-- ui/src/views/chat-user/index.vue | 121 ++++++++++++++---- 5 files changed, 130 insertions(+), 65 deletions(-) diff --git a/ui/src/api/chat-user/chat-user.ts b/ui/src/api/chat-user/chat-user.ts index a6463ac48..ea937bbbd 100644 --- a/ui/src/api/chat-user/chat-user.ts +++ b/ui/src/api/chat-user/chat-user.ts @@ -33,12 +33,12 @@ const getUserGroupUserList: ( resource: any, user_group_id: string, page: pageRequest, - username_or_nickname: string, + params?: any, loading?: Ref, -) => Promise>> = (resource, user_group_id, page, username_or_nickname, loading) => { +) => Promise>> = (resource, user_group_id, page, params, loading) => { return get( `${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, + params, loading, ) } diff --git a/ui/src/api/shared-workspace.ts b/ui/src/api/shared-workspace.ts index 802cf2357..9de705f04 100644 --- a/ui/src/api/shared-workspace.ts +++ b/ui/src/api/shared-workspace.ts @@ -1,17 +1,17 @@ -import { Result } from '@/request/Result' -import { get, post, del, put, exportFile, exportExcel } from '@/request/index' -import { type Ref } from 'vue' -import type { PageList, pageRequest } from '@/api/type/common' -import type { knowledgeData } from '@/api/type/knowledge' +import {Result} from '@/request/Result' +import {get, post, del, put, exportFile, exportExcel} from '@/request/index' +import {type Ref} from 'vue' +import type {PageList, pageRequest} from '@/api/type/common' +import type {knowledgeData} from '@/api/type/knowledge' import useStore from '@/stores' -import type { ChatUserGroupItem } from './type/workspaceChatUser' +import type {ChatUserGroupItem} from './type/workspaceChatUser' const prefix = '/system/shared' -const prefix_workspace: any = { _value: 'workspace/' } +const prefix_workspace: any = {_value: 'workspace/'} Object.defineProperty(prefix_workspace, 'value', { get: function () { - const { user } = useStore() + const {user} = useStore() return this._value + user.getWorkspaceId() }, }) @@ -47,9 +47,9 @@ const getKnowledgeDetail: (knowledge_id: string, loading?: Ref) => Prom * 文档分页列表 * @param 参数 knowledge_id, * param { - "name": "string", - folder_id: "string", - } + "name": "string", + folder_id: "string", + } */ const getDocumentPage: ( @@ -85,8 +85,8 @@ const getDocumentDetail: ( * 问题分页列表 * @param 参数 knowledge_id, * query { - "content": "string", - } + "content": "string", + } */ const getProblemsPage: ( @@ -107,14 +107,14 @@ const getProblemsPage: ( */ const getUserGroupUserList: ( resource: any, - user_group_id:string, + user_group_id: string, page: pageRequest, - username_or_nickname: string, + params?: any, loading?: Ref, -) => Promise>> = (resource, user_group_id, page, username_or_nickname, loading) => { - return get ( - `${prefix}/${prefix_workspace.value}/KNOWLEDGE/${resource.resource_id}/user_group_id/${user_group_id}/${page.current_page}/${page.page_size}` - ,username_or_nickname ? {username_or_nickname} : undefined, loading, +) => Promise>> = (resource, user_group_id, page, params, loading) => { + return get( + `${prefix}/${prefix_workspace.value}/KNOWLEDGE/${resource.resource_id}/user_group_id/${user_group_id}/${page.current_page}/${page.page_size}`, + params, loading, ) } @@ -122,16 +122,16 @@ const getUserGroupUserList: ( * 获取工作空间下共享知识库的用户组 */ const getUserGroupList: (resource: any, loading?: Ref) => Promise> = (resource, loading) => { - return get (`${prefix}/${prefix_workspace.value}/KNOWLEDGE/${resource.resource_id}/user_group`, undefined, loading) + return get(`${prefix}/${prefix_workspace.value}/KNOWLEDGE/${resource.resource_id}/user_group`, undefined, loading) } /** * 段落分页列表 * @param 参数 knowledge_id document_id * param { - "title": "string", - "content": "string", - } + "title": "string", + "content": "string", + } */ const getParagraphPage: ( knowledge_id: string, diff --git a/ui/src/api/system-resource-management/chat-user.ts b/ui/src/api/system-resource-management/chat-user.ts index 7cd254733..4ce45ff44 100644 --- a/ui/src/api/system-resource-management/chat-user.ts +++ b/ui/src/api/system-resource-management/chat-user.ts @@ -29,12 +29,12 @@ const getUserGroupUserList: ( resource: any, user_group_id: string, page: pageRequest, - username_or_nickname: string, + param?: any, loading?: Ref, -) => Promise>> = (resource, user_group_id, page, username_or_nickname, loading) => { +) => Promise>> = (resource, user_group_id, page, param, loading) => { return get( `${prefix}/${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, + param, loading, ) } diff --git a/ui/src/api/system-shared/chat-user.ts b/ui/src/api/system-shared/chat-user.ts index 615b64b9e..621d7361c 100644 --- a/ui/src/api/system-shared/chat-user.ts +++ b/ui/src/api/system-shared/chat-user.ts @@ -7,17 +7,17 @@ import type { pageRequest, PageList } from '@/api/type/common' const prefix = '/system/shared/knowledge' /** - * 获取共享知识库用户组列表 + * 获取共享知识库用户组列表 */ -const getUserGroupList: (resource: any, loading?: Ref) => +const getUserGroupList: (resource: any, loading?: Ref) => Promise> = (resource, loading) => { - return get(`${prefix}/${resource.resource_type}/${resource.resource_id}/user_group`, undefined, loading) + return get(`${prefix}/${resource.resource_type}/${resource.resource_id}/user_group`, undefined, loading) } /* * 修改共享知识库用户组列表授权 */ -const editUserGroupList: (resource: any, data: { user_group_id: string, is_auth: boolean }[], loading?: Ref) => +const editUserGroupList: (resource: any, data: { user_group_id: string, is_auth: boolean }[], loading?: Ref) => Promise> = (resource, data, loading) => { return put(`${prefix}/${resource.resource_type}/${resource.resource_id}/user_group`, data, undefined, loading) } @@ -29,12 +29,12 @@ const getUserGroupUserList: ( resource: any, user_group_id: string, page: pageRequest, - username_or_nickname: string, + params?: any, loading?: Ref, -) => Promise>> = (resource, user_group_id, page, username_or_nickname, loading) => { +) => Promise>> = (resource, user_group_id, page, params, loading) => { return get( `${prefix}/${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, + params, loading, ) } @@ -56,4 +56,4 @@ export default { editUserGroupList, getUserGroupUserList, putUserGroupUser -} \ No newline at end of file +} diff --git a/ui/src/views/chat-user/index.vue b/ui/src/views/chat-user/index.vue index 173562af9..d2b51b7a9 100644 --- a/ui/src/views/chat-user/index.vue +++ b/ui/src/views/chat-user/index.vue @@ -47,9 +47,11 @@

{{ current?.name || '-' }}

- + - + + + {{ paginationConfig.total }} @@ -76,16 +78,69 @@
- + + + + + + + + + + + + + + +
- +