This commit is contained in:
mmc
2026-04-29 15:31:51 +08:00
parent 2ed03e48d0
commit 941ad9c4f1

View File

@@ -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<number[]>([]);
const [roleModalVisible, setRoleModalVisible] = useState(false);
const [roleForm] = Form.useForm();
const [editRole, setEditRole] = useState(null);
const [selectedRoleIds, setSelectedRoleIds] = useState<number[]>([]);
// ====================== 用户管理状态 ======================
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<number[]>([]);
// ====================== 统一分页 ======================
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}
{/* 整体卡片 */}
<Card bodyStyle={{ padding: '20px 24px' }} style={{ borderRadius: 12, boxShadow: '0 2px 10px rgba(0,0,0,0.06)' }}>
<AntdCard style={{ borderRadius: 12, boxShadow: '0 2px 10px rgba(0,0,0,0.06)' }}>
<Tabs defaultActiveKey="user" type="card" size="large" style={{ marginBottom: 20 }}>
{/* ========== 用户管理 ========== */}
<TabPane tab="用户管理" key="user">
<div style={{ marginBottom: 16, display: 'flex', justifyContent: 'space-between' }}>
<div></div>
{selectedUserIds.length > 0 && (
<Button danger onClick={handleBatchDeleteUsers}>
批量删除(已选 {selectedUserIds.length} 项)
</Button>
)}
<Button type="primary" icon={<PlusOutlined />} onClick={handleAddUser}>新增用户</Button>
</div>
<Table
rowKey="userId"
rowSelection={{
type: 'checkbox',
onChange: (selectedRowKeys) => 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' ?
<Tag color="green">正常</Tag> : <Tag color="red">停用</Tag>
},
{
@@ -252,14 +310,20 @@ export default function UserRolePage() {
{/* ========== 角色管理 ========== */}
<TabPane tab="角色管理" key="role">
<div style={{ marginBottom: 16, display: 'flex', justifyContent: 'space-between' }}>
<div></div>
{selectedRoleIds.length > 0 && (
<Button danger onClick={handleBatchDeleteRoles}>
批量删除(已选 {selectedRoleIds.length} 项)
</Button>
)}
<Button type="primary" icon={<PlusOutlined />} onClick={handleAddRole}>新增角色</Button>
</div>
<Row gutter={[16, 16]}>
{roles.length > 0 ? roles.map(r => (
<Col xs={24} sm={12} md={8} lg={6} key={r.roleId}>
<Card hoverable style={{ borderRadius: 10 }}
<AntdCard
hoverable
style={{ borderRadius: 10, position: 'relative' }}
actions={[
<Button type="text" icon={<EditOutlined />} onClick={() => handleEditRole(r)}>编辑</Button>,
<Popconfirm onConfirm={() => handleDeleteRole(r.roleId)} title="确定删除?">
@@ -267,6 +331,18 @@ export default function UserRolePage() {
</Popconfirm>
]}
>
<div style={{ position: 'absolute', top: 10, right: 10 }}>
<Checkbox
checked={selectedRoleIds.includes(r.roleId)}
onChange={(e) => {
if (e.target.checked) {
setSelectedRoleIds([...selectedRoleIds, r.roleId]);
} else {
setSelectedRoleIds(selectedRoleIds.filter(id => id !== r.roleId));
}
}}
/>
</div>
<Card.Meta
title={<strong>{r.roleName}</strong>}
description={
@@ -277,7 +353,7 @@ export default function UserRolePage() {
</Space>
}
/>
</Card>
</AntdCard>
</Col>
)) : <EmptyData height={260} />}
</Row>
@@ -294,7 +370,7 @@ export default function UserRolePage() {
</div>
</TabPane>
</Tabs>
</Card>
</AntdCard>
{/* ========== 角色弹窗 ========== */}
<Modal title={editRole ? '编辑角色' : '新增角色'} open={roleModalVisible}
@@ -326,7 +402,7 @@ export default function UserRolePage() {
<Col span={12}><Form.Item name="language" label="语言"><Select><Select.Option value="zh-CN">中文</Select.Option><Select.Option value="en">英语</Select.Option></Select></Form.Item></Col>
</Row>
<Row gutter={16}>
<Col span={12}><Form.Item name="roleIds" label="分配角色"><Select mode="multiple" placeholder="选择角色">{rolesOption.map(i => <Select.Option key={i.roleId} value={i.roleId}>{i.roleName}</Select.Option>)}</Select></Form.Item></Col>
<Col span={12}><Form.Item name="roleIds" label="分配角色" rules={[{ required: true }]}><Select mode="multiple" placeholder="选择角色">{rolesOption.map(i => <Select.Option key={i.roleId} value={i.roleId}>{i.roleName}</Select.Option>)}</Select></Form.Item></Col>
<Col span={12}><Form.Item name="status" label="状态" initialValue="0"><Select><Select.Option value="0">正常</Select.Option><Select.Option value="1">停用</Select.Option></Select></Form.Item></Col>
</Row>
<Form.Item name="siteId" label="场站ID"><Input /></Form.Item>