角色接口 接入

This commit is contained in:
mmc
2026-04-28 15:16:50 +08:00
parent 2a2d40d772
commit b540f842ab
4 changed files with 145 additions and 72 deletions

12
src/api/role/index.ts Normal file
View File

@@ -0,0 +1,12 @@
import request from '../request';
export function addRole(data) {
return request({
url: '/system/role',
method: 'post',
data
});
}

View File

@@ -26,3 +26,38 @@ export function setTokenAi(token) {
path: "/"
});
}
export const buildTreeFromFlat = (data) => {
const map = {};
const tree = [];
data.forEach(item => {
map[item.menuId] = { ...item, children: [] };
});
data.forEach(item => {
if (item.parentId === 0 || !item.parentId) {
tree.push(map[item.menuId]);
} else {
if (map[item.parentId]) {
map[item.parentId].children.push(map[item.menuId]);
}
}
});
return tree;
};
// 菜单数据转 Tree组件
export const buildPermTree = (treeData) => {
const loop = (list) => {
return list.map(item => {
const node = {
title: item.menuName,
key: item.menuId,
};
if (item.children && item.children.length) {
node.children = loop(item.children);
}
return node;
});
};
return loop(treeData);
};

View File

@@ -1,12 +1,15 @@
import React, { useState, useEffect } from 'react';
import {
Table, Button, Space, Modal, Form, Tree, message,
Input, Popconfirm, Select, Card, InputNumber
Input, Popconfirm, Select, Card, InputNumber, Row, Col, Tooltip
} from 'antd';
// 引入全部常用图标
import * as AllIcons from '@ant-design/icons';
import {
PlusOutlined, EditOutlined, DeleteOutlined, SettingOutlined
} from '@ant-design/icons';
import { addMenu, deleteMenu, getMenuList, updateMenu } from '../api/mune';
import { buildPermTree, buildTreeFromFlat } from '../lib/utils';
const { Option } = Select;
@@ -18,43 +21,13 @@ const roleList = [
{ name: '场站员工', key: 'site_staff' },
];
// 扁平数组 → 树形结构(给表格 + 权限树共用)
const buildTreeFromFlat = (data) => {
const map = {};
const tree = [];
// 筛选常用图标(够用、不乱)
const iconList = Object.keys(AllIcons).filter(item => {
return item.endsWith('Outlined')
});
data.forEach(item => {
map[item.menuId] = { ...item, children: [] };
});
// 扁平数组 → 树形结构
data.forEach(item => {
if (item.parentId === 0 || !item.parentId) {
tree.push(map[item.menuId]);
} else {
if (map[item.parentId]) {
map[item.parentId].children.push(map[item.menuId]);
}
}
});
return tree;
};
// 菜单数据转 Tree组件 格式
const buildPermTree = (treeData) => {
const loop = (list) => {
return list.map(item => {
const node = {
title: item.menuName,
key: item.menuId,
};
if (item.children && item.children.length) {
node.children = loop(item.children);
}
return node;
});
};
return loop(treeData);
};
const rolePermissionMap = {};
@@ -62,6 +35,7 @@ export default function MenuList() {
const [rawMenuList, setRawMenuList] = useState([]);
const [menuTreeData, setMenuTreeData] = useState([]);
const [menuTree, setMenuTree] = useState([]);
const [iconModal, setIconModal] = useState(false);
const [menuModal, setMenuModal] = useState(false);
const [menuForm] = Form.useForm();
@@ -78,7 +52,6 @@ export default function MenuList() {
if (res.code === 200) {
const data = res.data || [];
setRawMenuList(data);
// 扁平转树形 → 表格树形 & 权限树
const tree = buildTreeFromFlat(data);
setMenuTreeData(tree);
setMenuTree(buildPermTree(tree));
@@ -94,22 +67,35 @@ export default function MenuList() {
// 编辑
const handleEdit = (record) => {
console.log(record, "values11")
setEditMenu(record);
menuForm.setFieldsValue({ ...record });
setMenuModal(true);
};
// 新增子菜单
const handleAddChild = (parentRecord) => {
setEditMenu(null);
menuForm.resetFields();
menuForm.setFieldsValue({
parentId: parentRecord.menuId
});
setMenuModal(true);
};
// 选择图标
const handleSelectIcon = (iconName) => {
menuForm.setFieldValue('icon', iconName);
setIconModal(false);
};
// 保存菜单
const handleSaveMenu = () => {
menuForm.validateFields().then(values => {
console.log(values, "values")
if (editMenu) {
const data = {
menuId: editMenu.menuId,
...values
}
};
updateMenu(data).then(res => {
if (res.code === 200) {
messageApi.success("编辑成功");
@@ -134,7 +120,6 @@ export default function MenuList() {
messageApi.error('新增失败');
});
}
});
};
@@ -149,9 +134,7 @@ export default function MenuList() {
}
}).catch(() => {
messageApi.error("删除失败");
})
});
};
// 权限弹窗
@@ -167,7 +150,6 @@ export default function MenuList() {
setPermModal(false);
};
// 上级菜单下拉选项(只展示一级)
const topMenus = rawMenuList.filter(m => m.parentId === 0 || !m.parentId);
const columns = [
@@ -175,16 +157,20 @@ export default function MenuList() {
title: '菜单名称',
dataIndex: 'menuName',
key: 'menuName',
// 关键:antd 表格自带缩进树形
},
{ title: '路由地址', dataIndex: 'path', key: 'path' },
{ title: '排序', dataIndex: 'orderNum', key: 'orderNum' },
{
title: '操作',
key: 'action',
width: 220,
width: 320,
render: (_, record) => (
<Space>
{record.parentId === 0 && (
<Button type="text" icon={<PlusOutlined />} onClick={() => handleAddChild(record)}>
新增子菜单
</Button>
)}
<Button type="text" icon={<EditOutlined />} onClick={() => handleEdit(record)}>编辑</Button>
<Popconfirm title="确定删除?" onConfirm={() => handleDelete(record.menuId)}>
<Button type="text" danger>删除</Button>
@@ -194,6 +180,12 @@ export default function MenuList() {
},
];
// 动态渲染图标
const renderIcon = (name) => {
const Icon = AllIcons[name];
return Icon ? <Icon /> : null;
};
return (
<div style={{ padding: '20px' }}>
{contextHolder}
@@ -212,7 +204,6 @@ export default function MenuList() {
}}>新增菜单</Button>
</div>
{/* 关键:rowKey + treeData + indentSize 开启树形表格 */}
<Table
columns={columns}
dataSource={menuTreeData}
@@ -223,7 +214,7 @@ export default function MenuList() {
indentSize={24}
/>
{/* 新增/编辑弹窗 */}
{/* 菜单弹窗 */}
<Modal
title={editMenu ? '编辑菜单' : '新增菜单'}
open={menuModal}
@@ -250,12 +241,43 @@ export default function MenuList() {
<Input placeholder="/system/menu" />
</Form.Item>
{/* 图标选择(带选择按钮+预览) */}
<Form.Item label="菜单图标" name="icon">
<Space>
<Input placeholder="点击选择图标" readOnly />
<Button onClick={() => setIconModal(true)}>选择图标</Button>
</Space>
</Form.Item>
<Form.Item label="显示排序" name="orderNum">
<InputNumber min={0} style={{ width: '100%' }} placeholder="数字越小越靠前" />
</Form.Item>
</Form>
</Modal>
{/* 图标选择弹窗 */}
<Modal
title="选择菜单图标"
open={iconModal}
onCancel={() => setIconModal(false)}
footer={null}
width={500}
>
<Row gutter={[12, 12]}>
{iconList.map(iconName => (
<Col span={4} key={iconName}>
<Tooltip title={iconName}>
<Button
block
icon={renderIcon(iconName)}
onClick={() => handleSelectIcon(iconName)}
/>
</Tooltip>
</Col>
))}
</Row>
</Modal>
{/* 权限树弹窗 */}
<Modal
title={`【${selectedRole}】权限配置`}

View File

@@ -1,4 +1,4 @@
import React, { useState } from 'react';
import React, { useState, useEffect } from 'react';
import {
Card, Row, Col, Button, Typography, Space, Modal, Form, Tree, message,
Input, Popconfirm, Divider
@@ -6,6 +6,9 @@ import {
import {
PlusOutlined, SettingOutlined, EditOutlined, DeleteOutlined, CloseOutlined
} from '@ant-design/icons';
// 引入你的菜单接口
import { getMenuList } from '../api/mune';
import { buildPermTree, buildTreeFromFlat } from '../lib/utils';
const { Text } = Typography;
const AntdCard = Card as any;
@@ -18,25 +21,11 @@ const defaultRoles = [
{ name: '场站操作员', key: 'viewer', desc: '只读查看', level: 'Level 3' },
];
// 模拟菜单树
const defaultMenuTree = [
{ title: '控制台', value: 'dashboard', key: '1' },
{
title: '设备管理', value: 'device', key: '2',
children: [
{ title: '机器人管理', value: 'robot', key: '2-1' },
{ title: '视频监控', value: 'video', key: '2-2' },
]
},
{ title: '告警管理', value: 'alarm', key: '3' },
{ title: '用户管理', value: 'user', key: '4' },
{ title: '角色管理', value: 'role', key: '5' },
{ title: '菜单管理', value: 'menu', key: '6' },
];
// ====================== 【和菜单管理完全一样的树形方法】 ======================
export default function Roles() {
const [roles, setRoles] = useState(defaultRoles);
const [menuTree, setMenuTree] = useState(defaultMenuTree);
const [menuTree, setMenuTree] = useState([]); // 从接口获取
const [checkedKeys, setCheckedKeys] = useState([]);
const [permVisible, setPermVisible] = useState(false);
const [currentRole, setCurrentRole] = useState(null);
@@ -45,17 +34,30 @@ export default function Roles() {
const [roleModalVisible, setRoleModalVisible] = useState(false);
const [roleForm] = Form.useForm();
const [editRole, setEditRole] = useState(null);
const [messageApi, contextHolder] = message.useMessage();
// ====================== 加载菜单(和菜单管理完全一样) ======================
useEffect(() => {
getMenuList().then(res => {
if (res.code === 200) {
const data = res.data || [];
const treeData = buildTreeFromFlat(data);
const permTree = buildPermTree(treeData);
setMenuTree(permTree);
}
});
}, []);
// 打开权限配置
const handleOpenPerm = (role) => {
setCurrentRole(role);
setCheckedKeys([]);
setCheckedKeys(role.menuKeys || []);
setPermVisible(true);
};
// 保存权限
const handleSavePerm = () => {
message.success(`【${currentRole?.name}】菜单权限配置成功!`);
messageApi.success(`【${currentRole?.name}】菜单权限配置成功!`);
setPermVisible(false);
};
@@ -78,7 +80,7 @@ export default function Roles() {
// 删除角色
const handleDeleteRole = (key) => {
setRoles(roles.filter(item => item.key !== key));
message.success('删除成功');
messageApi.success('删除成功');
};
// 提交保存角色
@@ -92,14 +94,14 @@ export default function Roles() {
if (editRole) {
setRoles(roles.map(r => r.key === editRole.key ? { ...r, ...roleData } : r));
message.success('编辑成功');
messageApi.success('编辑成功');
} else {
const newRole = {
...roleData,
key: values.key || Date.now().toString(),
};
setRoles([...roles, newRole]);
message.success('新增角色成功');
messageApi.success('新增角色成功');
}
setRoleModalVisible(false);
});
@@ -107,6 +109,8 @@ export default function Roles() {
return (
<div style={{ padding: '16px', background: '#f4f7f9', minHeight: '100%' }}>
{contextHolder}
{/* 标题 */}
<div style={{ fontSize: 16, fontWeight: 600, marginBottom: 16 }}>角色管理</div>