Browse Source

feat: 修改调整地址

dev-zw-home
zhaowei 6 months ago
parent
commit
654ade05f7
4 changed files with 9 additions and 5 deletions
  1. +0
    -1
      react-ui/src/app.tsx
  2. +3
    -1
      react-ui/src/pages/Authorize/index.tsx
  3. +6
    -0
      react-ui/src/pages/User/Login/index.tsx
  4. +0
    -3
      react-ui/src/utils/ui.tsx

+ 0
- 1
react-ui/src/app.tsx View File

@@ -118,7 +118,6 @@ export const layout: RuntimeConfig['layout'] = ({ initialState }) => {
};

export const onRouteChange: RuntimeConfig['onRouteChange'] = async (e) => {
debugger;
// console.log('onRouteChange');

// 路由切换时,尤其是回退时,关闭打开的弹框


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

@@ -38,8 +38,10 @@ function Authorize() {
message.success('登录成功!');
await fetchUserInfo();
const redierctUrl = SessionStorage.getItem(SessionStorage.redirectUrl);
console.log('redirect', redirect);
console.log('redierctUrl', redierctUrl);
history.replace(redirect || redierctUrl || '/workspace');
SessionStorage.removeItem(SessionStorage.redirectUrl);
// SessionStorage.removeItem(SessionStorage.redirectUrl);
}
}, [fetchUserInfo, redirect, code]);



+ 6
- 0
react-ui/src/pages/User/Login/index.tsx View File

@@ -15,6 +15,12 @@ const Login = () => {
if (res && res.data) {
const clientInfo = res.data;
SessionStorage.setItem(SessionStorage.clientInfoKey, clientInfo, true);
const urlParams = new URL(window.location.href).searchParams;
const redirectUrl = urlParams.get('redirect');
console.log('login redirectUrl', redirectUrl);
if (redirectUrl) {
SessionStorage.setItem(SessionStorage.redirectUrl, redirectUrl);
}
gotoOAuth2();
}
};


+ 0
- 3
react-ui/src/utils/ui.tsx View File

@@ -77,9 +77,6 @@ export const gotoLoginPage = (toHome: boolean = true) => {
if (pathname !== PageEnum.LOGIN) {
closeAllModals();
removeAllPageCacheState();
if (newSearch) {
SessionStorage.setItem(newSearch, SessionStorage.redirectUrl);
}
history.replace({
pathname: PageEnum.LOGIN,
search: newSearch,


Loading…
Cancel
Save