diff --git a/src/api/role/index.ts b/src/api/role/index.ts new file mode 100644 index 0000000..d87968c --- /dev/null +++ b/src/api/role/index.ts @@ -0,0 +1,12 @@ +import request from '../request'; + + +export function addRole(data) { + return request({ + url: '/system/role', + method: 'post', + data + }); +} + + diff --git a/src/lib/utils.ts b/src/lib/utils.ts index 472ad18..39ee675 100644 --- a/src/lib/utils.ts +++ b/src/lib/utils.ts @@ -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); +}; diff --git a/src/pages/MenuList.tsx b/src/pages/MenuList.tsx index bbb6ce4..865ce10 100644 --- a/src/pages/MenuList.tsx +++ b/src/pages/MenuList.tsx @@ -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) => ( + {record.parentId === 0 && ( + + )} handleDelete(record.menuId)}> @@ -194,6 +180,12 @@ export default function MenuList() { }, ]; + // 动态渲染图标 + const renderIcon = (name) => { + const Icon = AllIcons[name]; + return Icon ? : null; + }; + return (
{contextHolder} @@ -212,7 +204,6 @@ export default function MenuList() { }}>新增菜单
- {/* 关键:rowKey + treeData + indentSize 开启树形表格 */} - {/* 新增/编辑弹窗 */} + {/* 菜单弹窗 */} + {/* 图标选择(带选择按钮+预览) */} + + + + + + + + {/* 图标选择弹窗 */} + setIconModal(false)} + footer={null} + width={500} + > + + {iconList.map(iconName => ( + + +