Browse Source

feat: 修复token失效之后,重新登录,创建表单成功后返回到登录界面的问题

dev-zw-temp
zhaowei 7 months ago
parent
commit
5fb95438bd
3 changed files with 6 additions and 5 deletions
  1. +4
    -3
      react-ui/src/components/RightContent/AvatarDropdown.tsx
  2. +1
    -1
      react-ui/src/pages/Authorize/index.tsx
  3. +1
    -1
      react-ui/src/pages/User/Login/login.tsx

+ 4
- 3
react-ui/src/components/RightContent/AvatarDropdown.tsx View File

@@ -9,7 +9,7 @@ import { oauthLogout } from '@/utils/ui';
import { LogoutOutlined, UserOutlined } from '@ant-design/icons'; import { LogoutOutlined, UserOutlined } from '@ant-design/icons';
import { setAlpha } from '@ant-design/pro-components'; import { setAlpha } from '@ant-design/pro-components';
import { useEmotionCss } from '@ant-design/use-emotion-css'; import { useEmotionCss } from '@ant-design/use-emotion-css';
import { history, useModel } from '@umijs/max';
import { useModel, useNavigate } from '@umijs/max';
import { Avatar, Spin } from 'antd'; import { Avatar, Spin } from 'antd';
import type { MenuInfo } from 'rc-menu/lib/interface'; import type { MenuInfo } from 'rc-menu/lib/interface';
import React, { useCallback } from 'react'; import React, { useCallback } from 'react';
@@ -60,6 +60,7 @@ const AvatarLogo = () => {
}; };


const AvatarDropdown: React.FC<GlobalHeaderRightProps> = ({ menu }) => { const AvatarDropdown: React.FC<GlobalHeaderRightProps> = ({ menu }) => {
const navigate = useNavigate();
/** /**
* 退出登录,并且将当前的 url 保存 * 退出登录,并且将当前的 url 保存
*/ */
@@ -109,9 +110,9 @@ const AvatarDropdown: React.FC<GlobalHeaderRightProps> = ({ menu }) => {
loginOut(); loginOut();
return; return;
} }
history.push(`/account/${key}`);
navigate(`/account/${key}`);
}, },
[setInitialState],
[setInitialState, navigate],
); );


const loading = ( const loading = (


+ 1
- 1
react-ui/src/pages/Authorize/index.tsx View File

@@ -36,7 +36,7 @@ function Authorize() {
setSessionToken(access_token, access_token, expires_in); setSessionToken(access_token, access_token, expires_in);
message.success('登录成功!'); message.success('登录成功!');
await fetchUserInfo(); await fetchUserInfo();
history.push(redirect || '/');
history.replace(redirect || '/');
} }
}, [fetchUserInfo, redirect, code]); }, [fetchUserInfo, redirect, code]);




+ 1
- 1
react-ui/src/pages/User/Login/login.tsx View File

@@ -97,7 +97,7 @@ const Login = () => {


await fetchUserInfo(); await fetchUserInfo();
const urlParams = new URL(window.location.href).searchParams; const urlParams = new URL(window.location.href).searchParams;
history.push(urlParams.get('redirect') || '/');
history.replace(urlParams.get('redirect') || '/');
} else { } else {
if (error?.data?.code === 500 && error?.data?.msg === '验证码错误') { if (error?.data?.code === 500 && error?.data?.msg === '验证码错误') {
captchaInputRef.current?.focus({ captchaInputRef.current?.focus({


Loading…
Cancel
Save