jiaxiang
10 months ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
4 additions and
7 deletions
-
package.json
-
src/components/RightContent/AvatarDropdown.tsx
|
|
|
@ -45,7 +45,6 @@ |
|
|
|
"antd-style": "^3.7.0", |
|
|
|
"classnames": "^2.5.1", |
|
|
|
"dayjs": "^1.11.13", |
|
|
|
"querystring": "^0.2.1", |
|
|
|
"react": "^18.3.1", |
|
|
|
"react-dom": "^18.3.1" |
|
|
|
}, |
|
|
|
@ -55,9 +54,7 @@ |
|
|
|
"@commitlint/config-conventional": "^19.5.0", |
|
|
|
"@testing-library/dom": "^10.4.0", |
|
|
|
"@testing-library/react": "^16.0.1", |
|
|
|
"@types/classnames": "^2.3.1", |
|
|
|
"@types/express": "^4.17.21", |
|
|
|
"@types/history": "^5.0.0", |
|
|
|
"@types/jest": "^29.5.13", |
|
|
|
"@types/lodash": "^4.17.10", |
|
|
|
"@types/react": "^18.3.11", |
|
|
|
|
|
|
|
@ -4,7 +4,6 @@ import { history, useModel } from '@umijs/max'; |
|
|
|
import { Spin } from 'antd'; |
|
|
|
import type { MenuProps } from 'antd'; |
|
|
|
import { createStyles } from 'antd-style'; |
|
|
|
import { stringify } from 'querystring'; |
|
|
|
import React from 'react'; |
|
|
|
import { flushSync } from 'react-dom'; |
|
|
|
import HeaderDropdown from '../HeaderDropdown'; |
|
|
|
@ -46,15 +45,16 @@ export const AvatarDropdown: React.FC<GlobalHeaderRightProps> = ({ menu, childre |
|
|
|
await outLogin(); |
|
|
|
const { search, pathname } = window.location; |
|
|
|
const urlParams = new URL(window.location.href).searchParams; |
|
|
|
const searchParams = new URLSearchParams({ |
|
|
|
redirect: pathname + search, |
|
|
|
}); |
|
|
|
/** 此方法会跳转到 redirect 参数所在的位置 */ |
|
|
|
const redirect = urlParams.get('redirect'); |
|
|
|
// Note: There may be security issues, please note
|
|
|
|
if (window.location.pathname !== '/user/login' && !redirect) { |
|
|
|
history.replace({ |
|
|
|
pathname: '/user/login', |
|
|
|
search: stringify({ |
|
|
|
redirect: pathname + search, |
|
|
|
}), |
|
|
|
search: searchParams.toString(), |
|
|
|
}); |
|
|
|
} |
|
|
|
}; |
|
|
|
|