diff --git a/admin-frontend-vue/src/config/platform-scope.ts b/admin-frontend-vue/src/config/platform-scope.ts index ced9802c2..232d7e867 100644 --- a/admin-frontend-vue/src/config/platform-scope.ts +++ b/admin-frontend-vue/src/config/platform-scope.ts @@ -40,3 +40,27 @@ export function platformsOfMenuKey(key: string): PlatformTabId[] { if (BOTH_PLATFORM_MENU_KEYS.includes(key)) return ['amazon', 'jd'] return ['amazon'] } + +/** + * 通用「按平台过滤菜单树」(唯一算法出口,2026-11-17 用户口径「授权树也按平台收」): + * 叶子按 {@link platformsOfMenuKey} 是否包含当前平台留下;分组节点自身的 key 不参与 + * 平台判定,按「有存活的子项」决定去留——否则京东侧「账号与权限」这类混合分组会被整组误剪。 + * 两个消费方必须同形:侧边栏(platform-menu-filter.ts)与账号弹窗的授权树 + * (UserMenuAuthTree.vue),改判定规则只改这一处。 + */ +export function filterMenuTreeNodesByPlatform( + nodes: readonly T[] | null | undefined, + platform: PlatformTabId, +): T[] { + const filtered: T[] = [] + for (const node of nodes || []) { + const children = filterMenuTreeNodesByPlatform(node.children, platform) + if (children.length > 0) { + filtered.push({ ...node, children }) + continue + } + if ((node.children || []).length > 0) continue + if (platformsOfMenuKey(node.key || '').includes(platform)) filtered.push({ ...node }) + } + return filtered +} diff --git a/admin-frontend-vue/src/layout/platform-menu-filter.ts b/admin-frontend-vue/src/layout/platform-menu-filter.ts index 098a5780f..c541758bf 100644 --- a/admin-frontend-vue/src/layout/platform-menu-filter.ts +++ b/admin-frontend-vue/src/layout/platform-menu-filter.ts @@ -1,5 +1,5 @@ import type { AdminMenuNode } from '../types/admin' -import { PLATFORM_TABS, platformsOfMenuKey } from '../config/platform-scope.ts' +import { PLATFORM_TABS, filterMenuTreeNodesByPlatform } from '../config/platform-scope.ts' import type { PlatformTabId } from '../config/platform-scope.ts' import { firstVisiblePath } from '../router/helpers.ts' @@ -7,27 +7,15 @@ import { firstVisiblePath } from '../router/helpers.ts' * 按平台 tab 过滤后端菜单树(2026-11-16「亚马逊/京东不混」):**只做显示分组,不做鉴权**—— * 准入仍由 session.menuTree(后端按权限裁剪)与路由守卫负责,这里只是把当前用户已被授权的 * 菜单按平台分到两个 tab 下展示。 - * 规则:叶子按 platformsOfMenuKey(key) 是否包含当前平台留下(双侧清单里的账号域三页两个 - * tab 都显示);分组节点(admin_group_*)自身的 key 不参与平台判定,按「留住的子项数 > 0」 - * 决定去留——否则京东 tab 下「账号与权限」这类混合分组会被整组误剪。节点的 key/name/ - * route/children 形状原样透传(浅拷贝不改写),toSidebarEntries、groupKeysForActive 与 - * 面包屑都不受影响。 + * 规则与算法在 {@link filterMenuTreeNodesByPlatform}(2026-11-17 起唯一出口,账号弹窗授权树 + * 同用一份);本壳只钉侧边栏专属的两条:节点的 key/name/route/children 形状原样透传(浅拷贝 + * 不改写),toSidebarEntries、groupKeysForActive 与面包屑都不受影响。 */ export function filterMenuTreeByPlatform( nodes: AdminMenuNode[] | null | undefined, platform: PlatformTabId, ): AdminMenuNode[] { - const filtered: AdminMenuNode[] = [] - for (const node of nodes || []) { - const children = filterMenuTreeByPlatform(node.children, platform) - if (children.length > 0) { - filtered.push({ ...node, children }) - continue - } - if ((node.children || []).length > 0) continue - if (platformsOfMenuKey(node.key || '').includes(platform)) filtered.push({ ...node }) - } - return filtered + return filterMenuTreeNodesByPlatform(nodes, platform) } /** 当前用户在哪些平台下至少有一个可点页面(tab 显示依据);顺序固定随 PLATFORM_TABS。 diff --git a/admin-frontend-vue/src/pages/account/CreateUserDialog.vue b/admin-frontend-vue/src/pages/account/CreateUserDialog.vue index a8494d626..87c720875 100644 --- a/admin-frontend-vue/src/pages/account/CreateUserDialog.vue +++ b/admin-frontend-vue/src/pages/account/CreateUserDialog.vue @@ -184,7 +184,9 @@ async function create(): Promise {
- + +
diff --git a/admin-frontend-vue/src/pages/account/EditUserDialog.vue b/admin-frontend-vue/src/pages/account/EditUserDialog.vue index 5d418dd83..28dfca00b 100644 --- a/admin-frontend-vue/src/pages/account/EditUserDialog.vue +++ b/admin-frontend-vue/src/pages/account/EditUserDialog.vue @@ -152,7 +152,9 @@ async function save(): Promise {
- + +
菜单权限加载中…
菜单权限加载失败,保存已禁用;请关闭后重试 diff --git a/admin-frontend-vue/src/pages/account/UserMenuAuthTree.vue b/admin-frontend-vue/src/pages/account/UserMenuAuthTree.vue index efd6869f3..f20051a4a 100644 --- a/admin-frontend-vue/src/pages/account/UserMenuAuthTree.vue +++ b/admin-frontend-vue/src/pages/account/UserMenuAuthTree.vue @@ -1,10 +1,12 @@