From d3422f877f118771f04f9bc62e6d2665b3399898 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BA=E7=8B=A8?= <18119604035@163.com>
Date: Wed, 15 Mar 2023 16:17:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=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

---
 .../administrator/compenents/create.tsx       | 21 +++++++-------
 .../administrator/compenents/update.tsx       | 28 ++++++++-----------
 2 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/src/pages/system/administrator/compenents/create.tsx b/src/pages/system/administrator/compenents/create.tsx
index 399d3b8..5f78466 100644
--- a/src/pages/system/administrator/compenents/create.tsx
+++ b/src/pages/system/administrator/compenents/create.tsx
@@ -96,16 +96,6 @@ export const SystemAdministratorCreate: React.FC<PropInterface> = ({
             onFinishFailed={onFinishFailed}
             autoComplete="off"
           >
-            <Form.Item label="角色" name="roleIds">
-              <Select
-                style={{ width: 200 }}
-                mode="multiple"
-                allowClear
-                placeholder="请选择角色"
-                onChange={handleChange}
-                options={roles}
-              />
-            </Form.Item>
             <Form.Item
               label="姓名"
               name="name"
@@ -130,11 +120,20 @@ export const SystemAdministratorCreate: React.FC<PropInterface> = ({
                 placeholder="请输入登录密码"
               />
             </Form.Item>
+            <Form.Item label="角色" name="roleIds">
+              <Select
+                style={{ width: 200 }}
+                mode="multiple"
+                allowClear
+                placeholder="请选择角色"
+                onChange={handleChange}
+                options={roles}
+              />
+            </Form.Item>
             <Form.Item
               label="禁止登录"
               name="is_ban_login"
               valuePropName="checked"
-              rules={[{ required: true, message: "请选择禁止登录!" }]}
             >
               <Switch onChange={onChange} />
             </Form.Item>
diff --git a/src/pages/system/administrator/compenents/update.tsx b/src/pages/system/administrator/compenents/update.tsx
index 123df2a..d5932ee 100644
--- a/src/pages/system/administrator/compenents/update.tsx
+++ b/src/pages/system/administrator/compenents/update.tsx
@@ -67,7 +67,7 @@ export const SystemAdministratorUpdate: React.FC<PropInterface> = ({
         id,
         values.name,
         values.email,
-        values.password,
+        values.password || "",
         values.is_ban_login,
         values.roleIds
       )
@@ -114,16 +114,6 @@ export const SystemAdministratorUpdate: React.FC<PropInterface> = ({
             onFinishFailed={onFinishFailed}
             autoComplete="off"
           >
-            <Form.Item label="角色" name="roleIds">
-              <Select
-                style={{ width: 200 }}
-                mode="multiple"
-                allowClear
-                placeholder="请选择角色"
-                onChange={handleChange}
-                options={roles}
-              />
-            </Form.Item>
             <Form.Item
               label="姓名"
               name="name"
@@ -138,16 +128,22 @@ export const SystemAdministratorUpdate: React.FC<PropInterface> = ({
             >
               <Input style={{ width: 200 }} placeholder="请输入学员邮箱" />
             </Form.Item>
-            <Form.Item
-              label="密码"
-              name="password"
-              rules={[{ required: true, message: "请输入登录密码!" }]}
-            >
+            <Form.Item label="密码" name="password">
               <Input.Password
                 style={{ width: 200 }}
                 placeholder="请输入登录密码"
               />
             </Form.Item>
+            <Form.Item label="角色" name="roleIds">
+              <Select
+                style={{ width: 200 }}
+                mode="multiple"
+                allowClear
+                placeholder="请选择角色"
+                onChange={handleChange}
+                options={roles}
+              />
+            </Form.Item>
             <Form.Item
               label="禁止登录"
               name="is_ban_login"