fix: initialState refresh

This commit is contained in:
jialin
2024-08-27 14:15:29 +08:00
parent 2b1f5d38e1
commit 9a0aeb491a
6 changed files with 51 additions and 55 deletions
+32 -43
View File
@@ -12,52 +12,13 @@ import { history, useIntl, useModel } from '@umijs/max';
import { Button, Checkbox, Form } from 'antd';
import CryptoJS from 'crypto-js';
import { useAtom } from 'jotai';
import { memo, useEffect, useMemo } from 'react';
import { flushSync } from 'react-dom';
import { login } from '../apis';
const REMEMBER_ME_KEY = 'r_m';
const CRYPT_TEXT = 'seal';
const renderLogo = () => {
return (
<div
style={{
display: 'flex',
marginBottom: 0,
padding: '15px 0',
justifyContent: 'center',
alignItems: 'center'
}}
>
<img src={LogoIcon} alt="logo" style={{ height: '26px' }} />
</div>
);
};
const renderWelCome = (intl: any) => {
return (
<div
style={{
display: 'flex',
marginBottom: 32,
fontSize: 20,
justifyContent: 'center',
alignItems: 'center'
}}
>
<div className="flex-center">
<span>
{intl?.formatMessage({ id: 'users.login.title' }, { name: '' })}
</span>
<img
src={LogoIcon}
alt="logo"
style={{ height: '24px', marginLeft: 10 }}
/>
</div>
</div>
);
};
const LoginForm = () => {
const [userInfo, setUserInfo] = useAtom(userAtom);
const [initialPassword, setInitialPassword] = useAtom(initialPasswordAtom);
@@ -65,6 +26,32 @@ const LoginForm = () => {
const intl = useIntl();
const [form] = Form.useForm();
console.log('initialState+++++++=login', userInfo, initialState);
const renderWelCome = useMemo(() => {
return (
<div
style={{
display: 'flex',
marginBottom: 32,
fontSize: 20,
justifyContent: 'center',
alignItems: 'center'
}}
>
<div className="flex-center">
<span>
{intl?.formatMessage({ id: 'users.login.title' }, { name: '' })}
</span>
<img
src={LogoIcon}
alt="logo"
style={{ height: '24px', marginLeft: 10 }}
/>
</div>
</div>
);
}, []);
const gotoDefaultPage = (userInfo: any) => {
const pathname =
userInfo && userInfo?.is_admin ? '/dashboard' : '/playground';
@@ -140,7 +127,9 @@ const LoginForm = () => {
}
};
callGetRememberMe();
useEffect(() => {
callGetRememberMe();
}, []);
return (
<div>
@@ -160,7 +149,7 @@ const LoginForm = () => {
style={{ width: '400px', margin: '0 auto' }}
onFinish={handleLogin}
>
{renderWelCome(intl)}
{renderWelCome}
<Form.Item
name="username"
rules={[
@@ -218,4 +207,4 @@ const LoginForm = () => {
);
};
export default LoginForm;
export default memo(LoginForm);
+8 -1
View File
@@ -1,6 +1,6 @@
import { userAtom } from '@/atoms/user';
import Footer from '@/components/footer';
import { history } from '@umijs/max';
import { history, useModel } from '@umijs/max';
import { useAtom } from 'jotai';
import { useEffect } from 'react';
import LoginForm from './components/login-form';
@@ -9,11 +9,18 @@ import styles from './components/styles.less';
const Login = () => {
const [userInfo, setUserInfo] = useAtom(userAtom);
const { initialState, setInitialState } = useModel('@@initialState') || {};
const gotoDefaultPage = (userInfo: any) => {
if (!userInfo || userInfo?.require_password_change) {
return;
}
if (!initialState?.currentUser) {
setInitialState((s: any) => ({
...s,
currentUser: userInfo
}));
}
const pathname = userInfo?.is_admin ? '/dashboard' : '/playground';
history.push(pathname, { replace: true });