Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
B
basic-vue-admin
概览
概览
详情
活动
周期分析
版本库
存储库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
Basic
basic-vue-admin
Commits
8fb03961
提交
8fb03961
authored
3月 23, 2021
作者:
Vben
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: ensure permissionMode exists close #409
上级
fedd9cae
隐藏空白字符变更
内嵌
并排
正在显示
3 个修改的文件
包含
18 行增加
和
16 行删除
+18
-16
projectSetting.ts
src/settings/projectSetting.ts
+1
-1
permission.ts
src/store/modules/permission.ts
+15
-13
vuexHelper.ts
src/utils/helper/vuexHelper.ts
+2
-2
没有找到文件。
src/settings/projectSetting.ts
浏览文件 @
8fb03961
...
@@ -20,7 +20,7 @@ const setting: ProjectConfig = {
...
@@ -20,7 +20,7 @@ const setting: ProjectConfig = {
settingButtonPosition
:
SettingButtonPositionEnum
.
AUTO
,
settingButtonPosition
:
SettingButtonPositionEnum
.
AUTO
,
// Permission mode
// Permission mode
permissionMode
:
PermissionModeEnum
.
ROLE
,
permissionMode
:
PermissionModeEnum
.
BACK
,
// Permission-related cache is stored in sessionStorage or localStorage
// Permission-related cache is stored in sessionStorage or localStorage
permissionCacheType
:
CacheTypeEnum
.
LOCAL
,
permissionCacheType
:
CacheTypeEnum
.
LOCAL
,
...
...
src/store/modules/permission.ts
浏览文件 @
8fb03961
import
type
{
AppRouteRecordRaw
,
Menu
}
from
'/@/router/types'
;
import
type
{
AppRouteRecordRaw
,
Menu
}
from
'/@/router/types'
;
import
store
from
'/@/store/index'
;
import
{
hotModuleUnregisterModule
}
from
'/@/utils/helper/vuexHelper'
;
import
store
from
'/@/store'
;
import
{
toRaw
}
from
'vue'
;
import
{
VuexModule
,
Mutation
,
Module
,
getModule
,
Action
}
from
'vuex-module-decorators'
;
import
{
VuexModule
,
Mutation
,
Module
,
getModule
,
Action
}
from
'vuex-module-decorators'
;
import
{
hotModuleUnregisterModule
}
from
'/@/utils/helper/vuexHelper'
;
import
{
PermissionModeEnum
}
from
'/@/enums/appEnum'
;
import
{
PermissionModeEnum
}
from
'/@/enums/appEnum'
;
import
{
appStore
}
from
'/@/store/modules/app'
;
import
{
appStore
}
from
'/@/store/modules/app'
;
import
{
userStore
}
from
'/@/store/modules/user'
;
import
{
userStore
}
from
'/@/store/modules/user'
;
import
projectSetting
from
'/@/settings/projectSetting'
;
import
{
asyncRoutes
}
from
'/@/router/routes'
;
import
{
asyncRoutes
}
from
'/@/router/routes'
;
import
{
ERROR_LOG_ROUTE
,
PAGE_NOT_FOUND_ROUTE
}
from
'/@/router/routes/basic'
;
import
{
transformObjToRoute
,
flatMultiLevelRoutes
}
from
'/@/router/helper/routeHelper'
;
import
{
transformRouteToMenu
}
from
'/@/router/helper/menuHelper'
;
import
{
filter
}
from
'/@/utils/helper/treeHelper'
;
import
{
filter
}
from
'/@/utils/helper/treeHelper'
;
import
{
toRaw
}
from
'vue'
;
import
{
getMenuListById
}
from
'/@/api/sys/menu'
;
import
{
getMenuListById
}
from
'/@/api/sys/menu'
;
import
{
getPermCodeByUserId
}
from
'/@/api/sys/user'
;
import
{
getPermCodeByUserId
}
from
'/@/api/sys/user'
;
import
{
transformObjToRoute
,
flatMultiLevelRoutes
}
from
'/@/router/helper/routeHelper'
;
import
{
transformRouteToMenu
}
from
'/@/router/helper/menuHelper'
;
import
{
useMessage
}
from
'/@/hooks/web/useMessage'
;
import
{
useMessage
}
from
'/@/hooks/web/useMessage'
;
import
{
useI18n
}
from
'/@/hooks/web/useI18n'
;
import
{
useI18n
}
from
'/@/hooks/web/useI18n'
;
import
{
ERROR_LOG_ROUTE
,
PAGE_NOT_FOUND_ROUTE
}
from
'/@/router/routes/basic'
;
const
{
createMessage
}
=
useMessage
();
const
NAME
=
'app-permission'
;
const
NAME
=
'app-permission'
;
hotModuleUnregisterModule
(
NAME
);
hotModuleUnregisterModule
(
NAME
);
@
Module
({
dynamic
:
true
,
namespaced
:
true
,
store
,
name
:
NAME
})
@
Module
({
dynamic
:
true
,
namespaced
:
true
,
store
,
name
:
NAME
})
...
@@ -94,13 +96,11 @@ class Permission extends VuexModule {
...
@@ -94,13 +96,11 @@ class Permission extends VuexModule {
const
{
t
}
=
useI18n
();
const
{
t
}
=
useI18n
();
let
routes
:
AppRouteRecordRaw
[]
=
[];
let
routes
:
AppRouteRecordRaw
[]
=
[];
const
roleList
=
toRaw
(
userStore
.
getRoleListState
);
const
roleList
=
toRaw
(
userStore
.
getRoleListState
);
const
{
permissionMode
=
projectSetting
.
permissionMode
}
=
appStore
.
getProjectConfig
;
const
{
permissionMode
=
PermissionModeEnum
.
ROLE
}
=
appStore
.
getProjectConfig
;
// role permissions
// role permissions
if
(
permissionMode
===
PermissionModeEnum
.
ROLE
)
{
if
(
permissionMode
===
PermissionModeEnum
.
ROLE
)
{
const
routeFilter
=
(
route
)
=>
{
const
routeFilter
=
(
route
:
AppRouteRecordRaw
)
=>
{
const
{
meta
}
=
route
as
AppRouteRecordRaw
;
const
{
meta
}
=
route
;
const
{
roles
}
=
meta
||
{};
const
{
roles
}
=
meta
||
{};
if
(
!
roles
)
return
true
;
if
(
!
roles
)
return
true
;
return
roleList
.
some
((
role
)
=>
roles
.
includes
(
role
));
return
roleList
.
some
((
role
)
=>
roles
.
includes
(
role
));
...
@@ -111,6 +111,8 @@ class Permission extends VuexModule {
...
@@ -111,6 +111,8 @@ class Permission extends VuexModule {
routes
=
flatMultiLevelRoutes
(
routes
);
routes
=
flatMultiLevelRoutes
(
routes
);
// If you are sure that you do not need to do background dynamic permissions, please comment the entire judgment below
// If you are sure that you do not need to do background dynamic permissions, please comment the entire judgment below
}
else
if
(
permissionMode
===
PermissionModeEnum
.
BACK
)
{
}
else
if
(
permissionMode
===
PermissionModeEnum
.
BACK
)
{
const
{
createMessage
}
=
useMessage
();
createMessage
.
loading
({
createMessage
.
loading
({
content
:
t
(
'sys.app.menuLoading'
),
content
:
t
(
'sys.app.menuLoading'
),
duration
:
1
,
duration
:
1
,
...
...
src/utils/helper/vuexHelper.ts
浏览文件 @
8fb03961
import
store
from
'/@/store'
;
import
store
from
'/@/store'
;
export
function
hotModuleUnregisterModule
(
name
:
string
)
{
export
function
hotModuleUnregisterModule
(
name
:
string
)
{
if
(
!
name
)
return
;
if
(
!
name
||
!
import
.
meta
.
hot
)
return
;
if
((
store
.
state
as
any
)[
name
])
{
if
((
store
.
state
as
Recordable
)[
name
])
{
store
.
unregisterModule
(
name
);
store
.
unregisterModule
(
name
);
}
}
}
}
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论