Commit 87ca9fd5 authored by jim's avatar jim

fix #729 prevent pollution url history

parent df93c649
...@@ -102,10 +102,15 @@ class BasicLayout extends React.PureComponent { ...@@ -102,10 +102,15 @@ class BasicLayout extends React.PureComponent {
// According to the url parameter to redirect // According to the url parameter to redirect
// 这里是重定向的,重定向到 url 的 redirect 参数所示地址 // 这里是重定向的,重定向到 url 的 redirect 参数所示地址
const urlParams = new URL(window.location.href); const urlParams = new URL(window.location.href);
const redirect = urlParams.searchParams.get('redirect') || '/dashboard/analysis';
const redirect = urlParams.searchParams.get('redirect');
// Remove the parameters in the url // Remove the parameters in the url
urlParams.searchParams.delete('redirect'); if (redirect) {
window.history.pushState(null, 'redirect', urlParams.href); urlParams.searchParams.delete('redirect');
window.history.replaceState(null, 'redirect', urlParams.href);
} else {
return '/dashboard/analysis';
}
return redirect; return redirect;
} }
handleMenuCollapse = (collapsed) => { handleMenuCollapse = (collapsed) => {
......
...@@ -31,7 +31,7 @@ export default { ...@@ -31,7 +31,7 @@ export default {
const pathname = yield select(state => state.routing.location.pathname); const pathname = yield select(state => state.routing.location.pathname);
// add the parameters in the url // add the parameters in the url
urlParams.searchParams.set('redirect', pathname); urlParams.searchParams.set('redirect', pathname);
window.history.pushState(null, 'login', urlParams.href); window.history.replaceState(null, 'login', urlParams.href);
} finally { } finally {
// yield put(routerRedux.push('/user/login')); // yield put(routerRedux.push('/user/login'));
// Login out after permission changes to admin or user // Login out after permission changes to admin or user
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment