15308555518/ MaxKB
1
0
Fork 0
mirror of https://github.com/1Panel-dev/MaxKB.git synced 2025-12-26 01:33:05 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'v2' of https://github.com/maxkb-dev/maxkb into v2

This commit is contained in:
liqiang-fit2cloud 2025-06-24 17:02:10 +08:00
parent 343d66d6d8 01a423235f
commit b646163a62
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui/src/router/index.ts
View File

@ -1,4 +1,4 @@
import { hasPermission } from '@/utils/permission/index'
import { hasPermission, set_next_route } from '@/utils/permission/index'
import NProgress from 'nprogress'
import {
createRouter,
@ -42,6 +42,7 @@ router.beforeEach(
await user.profile()
}
}
set_next_route(to)
// 判断是否有菜单权限
if (to.meta.permission ? hasPermission(to.meta.permission as any, 'OR') : true) {
next()

18
ui/src/utils/permission/index.ts
View File

@ -45,8 +45,11 @@ const hasPermissionChild = (
const roleOk = roleList.some((r) =>
role.includes(isFunction(r) ? (r as CRF)().toString() : r.toString()),
)
const editionList= permission.editionList
const editionOK = permission.editionList.length>0?editionList.some(e=>edition.toString()==e.toString()):true
const editionList = permission.editionList
const editionOK =
permission.editionList.length > 0
? editionList.some((e) => edition.toString() == e.toString())
: true
return permission.compare === 'AND'
? permissionOk && roleOk && editionOK
@ -84,3 +87,14 @@ export const hasPermission = (
return hasPermissionChild(permission)
}
}
const R = {
to: null,
}
export const get_next_route = () => {
return R.to
}
export const set_next_route = (to: any) => {
R.to = to
}