This commit is contained in:
@@ -238,7 +238,7 @@ async function processFrontendMenu(router: Router): Promise<void> {
|
||||
throw new Error('获取用户角色失败')
|
||||
}
|
||||
|
||||
const filteredMenuList = filterMenuByRoles(menuList, roles)
|
||||
const filteredMenuList = filterMenuByRoles(menuList, roles, Number(userStore.info.user_type))
|
||||
await new Promise((resolve) => setTimeout(resolve, 300))
|
||||
await registerAndStoreMenu(router, filteredMenuList, closeLoading)
|
||||
} catch (error) {
|
||||
@@ -264,7 +264,11 @@ async function processBackendMenu(router: Router): Promise<void> {
|
||||
}
|
||||
|
||||
// 普通用户:使用后端返回的菜单
|
||||
const backendMenus = userStore.menus || []
|
||||
let backendMenus = userStore.menus || []
|
||||
if (Number(userStore.info.user_type) === 2) {
|
||||
backendMenus = ensureCarrierManagementMenuEntries(backendMenus)
|
||||
userStore.setMenus(backendMenus)
|
||||
}
|
||||
const routeMap = buildRouteMap(asyncRoutes)
|
||||
|
||||
const menuList = backendMenus
|
||||
@@ -279,6 +283,46 @@ async function processBackendMenu(router: Router): Promise<void> {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Backend menu mode may return the existing System menu without the newly added
|
||||
* carrier detail and threshold-hit entries. Add those as sibling routes under System
|
||||
* for platform accounts, without introducing a nested RouterView layout.
|
||||
*/
|
||||
function ensureCarrierManagementMenuEntries(menus: any[]): any[] {
|
||||
const requiredEntries = [
|
||||
{
|
||||
url: `${RoutesAlias.CarrierDetail}/:id`,
|
||||
name: 'menus.system.carrierDetail'
|
||||
},
|
||||
{
|
||||
url: RoutesAlias.CarrierTrafficThresholdHits,
|
||||
name: 'menus.system.carrierTrafficThresholdHits'
|
||||
}
|
||||
]
|
||||
let systemMenuFound = false
|
||||
|
||||
const visit = (items: any[]): any[] =>
|
||||
items.map((item) => {
|
||||
const children = Array.isArray(item.children) ? visit(item.children) : []
|
||||
const itemUrl = item.url || item.path
|
||||
|
||||
if (itemUrl === '/system') {
|
||||
systemMenuFound = true
|
||||
const existingUrls = new Set(children.map((child) => child.url || child.path))
|
||||
const missingEntries = requiredEntries.filter((entry) => !existingUrls.has(entry.url))
|
||||
return { ...item, children: [...children, ...missingEntries] }
|
||||
}
|
||||
|
||||
return Array.isArray(item.children) ? { ...item, children } : item
|
||||
})
|
||||
|
||||
const enrichedMenus = visit(menus)
|
||||
if (systemMenuFound) return enrichedMenus
|
||||
|
||||
const systemMenu = { url: '/system', name: 'menus.system.title', children: requiredEntries }
|
||||
return [...enrichedMenus, systemMenu]
|
||||
}
|
||||
|
||||
/**
|
||||
* 合并默认菜单
|
||||
* 将配置的默认菜单合并到后端返回的菜单中
|
||||
@@ -448,15 +492,21 @@ function handleMenuError(error: unknown): void {
|
||||
/**
|
||||
* 根据角色过滤菜单
|
||||
*/
|
||||
const filterMenuByRoles = (menu: AppRouteRecord[], roles: string[]): AppRouteRecord[] => {
|
||||
const filterMenuByRoles = (
|
||||
menu: AppRouteRecord[],
|
||||
roles: string[],
|
||||
userType: number
|
||||
): AppRouteRecord[] => {
|
||||
return menu.reduce((acc: AppRouteRecord[], item) => {
|
||||
const itemRoles = item.meta?.roles
|
||||
const hasPermission = !itemRoles || itemRoles.some((role) => roles?.includes(role))
|
||||
const allowedUserTypes = item.meta?.allowedUserTypes as number[] | undefined
|
||||
const hasRole = !itemRoles || itemRoles.some((role) => roles?.includes(role))
|
||||
const hasAllowedUserType = !allowedUserTypes || allowedUserTypes.includes(userType)
|
||||
|
||||
if (hasPermission) {
|
||||
if (hasRole && hasAllowedUserType) {
|
||||
const filteredItem = { ...item }
|
||||
if (filteredItem.children?.length) {
|
||||
filteredItem.children = filterMenuByRoles(filteredItem.children, roles)
|
||||
filteredItem.children = filterMenuByRoles(filteredItem.children, roles, userType)
|
||||
}
|
||||
acc.push(filteredItem)
|
||||
}
|
||||
|
||||
@@ -205,4 +205,3 @@ export const buildLoginRedirect = (currentPath: string): string => {
|
||||
}
|
||||
return `/auth/login?redirect=${encodeURIComponent(currentPath)}`
|
||||
}
|
||||
|
||||
|
||||
@@ -118,6 +118,26 @@ export const asyncRoutes: AppRouteRecord[] = [
|
||||
keepAlive: true
|
||||
}
|
||||
},
|
||||
{
|
||||
path: 'carrier-management/detail/:id',
|
||||
name: 'CarrierDetail',
|
||||
component: RoutesAlias.CarrierDetail,
|
||||
meta: {
|
||||
title: 'menus.system.carrierDetail',
|
||||
isHide: true,
|
||||
keepAlive: false
|
||||
}
|
||||
},
|
||||
{
|
||||
path: 'carrier-traffic-threshold-hits',
|
||||
name: 'CarrierTrafficThresholdHits',
|
||||
component: RoutesAlias.CarrierTrafficThresholdHitsPage,
|
||||
meta: {
|
||||
title: 'menus.system.carrierTrafficThresholdHits',
|
||||
keepAlive: true,
|
||||
allowedUserTypes: [1, 2]
|
||||
}
|
||||
},
|
||||
{
|
||||
path: 'user-center',
|
||||
name: 'UserCenter',
|
||||
|
||||
@@ -21,6 +21,9 @@ export enum RoutesAlias {
|
||||
RoleDetail = '/system/role/detail', // 角色详情
|
||||
Permission = '/system/permission', // 权限管理
|
||||
CarrierManagement = '/system/carrier-management', // 运营商管理
|
||||
CarrierDetail = '/system/carrier-management/detail', // 运营商详情
|
||||
CarrierTrafficThresholdHits = '/system/carrier-traffic-threshold-hits', // 通道阈值命中记录
|
||||
CarrierTrafficThresholdHitsPage = '/system/carrier-management/traffic-threshold-hits', // 通道阈值命中记录组件
|
||||
UserCenter = '/system/user-center', // 用户中心
|
||||
|
||||
// 审计中心
|
||||
|
||||
Reference in New Issue
Block a user