From f922cb3b93638482cced0749da89733816abd980 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E5=B7=9E?= <wzszhengzhou@hotmail.com>
Date: Mon, 5 Jul 2021 10:50:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=99=BB=E5=BD=95=E7=99=BB?=
 =?UTF-8?q?=E5=87=BA=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/userCenter/UserCenter.tsx          | 15 ++++++++++++---
 src/pages/login/index.tsx                         | 14 ++++++++++----
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/components/AppHeader/components/userCenter/UserCenter.tsx b/src/components/AppHeader/components/userCenter/UserCenter.tsx
index 04cf6fa..d669d70 100644
--- a/src/components/AppHeader/components/userCenter/UserCenter.tsx
+++ b/src/components/AppHeader/components/userCenter/UserCenter.tsx
@@ -25,10 +25,14 @@ export default function UserCenter(props: UserCenterProps) {
     setPopVisible(nextVisible);
   }, []);
 
+  const onLogoutBtnClick = useCallback(() => {
+    setPopVisible(false);
+  }, []);
+
   return (
     <Popover
       overlayClassName={styles.popWrapper}
-      content={<PopContent />}
+      content={<PopContent onLogoutBtnClick={onLogoutBtnClick} />}
       trigger="click"
       visible={popVisible}
       onVisibleChange={onVisibleChange}
@@ -45,15 +49,20 @@ export default function UserCenter(props: UserCenterProps) {
   );
 }
 
-function PopContent(props) {
+interface PopContentProps {
+  onLogoutBtnClick: () => void;
+}
+
+function PopContent(props: PopContentProps) {
+  const { onLogoutBtnClick } = props;
   const {
     refresh,
     initialState: { currentUser } = {},
     setInitialState,
   } = useModel('@@initialState');
-  console.log(currentUser);
 
   const tryLogout = useCallback(() => {
+    if (onLogoutBtnClick) onLogoutBtnClick();
     confirm({
       onOk() {
         logout();
diff --git a/src/pages/login/index.tsx b/src/pages/login/index.tsx
index e476462..76d21ed 100644
--- a/src/pages/login/index.tsx
+++ b/src/pages/login/index.tsx
@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { Input, Button } from 'antd';
+import { Input, Button, Form } from 'antd';
 import styles from './login.less';
 import { history, useModel } from 'umi';
 import { MobileFilled, LockFilled } from '@ant-design/icons';
@@ -52,7 +52,7 @@ export default function Login() {
         <div>欢迎使用</div>
         <div>locking</div>
       </div>
-      <div className={styles.form}>
+      <Form className={styles.form}>
         <Input
           size="large"
           prefix={<MobileFilled className={styles.icon} />}
@@ -71,10 +71,16 @@ export default function Login() {
           onChange={(e) => setPassword(e.target.value)}
         />
         <div className={styles.errText}>{errText}</div>
-        <Button loading={loading} type="primary" block onClick={onLogin}>
+        <Button
+          loading={loading}
+          type="primary"
+          block
+          onClick={onLogin}
+          htmlType="submit"
+        >
           登录
         </Button>
-      </div>
+      </Form>
     </div>
   );
 }