diff --git a/src/pages/UserPage.tsx b/src/pages/UserPage.tsx index 38e7b74..d319c1c 100644 --- a/src/pages/UserPage.tsx +++ b/src/pages/UserPage.tsx @@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react'; import { Layout, Tabs, Card, Row, Col, Button, Typography, Space, Modal, Form, Tree, message, Input, Popconfirm, Divider, InputNumber, Switch, Pagination, Table, Select, - Tag + Tag, Checkbox, App } from 'antd'; import { PlusOutlined, EditOutlined, DeleteOutlined, UserOutlined @@ -17,15 +17,19 @@ const { Text } = Typography; const { TabPane } = Tabs; const AntdCard = Card as any; -// 用户 + 角色 合并页面 export default function UserRolePage() { // ====================== 角色管理状态 ====================== + const [messageApi, contextHolder] = message.useMessage(); + const { modal } = App.useApp(); + + const [roles, setRoles] = useState([]); const [menuTree, setMenuTree] = useState([]); const [checkedKeys, setCheckedKeys] = useState([]); const [roleModalVisible, setRoleModalVisible] = useState(false); const [roleForm] = Form.useForm(); const [editRole, setEditRole] = useState(null); + const [selectedRoleIds, setSelectedRoleIds] = useState([]); // ====================== 用户管理状态 ====================== const [userList, setUserList] = useState([]); @@ -33,6 +37,7 @@ export default function UserRolePage() { const [form] = Form.useForm(); const [currentUser, setCurrentUser] = useState(null); const [rolesOption, setRolesOption] = useState([]); + const [selectedUserIds, setSelectedUserIds] = useState([]); // ====================== 统一分页 ====================== const [rolePagination, setRolePagination] = useState({ @@ -122,8 +127,31 @@ export default function UserRolePage() { const handleDeleteRole = (roleId) => { deleteRole([roleId]).then(res => { - if (res.code === 200) { message.success('删除成功'); getRoleData(); } - else message.error(res.msg || '删除失败'); + if (res.code === 200) { messageApi.success('删除成功'); getRoleData(); } + else messageApi.error(res.msg || '删除失败'); + }); + }; + + // 批量删除角色 + 确认弹窗 + const handleBatchDeleteRoles = () => { + if (selectedRoleIds.length == 0) return messageApi.warning('请选择要删除的角色'); + modal.confirm({ + title: '批量删除角色', + content: `确定要删除已选中的 ${selectedRoleIds.length} 个角色吗?`, + okText: '确定删除', + cancelText: '取消', + okType: 'danger', + onOk: () => { + deleteRole(selectedRoleIds).then(res => { + if (res.code === 200) { + messageApi.success('批量删除成功'); + setSelectedRoleIds([]); + getRoleData(); + } else { + messageApi.error(res.msg || '删除失败'); + } + }); + } }); }; @@ -140,11 +168,11 @@ export default function UserRolePage() { const api = editRole ? editRoleApi : addRole; api(params).then(res => { if (res.code === 200) { - message.success(editRole ? '编辑成功' : '新增成功'); + messageApi.success(editRole ? '编辑成功' : '新增成功'); setRoleModalVisible(false); getRoleData(); getRoleForSelect(); - } else message.error(res.msg || '保存失败'); + } else messageApi.error(res.msg || '保存失败'); }); }); }; @@ -164,8 +192,29 @@ export default function UserRolePage() { const handleDeleteUser = (userId) => { deleteUser(userId).then(res => { - if (res.code === 200) { message.success('删除成功'); getUserData(); } - else message.error(res.msg || '删除失败'); + if (res.code === 200) { messageApi.success('删除成功'); getUserData(); } + else messageApi.error(res.msg || '删除失败'); + }); + }; + + // 批量删除用户 + 确认弹窗 + const handleBatchDeleteUsers = () => { + + if (selectedUserIds.length === 0) return messageApi.warning('请选择要删除的用户'); + console.log(selectedUserIds, "selectedUserIds") + modal.confirm({ + title: '批量删除用户', + content: `确定要删除已选中的 ${selectedUserIds.length} 个用户吗?`, + okText: '确定删除', + cancelText: '取消', + okType: 'danger', + onOk: () => { + Promise.all(selectedUserIds.map(id => deleteUser(id))).then(() => { + messageApi.success('批量删除成功'); + setSelectedUserIds([]); + getUserData(); + }); + } }); }; @@ -177,10 +226,10 @@ export default function UserRolePage() { const api = currentUser ? editUser : addUser; api(params).then(res => { if (res.code === 200) { - message.success(currentUser ? '编辑成功' : '新增成功'); + messageApi.success(currentUser ? '编辑成功' : '新增成功'); setModalVisible(false); getUserData(); - } else message.error(res.msg || '保存失败'); + } else messageApi.error(res.msg || '保存失败'); }); }); }; @@ -196,20 +245,29 @@ export default function UserRolePage() { padding: '20px', background: '#f5f7fa' }}> + {contextHolder} {/* 整体卡片 */} - + {/* ========== 用户管理 ========== */}
-
+ {selectedUserIds.length > 0 && ( + + )}
setSelectedUserIds(selectedRowKeys) + }} columns={[ { title: '用户账号', dataIndex: 'userName' }, { title: '用户昵称', dataIndex: 'nickName' }, @@ -221,7 +279,7 @@ export default function UserRolePage() { )) }, { - title: '状态', render: (_,s) => s.status == '0' ? + title: '状态', render: (_, s) => s.status == '0' ? 正常 : 停用 }, { @@ -252,14 +310,20 @@ export default function UserRolePage() { {/* ========== 角色管理 ========== */}
-
+ {selectedRoleIds.length > 0 && ( + + )}
{roles.length > 0 ? roles.map(r => (
- } onClick={() => handleEditRole(r)}>编辑, handleDeleteRole(r.roleId)} title="确定删除?"> @@ -267,6 +331,18 @@ export default function UserRolePage() { ]} > +
+ { + if (e.target.checked) { + setSelectedRoleIds([...selectedRoleIds, r.roleId]); + } else { + setSelectedRoleIds(selectedRoleIds.filter(id => id !== r.roleId)); + } + }} + /> +
{r.roleName}} description={ @@ -277,7 +353,7 @@ export default function UserRolePage() { } /> -
+ )) : } @@ -294,7 +370,7 @@ export default function UserRolePage() { - + {/* ========== 角色弹窗 ========== */} - +