From 164b9b83fa775150421aadc6e482d9032a453df9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Tue, 17 Nov 2026 18:59:35 +0800 Subject: [PATCH] =?UTF-8?q?feat(jd/account):=20=E6=8E=88=E6=9D=83=E6=A0=91?= =?UTF-8?q?=E6=8C=89=E5=B9=B3=E5=8F=B0=E8=BF=87=E6=BB=A4=EF=BC=8B=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E8=B6=85=E7=AE=A1=E7=A9=BA=E6=80=81=E7=9B=B4=E5=BB=BA?= =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E6=A1=A3=E5=88=86=E7=BB=84=E2=80=94=E2=80=94?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=BC=B9=E7=AA=97=E9=80=89=E4=BA=AC=E4=B8=9C?= =?UTF-8?q?=E5=8F=AA=E5=8F=91=E4=BA=AC=E4=B8=9C=E4=BE=A7=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=EF=BC=88=E4=BA=AC=E4=B8=9C=E6=95=B0=E6=8D=AE=E5=BA=93=EF=BC=8B?= =?UTF-8?q?=E5=8F=8C=E4=BE=A7=E8=B4=A6=E5=8F=B7=E5=9F=9F=E4=B8=89=E4=BB=B6?= =?UTF-8?q?=EF=BC=8Cplatform-scope=20=E5=94=AF=E4=B8=80=E7=AE=97=E6=B3=95?= =?UTF-8?q?=E5=87=BA=E5=8F=A3=E3=80=81=E4=BE=A7=E8=BE=B9=E6=A0=8F=E5=A7=94?= =?UTF-8?q?=E6=89=98=E5=90=8C=E6=BA=90=EF=BC=89=EF=BC=8C=E7=BF=BB=E6=A1=A3?= =?UTF-8?q?=E6=97=B6=E5=8F=A6=E4=B8=80=E4=BE=A7=E5=8B=BE=E9=80=89=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E6=94=B6=E6=95=9B=EF=BC=88pruneCheckedIdsToTree?= =?UTF-8?q?=EF=BC=89=EF=BC=8C=E4=BA=AC=E4=B8=9C=E6=A1=A3=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?=E4=B8=8D=E5=86=8D=E6=95=B4=E6=A0=91=E6=B7=B7=E5=8F=91=E4=BA=9A?= =?UTF-8?q?=E9=A9=AC=E9=80=8A=E6=8E=88=E6=9D=83=EF=BC=9B=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=BC=B9=E7=AA=97=E4=BA=AC=E4=B8=9C=E4=BE=A7?= =?UTF-8?q?=E9=9B=B6=E5=88=86=E7=BB=84=E6=97=B6=E7=BB=99=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E8=B6=85=E7=AE=A1=E5=BC=80=E7=9B=B4=E5=BB=BA=E5=8F=A3=E5=AD=90?= =?UTF-8?q?=EF=BC=88POST=20shop-manages/groups=20platform=20=E6=81=92=20jd?= =?UTF-8?q?=E3=80=81=E7=BB=84=E9=95=BF=3D=E5=BD=93=E5=89=8D=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E4=BA=BA=EF=BC=89=EF=BC=8C=E5=BB=BA=E5=AE=8C=20group-?= =?UTF-8?q?created=20=E8=AE=A9=E7=88=B6=E9=A1=B5=E6=95=B4=E6=9D=A1?= =?UTF-8?q?=E4=BD=9C=E7=94=A8=E5=9F=9F=E9=87=8D=E5=8F=96=E7=BF=BB=E5=88=B0?= =?UTF-8?q?=E6=96=B0=E7=BB=84=E6=8E=A5=E7=9D=80=E5=BB=BA=E5=88=86=E7=B1=BB?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=86=8D=E6=AD=BB=E5=9C=A8=E3=80=8C=E4=BD=A0?= =?UTF-8?q?=E8=BF=98=E4=B8=8D=E5=B1=9E=E4=BA=8E=E4=BB=BB=E4=BD=95=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9D=83=E9=99=90=E5=88=86=E7=BB=84=E3=80=8D=EF=BC=88?= =?UTF-8?q?2026-11-17=20=E7=94=A8=E6=88=B7=E5=8F=A3=E5=BE=84=E3=80=8Cadmin?= =?UTF-8?q?=20=E6=9D=83=E9=99=90=E6=9C=80=E5=A4=A7=E3=80=8D=EF=BC=89?= =?UTF-8?q?=E3=80=82=E5=88=A4=E6=8D=AE=EF=BC=9Atests/user-menu-tree-platfo?= =?UTF-8?q?rm-filter.test.ts=20=E9=92=89=E8=BF=87=E6=BB=A4/=E6=94=B6?= =?UTF-8?q?=E6=95=9B/=E4=B8=A4=E6=B6=88=E8=B4=B9=E6=96=B9=E5=90=8C?= =?UTF-8?q?=E5=BD=A2=EF=BC=88B79-12=20=E9=92=89=E6=B3=95=EF=BC=89=EF=BC=9B?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E7=AE=A1=E7=90=86=E5=BC=B9=E7=AA=97=E6=8C=82?= =?UTF-8?q?=E8=BD=BD=206=20=E4=BE=8B=EF=BC=88=E7=9B=B4=E5=BB=BA=E8=A1=A8?= =?UTF-8?q?=E5=8D=95/=E6=97=A0=E7=99=BB=E5=BD=95=E4=BA=BA/=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E4=B8=8D=E5=8F=91=E4=BA=8B=E4=BB=B6/=E7=BF=BB?= =?UTF-8?q?=E7=BB=84=E9=87=8D=E5=8F=96/=E9=9D=9E=E8=B6=85=E7=AE=A1?= =?UTF-8?q?=E7=BB=B4=E6=8C=81=E6=96=87=E6=A1=88/=E6=9C=89=E7=BB=84?= =?UTF-8?q?=E4=B8=8D=E5=87=BA=E5=8F=A3=E5=AD=90=EF=BC=89=EF=BC=8B=E4=BA=AC?= =?UTF-8?q?=E4=B8=9C=E9=A1=B5=E6=8C=82=E8=BD=BD=202=20=E4=BE=8B=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=BA=A7=E9=93=BE=E8=B7=AF=EF=BC=9Bvue-tsc=20rc=3D0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/config/platform-scope.ts | 24 ++++ .../src/layout/platform-menu-filter.ts | 22 +--- .../src/pages/account/CreateUserDialog.vue | 4 +- .../src/pages/account/EditUserDialog.vue | 4 +- .../src/pages/account/UserMenuAuthTree.vue | 44 +++++++- .../src/pages/account/user-menu-auth.ts | 21 ++++ .../src/pages/jd/JdCategoryManageDialog.vue | 99 ++++++++++++++++- .../src/pages/jd/JdDatabasePage.vue | 17 +++ .../jd-category-manage-dialog.mount.test.ts | 104 ++++++++++++++++++ .../mount/jd-database-page.mount.test.ts | 55 +++++++++ .../user-menu-tree-platform-filter.test.ts | 86 +++++++++++++++ 11 files changed, 452 insertions(+), 28 deletions(-) create mode 100644 admin-frontend-vue/tests/user-menu-tree-platform-filter.test.ts 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 @@