fix: some bugs

src/lang/en-us.json

@@ -37,6 +37,7 @@
   "Admin list": "Admin list",
   "Filter with admin name or email": "Filter with admin name or email",
   "Add admin": "Add admin",
+  "Edit admin": "Edit admin",
   "Id": "ID",
   "Adminname": "Adminname",
   "Admin": "Admin",

src/lang/zh-cn.json

@@ -40,6 +40,7 @@
   "Admin list": "用户管理",
   "Filter with admin name or email": "筛选用户名或邮箱",
   "Add admin": "添加用户",
+  "Edit admin": "编辑用户",
   "Id": "ID",
   "Adminname": "用户名",
   "Admin": "用户",

src/pages/auth/admin/add-admin-form.tsx

@@ -27,13 +27,13 @@ const {
 interface Props {
   id: number
   visible: boolean
-  setVisible: Dispatch<SetStateAction<boolean>>
+  onCancel: () => void
   onSuccess?: () => void
 }
 
 const AddAdminForm: React.FC<Props> = (props: Props) => {
   const {
-    id, visible, setVisible, onSuccess,
+    id, visible, onCancel, onSuccess,
   } = props
   const { t } = useTranslation()
 
@@ -49,7 +49,7 @@ const AddAdminForm: React.FC<Props> = (props: Props) => {
         if (onSuccess) {
           onSuccess()
         }
-        setVisible(false)
+        onCancel()
       },
     },
   )
@@ -63,7 +63,7 @@ const AddAdminForm: React.FC<Props> = (props: Props) => {
         if (onSuccess) {
           onSuccess()
         }
-        setVisible(false)
+        onCancel()
       },
     },
   )
@@ -88,8 +88,8 @@ const AddAdminForm: React.FC<Props> = (props: Props) => {
   )
 
   const handleCancel = useCallback(() => {
-    setVisible(false)
-  }, [setVisible])
+    onCancel()
+  }, [onCancel])
 
   const onClickConfirm = useCallback(async () => {
     await form.validateFields()
@@ -105,12 +105,14 @@ const AddAdminForm: React.FC<Props> = (props: Props) => {
     if (id) {
       getAdminDetail(id)
       getAllRoles()
+    } else {
+      form.resetFields()
     }
-  }, [getAllRoles, getAdminDetail, id])
+  }, [getAllRoles, getAdminDetail, id, form])
 
   return (
     <Modal
-      title={t('Add admin')}
+      title={id ? t('Edit admin') : t('Add admin')}
       visible={visible}
       onCancel={handleCancel}
       onOk={onClickConfirm}

src/pages/auth/admin/index.tsx

@@ -193,7 +193,7 @@ const Admins: React.FC = () => {
             }}
           />
         </div>
-        <AuthFragment authKey="add">
+        <AuthFragment authKey="create">
           <Button
             type="primary"
             onClick={() => {
@@ -216,7 +216,10 @@ const Admins: React.FC = () => {
       <AddAdminForm
         id={selectedAdminId}
         visible={addPanelVisible}
-        setVisible={setAddPanelVisible}
+        onCancel={() => {
+          setSelectedAdminId(0)
+          setAddPanelVisible(false)
+        }}
         onSuccess={() => {
           setSelectedAdminId(0)
           getAdmins({ ...pagination }, filter)

src/pages/auth/role/index.tsx

@@ -8,6 +8,7 @@ import { useTranslation } from 'react-i18next'
 import AuthFragment from '@/components/auth-fragment'
 import api from '@/service'
 
+import { showMessage } from '@/utils'
 import RoleDetailDrawer from './role-detail-drawer'
 
 const { getRoles: getRolesRequest, deleteRole: deleteRoleRequest } = api
@@ -119,7 +120,7 @@ const Roles: React.FC = () => {
 
   return (
     <div>
-      <AuthFragment authKey="add">
+      <AuthFragment authKey="create">
         <Button
           type="primary"
           size="small"
@@ -145,10 +146,13 @@ const Roles: React.FC = () => {
         visible={drawerVisible}
         id={selectedRoleId}
         setVisible={setDrawerVisible}
-        onSuccess={() => getRoles({
-          current: pagination.current,
-          pageSize: pagination.pageSize,
-        })}
+        onSuccess={() => {
+          setDrawerVisible(false)
+          getRoles({
+            current: pagination.current,
+            pageSize: pagination.pageSize,
+          })
+        }}
       />
     </div>
   )