From 9618ae6b1465fab4f9c77fb1b0581c402e5a96a3 Mon Sep 17 00:00:00 2001
From: lq1405 <2769838458@qq.com>
Date: Sun, 13 Oct 2024 22:45:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=92=E8=89=B2=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/access.ts                           |  1 +
 src/pages/Role/RoleManagement/index.tsx | 25 +++++++++++++------------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/access.ts b/src/access.ts
index 52cb69a..fb53461 100644
--- a/src/access.ts
+++ b/src/access.ts
@@ -87,5 +87,6 @@ export default function access(initialState: { currentUser?: API.CurrentUser } |
       canUpgradeMachine: true,
     };
   }
+  console.log("accsee", access);
   return access;
 }
diff --git a/src/pages/Role/RoleManagement/index.tsx b/src/pages/Role/RoleManagement/index.tsx
index 7c40577..6cd98e5 100644
--- a/src/pages/Role/RoleManagement/index.tsx
+++ b/src/pages/Role/RoleManagement/index.tsx
@@ -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 React, { useEffect, useState, useRef } from 'react';
 import TemplateContainer from '@/pages/TemplateContainer';
@@ -8,14 +6,13 @@ import { ColumnsType, TablePaginationConfig } from 'antd/es/table';
 import { DeleteRoleById, QueryRoleList } from '@/services/services/role';
 import { FormatDate } from '@/util/time';
 import ManageRoleModal from '../ManageRoleModal';
-import { isEmpty, set } from 'lodash';
 import { useFormReset } from '@/hooks/useFormReset';
 import AddRoleForm from '../AddRoleForm';
 import { FilterValue, SorterResult, TableCurrentDataSource } from 'antd/es/table/interface';
+import { useModel } from '@umijs/max';
 
 
 const RoleManagement: React.FC = () => {
-
   const { initialState } = useModel('@@initialState');
   const [data, setData] = useState<RoleModel.Collection[]>(); // 数据
   const [form] = Form.useForm();
@@ -27,6 +24,7 @@ const RoleManagement: React.FC = () => {
   const [modal, contextHolder] = Modal.useModal();
   const [modalTitle, setModalTitle] = useState<string>("编辑角色");
   const [type, setType] = useState<string>("edit");
+  const [messageApi, messageHolder] = message.useMessage();
 
   const [tableParams, setTableParams] = useState<TableModel.TableParams>({
     pagination: {
@@ -37,10 +35,10 @@ const RoleManagement: React.FC = () => {
     },
   });
   useEffect(() => {
+    console.log("RoleManagement useEffect");
     // 初始化加载数据
     QueryRoleList(tableParams, form.getFieldsValue())
       .then((res) => {
-        debugger;
         setData(res.collection);
         setTableParams({
           pagination: {
@@ -51,9 +49,11 @@ const RoleManagement: React.FC = () => {
         setLoading(false);
       })
       .catch((error) => {
-        message.error(error.message);
+        console.log(error);
+        messageApi.error(error.message);
+      }).finally(() => {
         setLoading(false);
-      });
+      })
   }, []);
 
   async function modalCancel() {
@@ -64,7 +64,7 @@ const RoleManagement: React.FC = () => {
       let res = await QueryRoleList(tableParams, form.getFieldsValue());
       setData(res.collection);
     } catch (error: any) {
-      message.error(error.message);
+      messageApi.error(error.message);
     } finally {
       setLoading(false);
     }
@@ -82,7 +82,7 @@ const RoleManagement: React.FC = () => {
         }
       })
     } catch (error: any) {
-      message.error(error.message);
+      messageApi.error(error.message);
     } finally {
       setLoading(false);
     }
@@ -101,9 +101,9 @@ const RoleManagement: React.FC = () => {
           try {
             await DeleteRoleById(roleId);
             await QueryRoleByName(form.getFieldsValue());
-            message.success("删除角色成功");
+            messageApi.success("删除角色成功");
           } catch (error: any) {
-            message.error(error.message);
+            messageApi.error(error.message);
           }
         },
         onCancel: async () => {
@@ -191,7 +191,7 @@ const RoleManagement: React.FC = () => {
         }
       })
     } catch (error: any) {
-      message.error(error.message);
+      messageApi.error(error.message);
     } finally {
       setLoading(false);
     }
@@ -234,6 +234,7 @@ const RoleManagement: React.FC = () => {
         }
       </Modal>
       {contextHolder}
+      {messageHolder}
     </TemplateContainer>
   )
 }