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 ( } + content={} 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() {
欢迎使用
locking
-
+
} @@ -71,10 +71,16 @@ export default function Login() { onChange={(e) => setPassword(e.target.value)} />
{errText}
- -
+ ); }