feat: 角色页成员维护弹窗与用户角色清空
- 角色页新增「成员」动作,弹窗展示姓名/账号/所属组织/状态,支持搜索添加启用用户与移除 - api/system/role 增加 pageRoleMembers/addRoleMember/removeRoleMember,走 THINK_API_URL - api/system/user 的 updateUser 改走 THINK_API_URL,空角色由后端清空 - 用户编辑表单允许角色为空,保存后可删除该用户全部角色关联
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
import request from '@/utils/request';
|
||||
import type { ApiResult, PageResult } from '@/api';
|
||||
import type { Role, RoleParam } from './model';
|
||||
import type { Role, RoleMember, RoleMemberParam, RoleParam } from './model';
|
||||
import type { Menu } from '../menu/model';
|
||||
import { SERVER_API_URL } from '@/config/setting';
|
||||
import { SERVER_API_URL, THINK_API_URL } from '@/config/setting';
|
||||
|
||||
/**
|
||||
* 分页查询角色
|
||||
@@ -117,3 +117,45 @@ export async function updateRoleMenus(roleId?: number, data?: number[]) {
|
||||
}
|
||||
return Promise.reject(new Error(res.data.message));
|
||||
}
|
||||
|
||||
/**
|
||||
* 分页查询角色成员
|
||||
*/
|
||||
export async function pageRoleMembers(params: RoleMemberParam) {
|
||||
const res = await request.get<ApiResult<PageResult<RoleMember>>>(
|
||||
THINK_API_URL + '/system/role-member/page',
|
||||
{ params }
|
||||
);
|
||||
if (res.data.code === 0) {
|
||||
return res.data.data;
|
||||
}
|
||||
return Promise.reject(new Error(res.data.message));
|
||||
}
|
||||
|
||||
/**
|
||||
* 添加角色成员
|
||||
*/
|
||||
export async function addRoleMember(data: RoleMemberParam) {
|
||||
const res = await request.post<ApiResult<unknown>>(
|
||||
THINK_API_URL + '/system/role-member',
|
||||
data
|
||||
);
|
||||
if (res.data.code === 0) {
|
||||
return res.data.message;
|
||||
}
|
||||
return Promise.reject(new Error(res.data.message));
|
||||
}
|
||||
|
||||
/**
|
||||
* 移除角色成员
|
||||
*/
|
||||
export async function removeRoleMember(roleId?: number, userId?: number) {
|
||||
const res = await request.delete<ApiResult<unknown>>(
|
||||
THINK_API_URL + '/system/role-member',
|
||||
{ params: { roleId, userId } }
|
||||
);
|
||||
if (res.data.code === 0) {
|
||||
return res.data.message;
|
||||
}
|
||||
return Promise.reject(new Error(res.data.message));
|
||||
}
|
||||
|
||||
@@ -25,3 +25,31 @@ export interface RoleParam extends PageParam {
|
||||
roleCode?: string;
|
||||
comments?: string;
|
||||
}
|
||||
|
||||
/**
|
||||
* 角色成员
|
||||
*/
|
||||
export interface RoleMember {
|
||||
// 用户id
|
||||
userId?: number;
|
||||
// 账号
|
||||
username?: string;
|
||||
// 真实姓名
|
||||
realName?: string;
|
||||
// 昵称
|
||||
nickname?: string;
|
||||
// 所属组织id
|
||||
organizationId?: number;
|
||||
// 所属组织名称
|
||||
organizationName?: string;
|
||||
// 状态, 0启用, 1停用
|
||||
status?: number;
|
||||
}
|
||||
|
||||
/**
|
||||
* 角色成员查询/操作参数
|
||||
*/
|
||||
export interface RoleMemberParam extends PageParam {
|
||||
roleId?: number;
|
||||
userId?: number;
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import request from '@/utils/request';
|
||||
import type { ApiResult, PageResult } from '@/api';
|
||||
import type { User, UserParam } from './model';
|
||||
import { SERVER_API_URL } from '@/config/setting';
|
||||
import { SERVER_API_URL, THINK_API_URL } from '@/config/setting';
|
||||
|
||||
/**
|
||||
* 分页查询用户
|
||||
@@ -97,7 +97,7 @@ export async function addUser(data: User) {
|
||||
*/
|
||||
export async function updateUser(data: User) {
|
||||
const res = await request.put<ApiResult<unknown>>(
|
||||
SERVER_API_URL + '/system/user',
|
||||
THINK_API_URL + '/system/user',
|
||||
data
|
||||
);
|
||||
if (res.data.code === 0) {
|
||||
|
||||
Reference in New Issue
Block a user