Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
B
basic-vue-admin
概览
概览
详情
活动
周期分析
版本库
存储库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
Basic
basic-vue-admin
Commits
87583c8b
提交
87583c8b
authored
7月 14, 2021
作者:
无木
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: ensure PAGE_NOT_FOUND_ROUTE exist
修复某些情况下404路由可能白屏的问题
上级
1e633790
隐藏空白字符变更
内嵌
并排
正在显示
2 个修改的文件
包含
28 行增加
和
23 行删除
+28
-23
permissionGuard.ts
src/router/guard/permissionGuard.ts
+26
-23
user.ts
src/store/modules/user.ts
+2
-0
没有找到文件。
src/router/guard/permissionGuard.ts
浏览文件 @
87583c8b
...
...
@@ -8,7 +8,6 @@ import { useUserStoreWithOut } from '/@/store/modules/user';
import
{
PAGE_NOT_FOUND_ROUTE
}
from
'/@/router/routes/basic'
;
import
{
RootRoute
}
from
'/@/router/routes'
;
import
{
omit
}
from
'lodash-es'
;
const
LOGIN_PATH
=
PageEnum
.
BASE_LOGIN
;
...
...
@@ -19,20 +18,26 @@ const whitePathList: PageEnum[] = [LOGIN_PATH];
export
function
createPermissionGuard
(
router
:
Router
)
{
const
userStore
=
useUserStoreWithOut
();
const
permissionStore
=
usePermissionStoreWithOut
();
router
.
beforeEach
(
async
(
to
,
from
)
=>
{
router
.
beforeEach
(
async
(
to
,
from
,
next
)
=>
{
// Jump to the 404 page after processing the login
if
(
from
.
path
===
LOGIN_PATH
&&
to
.
name
===
PAGE_NOT_FOUND_ROUTE
.
name
)
{
next
(
userStore
.
getUserInfo
.
homePath
||
PageEnum
.
BASE_HOME
);
return
;
}
if
(
from
.
path
===
ROOT_PATH
&&
to
.
path
===
PageEnum
.
BASE_HOME
&&
userStore
.
getUserInfo
.
homePath
&&
userStore
.
getUserInfo
.
homePath
!==
PageEnum
.
BASE_HOME
)
{
//
next(userStore.getUserInfo.homePath);
return
userStore
.
getUserInfo
.
homePath
;
next
(
userStore
.
getUserInfo
.
homePath
);
return
;
}
// Whitelist can be directly entered
if
(
whitePathList
.
includes
(
to
.
path
as
PageEnum
))
{
//
next();
next
();
return
;
}
...
...
@@ -42,7 +47,7 @@ export function createPermissionGuard(router: Router) {
if
(
!
token
)
{
// You can access without permission. You need to set the routing meta.ignoreAuth to true
if
(
to
.
meta
.
ignoreAuth
)
{
//
next();
next
();
return
;
}
...
...
@@ -57,18 +62,12 @@ export function createPermissionGuard(router: Router) {
redirect
:
to
.
path
,
};
}
//next(redirectData);
return
redirectData
;
}
// Jump to the 404 page after processing the login
if
(
from
.
path
===
LOGIN_PATH
&&
to
.
name
===
PAGE_NOT_FOUND_ROUTE
.
name
)
{
//next(userStore.getUserInfo.homePath || PageEnum.BASE_HOME);
return
userStore
.
getUserInfo
.
homePath
||
PageEnum
.
BASE_HOME
;
next
(
redirectData
);
return
;
}
if
(
permissionStore
.
getIsDynamicAddedRoute
)
{
//
next();
next
();
return
;
}
...
...
@@ -78,14 +77,18 @@ export function createPermissionGuard(router: Router) {
router
.
addRoute
(
route
as
unknown
as
RouteRecordRaw
);
});
const
redirectPath
=
(
from
.
query
.
redirect
||
to
.
path
)
as
string
;
const
redirect
=
decodeURIComponent
(
redirectPath
);
const
nextData
=
to
.
path
===
redirect
?
{
...
omit
(
to
,
[
'name'
,
'params'
]),
replace
:
true
}
:
{
path
:
redirect
};
router
.
addRoute
(
PAGE_NOT_FOUND_ROUTE
as
unknown
as
RouteRecordRaw
);
permissionStore
.
setDynamicAddedRoute
(
true
);
// next(nextData);
return
nextData
;
if
(
to
.
name
===
PAGE_NOT_FOUND_ROUTE
.
name
)
{
// 动态添加路由后,此处应当重定向到fullPath,否则会加载404页面内容
next
({
path
:
to
.
fullPath
,
replace
:
true
});
}
else
{
const
redirectPath
=
(
from
.
query
.
redirect
||
to
.
path
)
as
string
;
const
redirect
=
decodeURIComponent
(
redirectPath
);
const
nextData
=
to
.
path
===
redirect
?
{
...
to
,
replace
:
true
}
:
{
path
:
redirect
};
next
(
nextData
);
}
});
}
src/store/modules/user.ts
浏览文件 @
87583c8b
...
...
@@ -13,6 +13,7 @@ import { useMessage } from '/@/hooks/web/useMessage';
import
{
router
}
from
'/@/router'
;
import
{
usePermissionStore
}
from
'/@/store/modules/permission'
;
import
{
RouteRecordRaw
}
from
'vue-router'
;
import
{
PAGE_NOT_FOUND_ROUTE
}
from
'/@/router/routes/basic'
;
interface
UserState
{
userInfo
:
Nullable
<
UserInfo
>
;
...
...
@@ -98,6 +99,7 @@ export const useUserStore = defineStore({
routes
.
forEach
((
route
)
=>
{
router
.
addRoute
(
route
as
unknown
as
RouteRecordRaw
);
});
router
.
addRoute
(
PAGE_NOT_FOUND_ROUTE
as
unknown
as
RouteRecordRaw
);
permissionStore
.
setDynamicAddedRoute
(
true
);
}
await
router
.
replace
(
userInfo
.
homePath
||
PageEnum
.
BASE_HOME
);
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论