CN-484 交互优化:登录拦截后,在登录成功后跳转原url

This commit is contained in:
hyx
2022-05-18 17:04:27 +08:00
parent 681fda6a67
commit 221ec8f076
3 changed files with 6 additions and 2 deletions

View File

@@ -77,7 +77,7 @@ export default {
if (!this.$_.isEmpty(res.data.theme)) {
localStorage.setItem(storageKey.theme, res.data.theme)
}
res.loginSuccessPath = this.loginSuccessPath
res.loginSuccessPath = this.loginSuccessPath ? this.loginSuccessPath : localStorage.getItem(storageKey.tokenExpireCurrentPath)
this.loginSuccess(res)
localStorage.setItem(storageKey.username, this.username)
} else if (res.code === 518005) {

View File

@@ -11,6 +11,9 @@ const loginWhiteList = ['/login', '/'] // 免登陆白名单
const permissionWhiteList = [...loginWhiteList, '/entityDetail'] // 权限白名单
router.beforeEach(async (to, from, next) => {
if (to.path.indexOf('/login') == -1) {
localStorage.setItem(storageKey.tokenExpireCurrentPath, to.fullPath)
}
// 加载iso-3166-2资源
loadGeoData()
// 加载baseUrl

View File

@@ -24,7 +24,8 @@ export const storageKey = {
unsavedChange: 'cn-unsaved-change',
entitySearchHistory: 'cn-entity-search-history',
echartLegendFontSize: 'echartLegendFontSize',
echartLabelFontSize: 'echartLabelFontSize'
echartLabelFontSize: 'echartLabelFontSize',
tokenExpireCurrentPath: 'token-expire-current-path'
}
// 统一定义跳转来源