From 4dd16c399db31e0a77875a0deb3f2a63666b9c36 Mon Sep 17 00:00:00 2001 From: mmc <1556375442@qq.com> Date: Tue, 28 Apr 2026 16:54:36 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=88=A0=E9=99=A4=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/role/index.ts | 9 +++++ src/pages/Roles.tsx | 92 ++++++++++++++++++------------------------- 2 files changed, 48 insertions(+), 53 deletions(-) diff --git a/src/api/role/index.ts b/src/api/role/index.ts index 8ffa9c7..4451ec3 100644 --- a/src/api/role/index.ts +++ b/src/api/role/index.ts @@ -8,6 +8,15 @@ export function addRole(data) { data }); } +//编辑角色 + +export function editRoleApi(data) { + return request({ + url: '/system/role', + method: 'put', + data + }); +} //获取角色列表 export function getRoleList() { return request({ diff --git a/src/pages/Roles.tsx b/src/pages/Roles.tsx index 7aa68cc..fe7b638 100644 --- a/src/pages/Roles.tsx +++ b/src/pages/Roles.tsx @@ -8,17 +8,16 @@ import { } from '@ant-design/icons'; import { getMenuList } from '../api/mune'; import { buildPermTree, buildTreeFromFlat } from '../lib/utils'; -import { addRole, deleteRole, getRoleList } from '../api/role'; +import { addRole, deleteRole, editRoleApi, getRoleList } from '../api/role'; import EmptyData from '../components/Empty'; - const { Text } = Typography; const AntdCard = Card as any; export default function Roles() { const [roles, setRoles] = useState([]); const [menuTree, setMenuTree] = useState([]); - const [checkedKeys, setCheckedKeys] = useState([]); + const [checkedKeys, setCheckedKeys] = useState([]); const [permVisible, setPermVisible] = useState(false); const [currentRole, setCurrentRole] = useState(null); @@ -53,30 +52,17 @@ export default function Roles() { getRole(); }, []); - // 打开权限配置 - const handleOpenPerm = (role) => { - setCurrentRole(role); - setCheckedKeys(role.menuIds || []); - setPermVisible(true); - }; - // 保存权限 - const handleSavePerm = () => { - messageApi.success(`【${currentRole?.roleName}】菜单权限配置成功!`); - setPermVisible(false); - }; // 新增角色 const handleAddRole = () => { roleForm.resetFields(); setCheckedKeys([]); setEditRole(null); - // 🔥 新增时默认值 roleForm.setFieldsValue({ status: true, roleSort: 1, - isAdmin: false, - isManager: false + }); setRoleModalVisible(true); }; @@ -88,7 +74,8 @@ export default function Roles() { ...record, status: record.status == 1, }); - setCheckedKeys(record.menuIds || []); + // 🔥 编辑时自动勾选菜单 + setCheckedKeys((record.menuIds || []).map(Number)); setRoleModalVisible(true); }; @@ -98,7 +85,6 @@ export default function Roles() { if (res.code == 200) { messageApi.success('删除成功'); getRole(); - } else { messageApi.error(res.msg || '删除失败'); } @@ -110,22 +96,38 @@ export default function Roles() { // 提交保存角色 const handleSaveRole = () => { roleForm.validateFields().then(values => { - const params = { - ...values, - menuIds: checkedKeys, - status: values.status ? 1 : 0, - roleSort: values.roleSort || 1, - admin: values.admin ? true : false, - manager: values.manager ? true : false - }; if (editRole) { - // 编辑 - setRoles(roles.map(r => r.roleId === editRole.roleId ? { ...r, ...params } : r)); - messageApi.success('编辑成功'); - setRoleModalVisible(false); + + const params = { + ...values, + menuIds: checkedKeys, + status: values.status ? 1 : 0, + roleSort: values.roleSort || 1, + roleId: editRole.roleId + + }; + editRoleApi(params).then(res => { + if (res.code == 200) { + messageApi.success('编辑角色成功'); + getRole(); + setRoleModalVisible(false); + } else { + messageApi.error(res.msg || "编辑失败"); + } + }).catch(() => { + messageApi.error("编辑失败"); + }); + } else { + const params = { + ...values, + menuIds: checkedKeys, + status: values.status ? 1 : 0, + roleSort: values.roleSort || 1, + + }; // 新增 addRole(params).then(res => { if (res.code == 200) { @@ -163,9 +165,7 @@ export default function Roles() { hoverable style={{ borderRadius: 8 }} actions={[ - , + , @@ -178,10 +178,11 @@ export default function Roles() { title={{role.roleName}} description={ + 权限标识:{role.roleKey} 状态:{role.status == 1 ? '正常' : '停用'} - {role.isAdmin && '【超级管理员】'} - {role.isManager && '【机构管理员】'} + {role.admin && '【超级管理员】'} + {role.manager && '【机构管理员】'} } @@ -196,22 +197,7 @@ export default function Roles() { )} - {/* 菜单权限弹窗 */} - setPermVisible(false)} - onOk={handleSavePerm} - > - - + {/* 新增/编辑弹窗 */} - {/* 🔥 三个 Switch 一行 */} + {/* 三个 Switch 一行 */}