From 1464345c4afddd3e8f950277fa251949245a5f43 Mon Sep 17 00:00:00 2001 From: Kven <2955163637@qq.com> Date: Thu, 8 May 2025 19:00:31 +0800 Subject: [PATCH] =?UTF-8?q?refactor(@vben/common-ui):=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/api/core/chatflow.ts | 16 +- apps/web-antd/src/api/core/user.ts | 133 ++++++++++ apps/web-antd/src/views/user/user-edit.vue | 245 ++++++++++++++++++ .../src/views/user/user-table-view.vue | 200 ++++++++++++++ apps/web-antd/src/views/word/index.vue | 18 +- packages/effects/common-ui/package.json | 1 - packages/effects/common-ui/src/ui/index.ts | 1 + .../common-ui/src/ui/ppt/ppt-perview.vue | 6 +- .../common-ui/src/ui/ppt/ppt-work-view.vue | 10 +- .../src/ui/spider/spider-work-view.vue | 8 +- .../effects/common-ui/src/ui/word/typing.ts | 10 +- .../src/ui/word/word-history-view.vue | 7 +- .../common-ui/src/ui/word/word-work-view.vue | 33 +-- .../src/request-client/request-client.ts | 11 + packages/icons/src/iconify/index.ts | 1 + .../src/langs/zh-CN/authentication.json | 4 +- pnpm-lock.yaml | 3 - 17 files changed, 633 insertions(+), 74 deletions(-) create mode 100644 apps/web-antd/src/views/user/user-edit.vue create mode 100644 apps/web-antd/src/views/user/user-table-view.vue diff --git a/apps/web-antd/src/api/core/chatflow.ts b/apps/web-antd/src/api/core/chatflow.ts index f9a9eb7..239b8bd 100644 --- a/apps/web-antd/src/api/core/chatflow.ts +++ b/apps/web-antd/src/api/core/chatflow.ts @@ -15,13 +15,6 @@ export namespace ChatflowApi { files: []; } - export interface MessagesRequest { - conversationId: string; - userId: string; - firstId: string; - limit: number; - } - export interface ChatListBody { userId: string; lastId: string; @@ -64,12 +57,9 @@ export async function getChatList( }); } -export async function getMessages( - appId: string, - data: ChatflowApi.MessagesRequest, -) { - return requestClient.post(`/v1/chat/messages/${appId}`, data); -} +// export function stopChatflow(data){ +// return requestClient.post('/v1/chat/stopMessagesStream', data); +// }; // // export function getChatflowList(data){ // return requestClient.post('/v1/chat/messages', data); diff --git a/apps/web-antd/src/api/core/user.ts b/apps/web-antd/src/api/core/user.ts index cbe4543..d04da9d 100644 --- a/apps/web-antd/src/api/core/user.ts +++ b/apps/web-antd/src/api/core/user.ts @@ -26,6 +26,72 @@ export namespace UserApi { user: string | UserInfo; csrf: CsrfTokenResult; } + + export interface Res { + code: number; + data: object; + msg: string; + } + + // 重置密码数据 + export interface PasswordReSetModel { + oldPassword: string; + password: string; + confirmPassword: string; + } + + export interface RoleCreateRecord { + name: string; + dataScope: string; + permissionIds: (number | undefined)[]; + remark: string; + authorities: (number | undefined)[]; + } + + export interface RoleRecord extends RoleCreateRecord { + id: string; + } + + // 添加用户数据 + export interface CreateRecord { + value: any; + code: any; + username: string; + nickName: string; + password: string; + phone: string; + email: string; + enabled: string; + address: string; + roleIds: RoleRecord | string[] | undefined; + permissionIds: (number | undefined)[]; + authorities: string[]; + } + + // 用户数据 + export interface UserRecord extends CreateRecord { + value: any; + id?: string; + avatar?: string; + createAt?: string; + } + + export interface UserState { + username?: string; + nickName?: string; + avatar?: string; + email?: string; + phone?: string; + address?: string; + createAt?: string; + remark?: string; + id?: number; + role?: RoleRecord; + roles?: RoleRecord[]; + // permissions?: string[] | '' | '*' | 'admin' | 'user' | 'auditor'; + permissions?: string[] | undefined; + authorities?: string[]; + } } /** @@ -34,3 +100,70 @@ export namespace UserApi { export async function getUserInfoApi() { return requestClient.get('/rest/user/me'); } + +// 更新密码 +export function resetPassword(data: UserApi.PasswordReSetModel) { + return requestClient.patch('/rest/user/self/update-password', data); +} + +// 注册用户 +export function register(data: UserApi.CreateRecord) { + return requestClient.post('/rest/user/register', data); +} + +// 新建用户 +export function create(data: UserApi.CreateRecord) { + return requestClient.post('/rest/user', data); +} + +// 用户切换角色 +export function switchRole(id: number) { + return requestClient.patch(`/rest/user/switch/${id}`); +} + +// 模糊查询用户列表 +export function queryUserList(params: any) { + return requestClient.get('/rest/user', { params }); +} + +// 根据id查询用户信息 +export function userDetail(id: string) { + return requestClient.get(`/rest/user/${id}`); +} + +// 是否启用 +export function enabled(id: string) { + return requestClient.patch(`/rest/user/${id}/toggle`); +} + +// 删除用户 +export function remove(id: string) { + return requestClient.delete(`/rest/user/${id}`); +} + +// 更新用户信息 +export function update(data: UserApi.UserRecord) { + return requestClient.patch(`/rest/user/${data.id}`, data); +} + +export function selfUpdate(data: UserApi.UserState) { + return requestClient.patch(`/rest/user/self`, data); +} + +// 获取个人用户信息 +export function getUserInfo() { + return requestClient.get('/rest/user/self'); +} + +// 部门的审核员 +export function deptAudit(id: string, roleId: string) { + return requestClient.get(`/rest/user/dept/${id}?roleId=${roleId}`); +} + +export function getUserDetail(id: number) { + return requestClient.get(`/user/${id}`); +} + +export function getAllDeptTree(id?: number | string) { + return requestClient.get('/rest/dept/tree', { params: { id } }); +} diff --git a/apps/web-antd/src/views/user/user-edit.vue b/apps/web-antd/src/views/user/user-edit.vue new file mode 100644 index 0000000..c37a3c0 --- /dev/null +++ b/apps/web-antd/src/views/user/user-edit.vue @@ -0,0 +1,245 @@ + + + diff --git a/apps/web-antd/src/views/user/user-table-view.vue b/apps/web-antd/src/views/user/user-table-view.vue new file mode 100644 index 0000000..00207db --- /dev/null +++ b/apps/web-antd/src/views/user/user-table-view.vue @@ -0,0 +1,200 @@ + + + + + diff --git a/apps/web-antd/src/views/word/index.vue b/apps/web-antd/src/views/word/index.vue index 1e1e8c9..7494c46 100644 --- a/apps/web-antd/src/views/word/index.vue +++ b/apps/web-antd/src/views/word/index.vue @@ -1,13 +1,13 @@