修改角色管理报错

This commit is contained in:
lq1405 2024-10-13 22:45:44 +08:00
parent e5046e4742
commit 9618ae6b14
2 changed files with 14 additions and 12 deletions

View File

@ -87,5 +87,6 @@ export default function access(initialState: { currentUser?: API.CurrentUser } |
canUpgradeMachine: true, canUpgradeMachine: true,
}; };
} }
console.log("accsee", access);
return access; return access;
} }

View File

@ -1,5 +1,3 @@
import { useModel } from '@/.umi/plugin-model';
import { PageContainer } from '@ant-design/pro-components';
import { Button, Card, Form, Input, message, Modal, Table } from 'antd'; import { Button, Card, Form, Input, message, Modal, Table } from 'antd';
import React, { useEffect, useState, useRef } from 'react'; import React, { useEffect, useState, useRef } from 'react';
import TemplateContainer from '@/pages/TemplateContainer'; import TemplateContainer from '@/pages/TemplateContainer';
@ -8,14 +6,13 @@ import { ColumnsType, TablePaginationConfig } from 'antd/es/table';
import { DeleteRoleById, QueryRoleList } from '@/services/services/role'; import { DeleteRoleById, QueryRoleList } from '@/services/services/role';
import { FormatDate } from '@/util/time'; import { FormatDate } from '@/util/time';
import ManageRoleModal from '../ManageRoleModal'; import ManageRoleModal from '../ManageRoleModal';
import { isEmpty, set } from 'lodash';
import { useFormReset } from '@/hooks/useFormReset'; import { useFormReset } from '@/hooks/useFormReset';
import AddRoleForm from '../AddRoleForm'; import AddRoleForm from '../AddRoleForm';
import { FilterValue, SorterResult, TableCurrentDataSource } from 'antd/es/table/interface'; import { FilterValue, SorterResult, TableCurrentDataSource } from 'antd/es/table/interface';
import { useModel } from '@umijs/max';
const RoleManagement: React.FC = () => { const RoleManagement: React.FC = () => {
const { initialState } = useModel('@@initialState'); const { initialState } = useModel('@@initialState');
const [data, setData] = useState<RoleModel.Collection[]>(); // 数据 const [data, setData] = useState<RoleModel.Collection[]>(); // 数据
const [form] = Form.useForm(); const [form] = Form.useForm();
@ -27,6 +24,7 @@ const RoleManagement: React.FC = () => {
const [modal, contextHolder] = Modal.useModal(); const [modal, contextHolder] = Modal.useModal();
const [modalTitle, setModalTitle] = useState<string>("编辑角色"); const [modalTitle, setModalTitle] = useState<string>("编辑角色");
const [type, setType] = useState<string>("edit"); const [type, setType] = useState<string>("edit");
const [messageApi, messageHolder] = message.useMessage();
const [tableParams, setTableParams] = useState<TableModel.TableParams>({ const [tableParams, setTableParams] = useState<TableModel.TableParams>({
pagination: { pagination: {
@ -37,10 +35,10 @@ const RoleManagement: React.FC = () => {
}, },
}); });
useEffect(() => { useEffect(() => {
console.log("RoleManagement useEffect");
// 初始化加载数据 // 初始化加载数据
QueryRoleList(tableParams, form.getFieldsValue()) QueryRoleList(tableParams, form.getFieldsValue())
.then((res) => { .then((res) => {
debugger;
setData(res.collection); setData(res.collection);
setTableParams({ setTableParams({
pagination: { pagination: {
@ -51,9 +49,11 @@ const RoleManagement: React.FC = () => {
setLoading(false); setLoading(false);
}) })
.catch((error) => { .catch((error) => {
message.error(error.message); console.log(error);
messageApi.error(error.message);
}).finally(() => {
setLoading(false); setLoading(false);
}); })
}, []); }, []);
async function modalCancel() { async function modalCancel() {
@ -64,7 +64,7 @@ const RoleManagement: React.FC = () => {
let res = await QueryRoleList(tableParams, form.getFieldsValue()); let res = await QueryRoleList(tableParams, form.getFieldsValue());
setData(res.collection); setData(res.collection);
} catch (error: any) { } catch (error: any) {
message.error(error.message); messageApi.error(error.message);
} finally { } finally {
setLoading(false); setLoading(false);
} }
@ -82,7 +82,7 @@ const RoleManagement: React.FC = () => {
} }
}) })
} catch (error: any) { } catch (error: any) {
message.error(error.message); messageApi.error(error.message);
} finally { } finally {
setLoading(false); setLoading(false);
} }
@ -101,9 +101,9 @@ const RoleManagement: React.FC = () => {
try { try {
await DeleteRoleById(roleId); await DeleteRoleById(roleId);
await QueryRoleByName(form.getFieldsValue()); await QueryRoleByName(form.getFieldsValue());
message.success("删除角色成功"); messageApi.success("删除角色成功");
} catch (error: any) { } catch (error: any) {
message.error(error.message); messageApi.error(error.message);
} }
}, },
onCancel: async () => { onCancel: async () => {
@ -191,7 +191,7 @@ const RoleManagement: React.FC = () => {
} }
}) })
} catch (error: any) { } catch (error: any) {
message.error(error.message); messageApi.error(error.message);
} finally { } finally {
setLoading(false); setLoading(false);
} }
@ -234,6 +234,7 @@ const RoleManagement: React.FC = () => {
} }
</Modal> </Modal>
{contextHolder} {contextHolder}
{messageHolder}
</TemplateContainer> </TemplateContainer>
) )
} }