From a9355b6d05fe2c29ae190d8b8cef2cb3ec6af9fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com> Date: Wed, 8 Mar 2023 10:10:33 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E6=96=B0=E5=BB=BA=E3=80=81=E7=BC=96=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/system/administrator/index.tsx | 13 -------- src/pages/system/adminroles/create.tsx | 38 +++++++++++++++------- src/pages/system/adminroles/index.tsx | 5 --- src/pages/system/adminroles/update.tsx | 40 +++++++++++++++++------- 4 files changed, 56 insertions(+), 40 deletions(-) diff --git a/src/pages/system/administrator/index.tsx b/src/pages/system/administrator/index.tsx index 33336f9..fac6a09 100644 --- a/src/pages/system/administrator/index.tsx +++ b/src/pages/system/administrator/index.tsx @@ -27,7 +27,6 @@ interface DataType { export const SystemAdministratorPage: React.FC = () => { const navigate = useNavigate(); - const [selectedRowKeys, setSelectedRowKeys] = useState([]); const [loading, setLoading] = useState(true); const [page, setPage] = useState(1); const [size, setSize] = useState(10); @@ -105,18 +104,12 @@ export const SystemAdministratorPage: React.FC = () => { getData(); }, [refresh, page, size]); - const onSelectChange = (newSelectedRowKeys: React.Key[]) => { - console.log("selectedRowKeys changed: ", newSelectedRowKeys); - setSelectedRowKeys(newSelectedRowKeys); - }; - const getData = () => { setLoading(true); adminUser.adminUserList(page, size, name).then((res: any) => { setList(res.data.data); setTotal(res.data.total); setTimeout(() => { - setSelectedRowKeys([]); setLoading(false); }, 1000); }); @@ -130,10 +123,6 @@ export const SystemAdministratorPage: React.FC = () => { setRefresh(!refresh); }; - const rowSelection = { - selectedRowKeys, - onChange: onSelectChange, - }; const paginationProps = { current: page, //当前页码 @@ -158,7 +147,6 @@ export const SystemAdministratorPage: React.FC = () => { }); }; - const hasSelected = selectedRowKeys.length > 0; return ( <>
@@ -216,7 +204,6 @@ export const SystemAdministratorPage: React.FC = () => {
{ const [form] = Form.useForm(); const [loading, setLoading] = useState(true); const [permissions, setPermissions] = useState([]); + const [actions, setActions] = useState([]); useEffect(() => { getParams(); @@ -18,32 +19,39 @@ export const AdminrolesCreatePage: React.FC = () => { const getParams = () => { adminRole.createAdminRole().then((res: any) => { const arr = []; - let permissions = res.data.permissions; + const arr2 = []; + let actions = res.data.perm_action.action; + let permissions = res.data.perm_action.data; for (let i = 0; i < permissions.length; i++) { arr.push({ label: permissions[i].name, value: permissions[i].id, }); } + for (let j = 0; j < actions.length; j++) { + arr2.push({ + label: actions[j].name, + value: actions[j].id, + }); + } setPermissions(arr); + setActions(arr2); }); }; const onFinish = (values: any) => { - adminRole - .storeAdminRole(values.name, values.permission_ids) - .then((res: any) => { - message.success("保存成功！"); - navigate(-1); - }); + const params = values.action_ids.concat(values.permission_ids); + + adminRole.storeAdminRole(values.name, params).then((res: any) => { + message.success("保存成功！"); + navigate(-1); + }); }; const onFinishFailed = (errorInfo: any) => { console.log("Failed:", errorInfo); }; - const handleChange = (value: any) => {}; - return ( <> @@ -70,13 +78,21 @@ export const AdminrolesCreatePage: React.FC = () => { > - + + diff --git a/src/pages/system/adminroles/index.tsx b/src/pages/system/adminroles/index.tsx index 2cf6522..0db002d 100644 --- a/src/pages/system/adminroles/index.tsx +++ b/src/pages/system/adminroles/index.tsx @@ -21,11 +21,6 @@ export const SystemAdminrolesPage: React.FC = () => { const [refresh, setRefresh] = useState(false); const columns: ColumnsType = [ - { - title: "ID", - key: "id", - dataIndex: "id", - }, { title: "角色名", dataIndex: "name", diff --git a/src/pages/system/adminroles/update.tsx b/src/pages/system/adminroles/update.tsx index f68e1bf..c76d2b1 100644 --- a/src/pages/system/adminroles/update.tsx +++ b/src/pages/system/adminroles/update.tsx @@ -11,11 +11,12 @@ export const AdminrolesUpdatePage: React.FC = () => { const [form] = Form.useForm(); const [loading, setLoading] = useState(true); const [permissions, setPermissions] = useState([]); + const [actions, setActions] = useState([]); useEffect(() => { getParams(); }, []); - + useEffect(() => { getDetail(); }, [params.roleId]); @@ -23,14 +24,23 @@ export const AdminrolesUpdatePage: React.FC = () => { const getParams = () => { adminRole.createAdminRole().then((res: any) => { const arr = []; - let permissions = res.data.permissions; + const arr2 = []; + let actions = res.data.perm_action.action; + let permissions = res.data.perm_action.data; for (let i = 0; i < permissions.length; i++) { arr.push({ label: permissions[i].name, value: permissions[i].id, }); } + for (let j = 0; j < actions.length; j++) { + arr2.push({ + label: actions[j].name, + value: actions[j].id, + }); + } setPermissions(arr); + setActions(arr2); }); }; @@ -39,19 +49,19 @@ export const AdminrolesUpdatePage: React.FC = () => { let role = res.data.role; form.setFieldsValue({ name: role.name, - permission_ids: res.data.permission_ids, + permission_ids: res.data.perm_data, + action_ids: res.data.perm_action, }); }); }; const onFinish = (values: any) => { let id = Number(params.roleId); - adminRole - .updateAdminRole(id, values.name, values.permission_ids) - .then((res: any) => { - message.success("保存成功！"); - navigate(-1); - }); + const arr = values.action_ids.concat(values.permission_ids); + adminRole.updateAdminRole(id, values.name, arr).then((res: any) => { + message.success("保存成功！"); + navigate(-1); + }); }; const onFinishFailed = (errorInfo: any) => { @@ -86,13 +96,21 @@ export const AdminrolesUpdatePage: React.FC = () => { > - + +