center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #4481 from dataease/pr@dev@fix_router_history

Browse Source 
fix(登录): 退出后重新登录路由到历史页面
This commit is contained in:
fit2cloud-chenyw 2023-02-08 11:17:15 +08:00 committed by GitHub
commit babb8a376d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/layout/components/Topbar.vue
View File

@ -365,7 +365,7 @@ export default {
if (result !== 'success' && result !== 'fail') { if (result !== 'success' && result !== 'fail') {
window.location.href = result window.location.href = result
} else { } else {
this.$router.push('/login') this.$router.push(`/login?redirect=${this.$route.fullPath}`)
} }
}, },
loadUiInfo() { loadUiInfo() {

5
frontend/src/permission.js
View File

@ -53,7 +53,7 @@ const routeBefore = (callBack) => {
callBack() callBack()
} }
} }
router.beforeEach(async(to, from, next) => routeBefore(() => { router.beforeEach(async (to, from, next) => routeBefore(() => {
// start progress bar // start progress bar
NProgress.start() NProgress.start()
const mobileIgnores = ['/delink'] const mobileIgnores = ['/delink']
@ -118,8 +118,7 @@ router.beforeEach(async(to, from, next) => routeBefore(() => {
next() next()
} else { } else {
// other pages that do not have permission to access are redirected to the login page. // other pages that do not have permission to access are redirected to the login page.
// next(`/login?redirect=${to.path}`) next(`/login?redirect=${to.path}`)
next('/login')
NProgress.done() NProgress.done()
} }
} }