feat(platform): 后管与桌面端菜单按用户平台隔离(2026-11-18 用户口径「隔离下除 admin 外,京东用户只看京东菜单、亚马逊看不了」)——AdminMenuPlatformScope 成为菜单 key→平台归属唯一出处(京东独占 admin_jd_database+app 三件;双侧六件=账号域基础三页+本笔补侧的菜单权限配置/密钥管理/密钥用量统计;未知 key 默认 amazon 与前端 platform-scope 同形;platform null/空白归一 amazon=列 DEFAULT 同口径,不把「没带」读成京东侧全拦),filterMenuVosByPlatform 扁平过滤保留祖先链保组树完整、分组节点按存活子项去留(与前端 filterMenuTreeNodesByPlatform 同形);裁剪只挂三个下发出口(current-user/menus 非站点超管按 users.platform 收窄+登录 VO adminColumns/appColumns 双树=后管+桌面端一起)与逐页门(requireConsolePageAccess 平台门置于 isAdmin 直通之前,越侧 key 一律 403),红线=不动 getUserColumnPermissions 本体(授权编辑读接口与整树替换保存语义不变、授权行保留);current-user 增 platform 键;前端 allowedPlatformsForUser(超管随菜单树分布、其余锁 users.platform 侧、未知/缺省兜底 amazon、交集空仍锁死本人平台)+AdminLayout watch clamp(localStorage 残留另一侧自动归位、当前页在被禁侧跳回本人平台第一可见页、单侧时 tab 条整个隐藏)+platform-tab.syncToAllowed;app 树 37 key 全集核对无平台无关 key(withdraw=取款挂品牌运营工具、erp/purchase 挂后勤工具)。判据:AdminMenuPlatformScopeTest 11+ConsolePageTest +5 平台门+AdminConsoleCurrentUserMenusPlatformTest 3+AuthServicePlatformMenuTest 3+CompanyTest +1 platform 键=43 例绿;前端 platform-menu-filter 9/9(+2)、mount admin-layout-platform-lock 4/4、授权树过滤对齐扩双侧;vue-tsc rc=0;node --test 1937/1938(唯一红=在册 B116-03 ENOENT);vitest mount 184/184;mvn -o test-compile rc=0;快检后端 2 红格=环境假红(缺 Git 工具链 PATH,前置后 30/30 绿)、四面可读棘轮红=PermissionMenuService 1661→1676 行随本笔点名记账(ops 仓同窗);桌面端界面随 appColumns 下发生效,客户端出包另窗
This commit is contained in:
@@ -37,13 +37,18 @@ export const JD_APP_MENU_KEYS: readonly string[] = [
|
||||
'jd-publish',
|
||||
]
|
||||
|
||||
/** 双侧共用菜单(2026-11-17 用户口径「这些亚马逊这边也要有」):三个账号域页面在两个
|
||||
* 平台 tab 下都显示——同一套组件、按当前 tab 给接口传 platform,各自只看/管各自平台的
|
||||
* 账号、分组、公司(后端 V206 三表加列,存量默认亚马逊,京东侧数据在编辑弹窗里翻档)。 */
|
||||
/** 双侧共用菜单(2026-11-17 用户口径「这些亚马逊这边也要有」;2026-11-18 扩双侧):账号域
|
||||
* 页面在两个平台 tab 下都显示——同一套组件、按当前 tab 给接口传 platform,各自只看/管各自
|
||||
* 平台的账号、分组、公司(后端 V206 三表加列,存量默认亚马逊,京东侧数据在编辑弹窗里翻档)。
|
||||
* 2026-11-18 平台隔离落地(「非站点超管只看自己平台侧」)把三个账号域管理页也标双侧:
|
||||
* 它们是账号域功能而非亚马逊业务,京东侧公司超管被锁单侧后仍要能配菜单权限、管密钥。 */
|
||||
export const BOTH_PLATFORM_MENU_KEYS: readonly string[] = [
|
||||
'admin_users',
|
||||
'admin_group_manage',
|
||||
'admin_companies',
|
||||
'admin_columns',
|
||||
'admin_user_secrets',
|
||||
'admin_user_secret_usage',
|
||||
]
|
||||
|
||||
/** menuKey → 平台归属清单(唯一判定出口):京东独占(后台或桌面端清单)→ ['jd'];
|
||||
|
||||
@@ -6,7 +6,7 @@ import { useAdminSessionStore } from '@/stores/admin-session'
|
||||
import { joinAdminPath } from '@/config/app'
|
||||
import { pageTitleOf, topbarUserOf } from '@/layout/topbar-model'
|
||||
import { allGroupKeys, toSidebarEntries } from '@/layout/menu-mapper'
|
||||
import { filterMenuTreeByPlatform, visiblePlatformsFor } from '@/layout/platform-menu-filter'
|
||||
import { filterMenuTreeByPlatform, allowedPlatformsForUser } from '@/layout/platform-menu-filter'
|
||||
import { PLATFORM_TABS, platformsOfMenuKey } from '@/config/platform-scope'
|
||||
import { usePlatformTabStore } from '@/stores/platform-tab'
|
||||
import { firstVisiblePath } from '@/router/helpers'
|
||||
@@ -41,9 +41,12 @@ const platformTab = usePlatformTabStore()
|
||||
const menuEntries = computed(() =>
|
||||
toSidebarEntries(filterMenuTreeByPlatform(session.menuTree, platformTab.active)),
|
||||
)
|
||||
const visibleTabIds = computed(() => visiblePlatformsFor(session.menuTree))
|
||||
const visibleTabDefs = computed(() => PLATFORM_TABS.filter((tab) => visibleTabIds.value.includes(tab.id)))
|
||||
const showPlatformTabs = computed(() => visibleTabIds.value.length > 1)
|
||||
// 平台锁定(2026-11-18 用户口径「隔离下除站点超管外,京东用户只看京东菜单、亚马逊看不了」):
|
||||
// tab 可见性 = 站点超管随菜单树分布;其余用户锁 users.platform 那一侧(后端下发树已按平台
|
||||
// 裁剪,这里再把 tab 收敛到本人平台,单侧时 tab 条整个隐藏)。
|
||||
const allowedTabIds = computed(() => allowedPlatformsForUser(session.menuTree, session.user))
|
||||
const visibleTabDefs = computed(() => PLATFORM_TABS.filter((tab) => allowedTabIds.value.includes(tab.id)))
|
||||
const showPlatformTabs = computed(() => allowedTabIds.value.length > 1)
|
||||
// 父菜单默认全展开(2026-11-17 用户口径「父菜单不要默认折叠」)。el-menu 的 default-openeds
|
||||
// 只在挂载时读一次,平台 tab 切换/菜单树刷新导致 entries 变化后新分组不会自动展开,
|
||||
// 这里在 entries 变更渲染完成后按当下值命令式补开;用户手动收起的组在 entries 不变期间
|
||||
@@ -73,13 +76,14 @@ watch(
|
||||
|
||||
// 直达 URL/面包屑跳到另一平台的页面时,tab 指示自动跟过去(与侧边栏保持一致)。
|
||||
// 双侧清单里的页面(账号域三页)两个 tab 都算归属:当前 tab 已含它就不动。
|
||||
// 跟随目标只在允许集(allowedTabIds)里找:被平台锁定的侧不会成为落点。
|
||||
watch(
|
||||
() => route.meta.menuKey as string | undefined,
|
||||
(menuKey) => {
|
||||
if (!menuKey) return
|
||||
const owners = platformsOfMenuKey(menuKey)
|
||||
if (owners.includes(platformTab.active)) return
|
||||
const target = owners.find((platform) => visibleTabIds.value.includes(platform))
|
||||
const target = owners.find((platform) => allowedTabIds.value.includes(platform))
|
||||
if (target && target !== platformTab.active) {
|
||||
platformTab.setActive(target)
|
||||
}
|
||||
@@ -87,6 +91,23 @@ watch(
|
||||
{ immediate: true },
|
||||
)
|
||||
|
||||
// 平台锁定的归位(2026-11-18):会话就位/菜单树刷新后允许集收敛时,把残留的另一侧 tab
|
||||
// (超管在同一浏览器切过,localStorage 落的值)归位本人平台;当前页若在被禁侧一并跳回
|
||||
// 该侧第一可见页。切 tab 的跳转复用下面 platformTab.active 的 watch(active 被 syncToAllowed
|
||||
// 改写后同链路生效)。
|
||||
watch(
|
||||
allowedTabIds,
|
||||
(allowed) => {
|
||||
if (!session.user) return
|
||||
platformTab.syncToAllowed(allowed)
|
||||
const menuKey = route.meta.menuKey as string | undefined
|
||||
if (!menuKey || platformsOfMenuKey(menuKey).includes(platformTab.active)) return
|
||||
const first = firstVisiblePath(filterMenuTreeByPlatform(session.menuTree, platformTab.active))
|
||||
if (first) void router.replace(first)
|
||||
},
|
||||
{ immediate: true },
|
||||
)
|
||||
|
||||
// 切到另一侧 tab 时当前页多半不在那边:跳到该侧第一个可见页;该侧为空(tab 不可见)则不动。
|
||||
// 双侧清单里的页面(账号域三页)切 tab 不跳转——页面自己按当前平台过滤数据。
|
||||
watch(
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import type { AdminMenuNode } from '../types/admin'
|
||||
import type { AdminMenuNode, AdminUser } from '../types/admin'
|
||||
import { isSuperAdminRole } from '../types/admin.ts'
|
||||
import { PLATFORM_TABS, filterMenuTreeNodesByPlatform } from '../config/platform-scope.ts'
|
||||
import type { PlatformTabId } from '../config/platform-scope.ts'
|
||||
import { firstVisiblePath } from '../router/helpers.ts'
|
||||
@@ -25,3 +26,20 @@ export function visiblePlatformsFor(nodes: AdminMenuNode[] | null | undefined):
|
||||
.filter((tab) => firstVisiblePath(filterMenuTreeByPlatform(nodes, tab.id)) !== '')
|
||||
.map((tab) => tab.id)
|
||||
}
|
||||
|
||||
/** 登录用户可用的平台 tab(2026-11-18 用户口径「隔离下除站点超管外,京东用户只看京东菜单、
|
||||
* 亚马逊看不了」):站点超管不限侧、沿用菜单树分布;其余用户锁 users.platform 那一侧
|
||||
* (未知/缺省按亚马逊存量口径,与后端 AdminMenuPlatformScope.normalize 同形),与「菜单树
|
||||
* 该侧有可点页面」求交——交集空则仍回落单侧(管理角色必有双侧账号域页,交集实际非空;
|
||||
* 宁可锁死自己平台也不放开被禁侧)。会话未就位(user 为空)时按可见分布,锁定的收窄
|
||||
* 由 AdminLayout 的 watch 在 user 就位后再做。 */
|
||||
export function allowedPlatformsForUser(
|
||||
nodes: AdminMenuNode[] | null | undefined,
|
||||
user: Pick<AdminUser, 'role' | 'platform'> | null | undefined,
|
||||
): PlatformTabId[] {
|
||||
const visible = visiblePlatformsFor(nodes)
|
||||
if (!user || isSuperAdminRole(user.role)) return visible
|
||||
const own: PlatformTabId = user.platform === 'jd' ? 'jd' : 'amazon'
|
||||
const allowed = visible.filter((id) => id === own)
|
||||
return allowed.length > 0 ? allowed : [own]
|
||||
}
|
||||
|
||||
@@ -38,5 +38,13 @@ export const usePlatformTabStore = defineStore('platform-tab', {
|
||||
this.active = id
|
||||
writeStoredTab(id)
|
||||
},
|
||||
/** 平台锁定(2026-11-18 用户口径「非站点超管只看自己平台侧」):允许集收敛时把 active
|
||||
* 归位——localStorage 残留的另一侧(超管在同一浏览器切过 tab)自动回落本人平台;
|
||||
* 允许集为空(会话未就位)不动。 */
|
||||
syncToAllowed(allowed: readonly PlatformTabId[]) {
|
||||
if (allowed.length > 0 && !allowed.includes(this.active)) {
|
||||
this.setActive(allowed[0])
|
||||
}
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"note": "readSource 钉子逐文件基线。两把尺子:pins=落在用例体内的读盘,reads=全文读点总数(含模块级夹具与 helper)。都只许减;pins 下降而 reads 没同步下降=把读盘挪出体内,不算改进。由 tests/source-pin-ratchet.test.ts 生成。",
|
||||
"totals": {
|
||||
"files": 262,
|
||||
"cases": 1832,
|
||||
"cases": 1837,
|
||||
"pins": 460,
|
||||
"reads": 658
|
||||
},
|
||||
@@ -58,7 +58,7 @@
|
||||
"reads": 1
|
||||
},
|
||||
"align-group-editor.test.ts": {
|
||||
"cases": 10,
|
||||
"cases": 13,
|
||||
"pins": 2,
|
||||
"reads": 3
|
||||
},
|
||||
@@ -398,7 +398,7 @@
|
||||
"reads": 7
|
||||
},
|
||||
"platform-menu-filter.test.ts": {
|
||||
"cases": 7,
|
||||
"cases": 9,
|
||||
"pins": 0,
|
||||
"reads": 0
|
||||
},
|
||||
|
||||
@@ -0,0 +1,164 @@
|
||||
/**
|
||||
* AdminLayout × 平台锁定(2026-11-18 用户口径「隔离下除站点超管外,京东用户只看京东菜单、
|
||||
* 亚马逊看不了」)的挂载契约:
|
||||
* - 京东用户(company_super_admin + platform=jd)即使 localStorage 残留另一侧 tab,挂载后
|
||||
* active 归位本人平台(syncToAllowed),单侧时平台 tab 条整个隐藏;
|
||||
* - 站点超管不受限:双平台 tab 照画、active 保持残留值(超管切过的侧照记);
|
||||
* - 京东用户当前路由落在被禁侧(直达 URL):跳回本人平台第一可见页。
|
||||
* menuTree 模拟后端裁剪后的下发树(京东用户树里本来就没有亚马逊叶子)。
|
||||
* 不用 readFileSync(source-pin-ratchet 对台账外新文件带读点即红),全部走真实挂载断言。
|
||||
*
|
||||
* 跑法:`npx vitest run tests/mount/admin-layout-platform-lock.mount.test.ts`
|
||||
*/
|
||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
import { flushPromises, mount } from '@vue/test-utils'
|
||||
import { createPinia, setActivePinia, type Pinia } from 'pinia'
|
||||
import ElementPlus from 'element-plus'
|
||||
import { createMemoryHistory, createRouter, type Router } from 'vue-router'
|
||||
|
||||
import AdminLayout from '@/layout/AdminLayout.vue'
|
||||
import { usePlatformTabStore } from '@/stores/platform-tab'
|
||||
import { useAdminSessionStore } from '@/stores/admin-session'
|
||||
import { adminPages } from '@/router/routes'
|
||||
import type { AdminMenuNode } from '@/types/admin'
|
||||
|
||||
// AdminLayout 的顶栏/告警子组件各带定时器或远端拉取,与本契约无关,替身化。
|
||||
vi.mock('@/components/NotificationBell.vue', () => ({ default: { template: '<div class="bell-stub" />' } }))
|
||||
vi.mock('@/components/ExpiryNotice.vue', () => ({ default: { template: '<div class="expiry-stub" />' } }))
|
||||
vi.mock('@/layout/OperationGuide.vue', () => ({ default: { template: '<div class="guide-stub" />' } }))
|
||||
vi.mock('@/layout/CompanyTabs.vue', () => ({ default: { template: '<div class="company-tabs-stub" />' } }))
|
||||
vi.mock('@/layout/GlobalErrorContainer.vue', () => ({ default: { template: '<div class="error-stub" />' } }))
|
||||
|
||||
/** 后端裁剪后下发给京东用户的树形状:双侧账号域六页 + 京东数据库(无任何亚马逊叶子)。 */
|
||||
const JD_TREE: AdminMenuNode[] = [
|
||||
{
|
||||
key: 'admin_group_account',
|
||||
name: '账号与权限',
|
||||
children: [
|
||||
{ key: 'admin_users', name: '用户管理', route: '/account/users' },
|
||||
{ key: 'admin_group_manage', name: '分组管理', route: '/account/groups' },
|
||||
{ key: 'admin_columns', name: '菜单权限配置', route: '/account/menus' },
|
||||
{ key: 'admin_user_secrets', name: '密钥管理', route: '/account/user-secrets' },
|
||||
{ key: 'admin_user_secret_usage', name: '密钥用量统计', route: '/account/user-secret-usage' },
|
||||
],
|
||||
},
|
||||
{
|
||||
key: 'admin_group_data',
|
||||
name: '数据管理',
|
||||
children: [{ key: 'admin_jd_database', name: '京东数据库', route: '/jd-center/database' }],
|
||||
},
|
||||
]
|
||||
|
||||
/** 站点超管的树:亚马逊业务页 + 京东页 + 双侧账号域(现状全量形状)。 */
|
||||
const SUPER_TREE: AdminMenuNode[] = [
|
||||
{
|
||||
key: 'admin_group_account',
|
||||
name: '账号与权限',
|
||||
children: [{ key: 'admin_users', name: '用户管理', route: '/account/users' }],
|
||||
},
|
||||
{
|
||||
key: 'admin_group_data',
|
||||
name: '数据管理',
|
||||
children: [
|
||||
{ key: 'admin_query_asin', name: '查询ASIN', route: '/asin-center/query' },
|
||||
{ key: 'admin_jd_database', name: '京东数据库', route: '/jd-center/database' },
|
||||
],
|
||||
},
|
||||
]
|
||||
|
||||
let pinia: Pinia
|
||||
let router: Router
|
||||
|
||||
beforeEach(async () => {
|
||||
vi.clearAllMocks()
|
||||
window.localStorage.removeItem('admin-platform-tab')
|
||||
pinia = createPinia()
|
||||
setActivePinia(pinia)
|
||||
// adminPages 是相对 /admin-vue/ 的子路径注册表(不带前导斜杠),这里按 memory history
|
||||
// 补 "/" 建表:路由 meta 带上 menuKey,AdminLayout 的 tab 跟随/replace 判定吃真实 meta。
|
||||
// component 全部换同步桩——真实页面是懒 import,导航确认会卡在组件 promise 上,
|
||||
// 而本契约只盯 AdminLayout 的 tab/replace 行为,页面本体无关。
|
||||
router = createRouter({
|
||||
history: createMemoryHistory(),
|
||||
routes: adminPages.map((page) => ({
|
||||
path: `/${page.path}`,
|
||||
component: { template: '<div class="page-stub" />' },
|
||||
meta: { title: page.title, menuKey: page.menuKey },
|
||||
})),
|
||||
})
|
||||
await router.push('/')
|
||||
await router.isReady()
|
||||
})
|
||||
|
||||
async function mountLayout() {
|
||||
const wrapper = mount(AdminLayout, { global: { plugins: [pinia, router, ElementPlus] } })
|
||||
await flushPromises()
|
||||
return wrapper
|
||||
}
|
||||
|
||||
describe('AdminLayout × 平台锁定(2026-11-18)', () => {
|
||||
it('京东用户挂载:残留的亚马逊 tab 归位京东侧,tab 条隐藏,侧边栏只画本人平台菜单', async () => {
|
||||
window.localStorage.setItem('admin-platform-tab', 'amazon')
|
||||
const session = useAdminSessionStore()
|
||||
session.user = { id: 10, username: '阿华66', role: 'company_super_admin', platform: 'jd' }
|
||||
session.menuTree = JD_TREE
|
||||
session.initialized = true
|
||||
|
||||
const wrapper = await mountLayout()
|
||||
const platformTab = usePlatformTabStore()
|
||||
|
||||
expect(platformTab.active).toBe('jd')
|
||||
expect(wrapper.findAll('.admin-platform-tab').length).toBe(0)
|
||||
const texts = wrapper.findAll('.admin-menu .el-menu-item').map((item) => item.text())
|
||||
expect(texts).toContain('京东数据库')
|
||||
expect(texts).not.toContain('查询ASIN')
|
||||
// 双侧账号域照画(2026-11-18 扩双侧后含菜单权限配置/密钥管理/密钥用量统计)
|
||||
expect(texts).toContain('菜单权限配置')
|
||||
expect(texts).toContain('密钥管理')
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('站点超管挂载:双平台 tab 照画、残留 active 保持(不受平台锁定影响)', async () => {
|
||||
window.localStorage.setItem('admin-platform-tab', 'jd')
|
||||
const session = useAdminSessionStore()
|
||||
session.user = { id: 1, username: 'admin', role: 'super_admin', platform: 'amazon' }
|
||||
session.menuTree = SUPER_TREE
|
||||
session.initialized = true
|
||||
|
||||
const wrapper = await mountLayout()
|
||||
const platformTab = usePlatformTabStore()
|
||||
|
||||
expect(platformTab.active).toBe('jd')
|
||||
const tabs = wrapper.findAll('.admin-platform-tab').map((tab) => tab.text())
|
||||
expect(tabs).toEqual(['亚马逊', '京东'])
|
||||
expect(tabs[1]).toBe('京东')
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('京东用户直达被禁侧 URL(/asin-center/query):挂载后跳回本人平台第一可见页', async () => {
|
||||
const session = useAdminSessionStore()
|
||||
session.user = { id: 10, username: '阿华66', role: 'company_super_admin', platform: 'jd' }
|
||||
session.menuTree = JD_TREE
|
||||
session.initialized = true
|
||||
|
||||
await router.push('/asin-center/query')
|
||||
const wrapper = await mountLayout()
|
||||
|
||||
expect(router.currentRoute.value.path).toBe('/account/users')
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('亚马逊存量用户(platform 缺省兜底亚马逊):锁亚马逊侧,京东页不可达', async () => {
|
||||
const session = useAdminSessionStore()
|
||||
session.user = { id: 8, username: '存量号', role: 'admin' }
|
||||
session.menuTree = SUPER_TREE
|
||||
session.initialized = true
|
||||
|
||||
const wrapper = await mountLayout()
|
||||
const platformTab = usePlatformTabStore()
|
||||
|
||||
expect(platformTab.active).toBe('amazon')
|
||||
expect(wrapper.findAll('.admin-platform-tab').length).toBe(0)
|
||||
wrapper.unmount()
|
||||
})
|
||||
})
|
||||
@@ -8,14 +8,14 @@ import {
|
||||
PLATFORM_TABS,
|
||||
platformsOfMenuKey,
|
||||
} from '../src/config/platform-scope.ts'
|
||||
import { filterMenuTreeByPlatform, visiblePlatformsFor } from '../src/layout/platform-menu-filter.ts'
|
||||
import { allowedPlatformsForUser, filterMenuTreeByPlatform, visiblePlatformsFor } from '../src/layout/platform-menu-filter.ts'
|
||||
import { adminPages } from '../src/router/routes.ts'
|
||||
|
||||
/** 2026-11-16 用户定案「亚马逊/京东不混一起」:侧边栏顶部加平台 tab,京东侧=截图圈定
|
||||
* 数据页(京东数据库/分类管理)。2026-11-17 用户口径「这些亚马逊这边也要有」:账号域三页
|
||||
* (用户管理/分组管理/公司管理)改为双侧显示(BOTH_PLATFORM_MENU_KEYS),同一组件按当前
|
||||
* tab 传 platform 过滤各自数据。tab 只做显示分组——菜单可见性仍由 session.menuTree(后端
|
||||
* 按权限裁剪)决定,这里钉的是「分侧归属」与「空侧隐藏」两条形状。
|
||||
* 按权限裁剪)决定,这里钉的是「分侧归属」「空侧隐藏」与「登录用户平台锁定」三条形状。
|
||||
* 辅助定义在所有 test 之前:node:test 的用例回调按声明序执行,挪到文件尾会踩 TDZ。 */
|
||||
|
||||
const node = (key: string, name: string, route?: string, children?: AdminMenuNode[]): AdminMenuNode => {
|
||||
@@ -54,17 +54,18 @@ test('menuKey 平台归属:京东独占即 [jd],双侧清单即两侧,其
|
||||
for (const key of JD_MENU_KEYS) assert.deepEqual(platformsOfMenuKey(key), ['jd'], key)
|
||||
for (const key of BOTH_PLATFORM_MENU_KEYS) assert.deepEqual(platformsOfMenuKey(key), ['amazon', 'jd'], key)
|
||||
assert.deepEqual(platformsOfMenuKey('admin_query_asin'), ['amazon'])
|
||||
assert.deepEqual(platformsOfMenuKey('admin_columns'), ['amazon'])
|
||||
assert.deepEqual(platformsOfMenuKey('admin_columns'), ['amazon', 'jd'])
|
||||
assert.deepEqual(platformsOfMenuKey('admin_group_account'), ['amazon'])
|
||||
assert.deepEqual(platformsOfMenuKey('admin_jd_unknown_future'), ['amazon'])
|
||||
assert.deepEqual(platformsOfMenuKey(''), ['amazon'])
|
||||
})
|
||||
|
||||
test('京东 tab:账号与权限只余双侧三项,数据管理只余京东独占页(2026-11-17 分类管理并入京东数据库页后只剩数据库一页);顺序与 route 原样透传', () => {
|
||||
test('京东 tab:账号与权限只余双侧六项(2026-11-18 平台隔离把三个账号域管理页也标双侧),数据管理只余京东独占页(2026-11-17 分类管理并入京东数据库页后只剩数据库一页);顺序与 route 原样透传', () => {
|
||||
const filtered = filterMenuTreeByPlatform(TREE, 'jd')
|
||||
assert.deepEqual(filtered.map((item) => item.key), ['admin_group_account', 'admin_group_data'])
|
||||
assert.deepEqual(groupChildKeys(filtered, 'admin_group_account'),
|
||||
['admin_users', 'admin_group_manage', 'admin_companies'])
|
||||
['admin_columns', 'admin_users', 'admin_group_manage', 'admin_user_secrets',
|
||||
'admin_user_secret_usage', 'admin_companies'])
|
||||
// 2026-11-17 晚用户口径「京东分类管理并到京东数据库分类编辑里」:分类管理子菜单
|
||||
// (V204)下线,京东侧数据管理组只剩京东数据库一页。
|
||||
assert.deepEqual(groupChildKeys(filtered, 'admin_group_data'), ['admin_jd_database'])
|
||||
@@ -124,7 +125,8 @@ test('平台 tab 定义与菜单清单钉死(防清单漂移):京东独占
|
||||
// 2026-11-17 晚分类管理(admin_jd_category_manage)并入京东数据库页后从清单摘除。
|
||||
assert.deepEqual([...JD_MENU_KEYS], ['admin_jd_database'])
|
||||
assert.deepEqual([...BOTH_PLATFORM_MENU_KEYS].sort(),
|
||||
['admin_companies', 'admin_group_manage', 'admin_users'])
|
||||
['admin_columns', 'admin_companies', 'admin_group_manage', 'admin_user_secret_usage',
|
||||
'admin_user_secrets', 'admin_users'])
|
||||
// 桌面端(app)清单与 JD_MENU_KEYS 分列:app 菜单没有 admin 路由,不得混进
|
||||
// 「与 routes.ts 对撞」的那份(下方护栏用例只扫 JD_MENU_KEYS/BOTH 两份是刻意的)。
|
||||
assert.deepEqual([...JD_APP_MENU_KEYS].sort(), ['jd-collect', 'jd-publish', 'jd_tools'])
|
||||
@@ -136,3 +138,34 @@ test('两份清单的每一条都必须在路由注册表登记(同 company-me
|
||||
assert.ok(registered.has(key), `平台侧菜单 key "${key}" 未在 src/router/routes.ts 登记 menuKey`)
|
||||
}
|
||||
})
|
||||
|
||||
test('allowedPlatformsForUser:站点超管随菜单树分布;其余用户锁 users.platform 一侧(未知/缺省按亚马逊)', () => {
|
||||
assert.deepEqual(allowedPlatformsForUser(TREE, { role: 'super_admin', platform: 'jd' }), ['amazon', 'jd'],
|
||||
'站点超管不限侧:双平台 tab 照画')
|
||||
assert.deepEqual(allowedPlatformsForUser(TREE, { role: 'company_super_admin', platform: 'jd' }), ['jd'],
|
||||
'京东用户锁京东侧:亚马逊 tab 消失(单侧时 tab 条整个隐藏)')
|
||||
assert.deepEqual(allowedPlatformsForUser(TREE, { role: 'admin', platform: 'amazon' }), ['amazon'])
|
||||
assert.deepEqual(allowedPlatformsForUser(TREE, { role: 'normal', platform: undefined }), ['amazon'],
|
||||
'platform 缺省按亚马逊存量口径(与后端 AdminMenuPlatformScope.normalize 同形)')
|
||||
assert.deepEqual(allowedPlatformsForUser(TREE, { role: 'company_super_admin', platform: 'weird' }), ['amazon'],
|
||||
'未知平台值同样兜底亚马逊,不得读成京东侧')
|
||||
assert.deepEqual(allowedPlatformsForUser(TREE, null), ['amazon', 'jd'],
|
||||
'会话未就位(user 为空)按可见分布:锁定的收窄由 AdminLayout 在 user 就位后再做')
|
||||
})
|
||||
|
||||
test('allowedPlatformsForUser:菜单树缺本平台页时仍锁死本人平台(宁空侧不放开被禁侧)', () => {
|
||||
const amazonOnlyTree: AdminMenuNode[] = [
|
||||
node('admin_group_data', '数据管理', undefined, [
|
||||
node('admin_dedupe_total_data', '去重数据汇总', '/asin-center/registry'),
|
||||
]),
|
||||
]
|
||||
assert.deepEqual(
|
||||
allowedPlatformsForUser(amazonOnlyTree, { role: 'company_super_admin', platform: 'amazon' }),
|
||||
['amazon'],
|
||||
)
|
||||
assert.deepEqual(
|
||||
allowedPlatformsForUser(amazonOnlyTree, { role: 'company_super_admin', platform: 'jd' }),
|
||||
['jd'],
|
||||
'交集空回落单侧:管理角色必有双侧账号域页所以实际非空,异常形状下宁可空侧也不放开被禁侧',
|
||||
)
|
||||
})
|
||||
|
||||
@@ -11,7 +11,7 @@ import { pruneCheckedIdsToTree } from '../src/pages/account/user-menu-auth.ts'
|
||||
|
||||
/**
|
||||
* 授权树按平台过滤(2026-11-17 用户口径「这边也没有去掉亚马逊的」):建号/编辑弹窗的
|
||||
* 菜单权限树在选「京东」时只留京东侧菜单(京东数据库+双侧账号域三件),亚马逊菜单整枝
|
||||
* 菜单权限树在选「京东」时只留京东侧菜单(京东数据库+双侧账号域件),亚马逊菜单整枝
|
||||
* 隐藏;切平台时勾选集收敛进可见树(pruneCheckedIdsToTree),否则京东档账号保存后仍带
|
||||
* 亚马逊授权,平台分侧被静默架空。
|
||||
*
|
||||
@@ -44,10 +44,10 @@ const TREE: MenuOptionNode[] = [
|
||||
const keysOf = (nodes: MenuOptionNode[]): string[] =>
|
||||
nodes.map((n) => (n.children?.length ? `${n.key}(${keysOf(n.children).join(',')})` : n.key))
|
||||
|
||||
test('京东侧:只剩京东数据库+双侧账号域三件,亚马逊分组整枝消失', () => {
|
||||
test('京东侧:只剩京东数据库+双侧账号域件(2026-11-18 扩双侧后菜单权限配置也归京东侧),亚马逊分组整枝消失', () => {
|
||||
const jd = filterMenuTreeNodesByPlatform(TREE, 'jd')
|
||||
assert.deepEqual(keysOf(jd), [
|
||||
'admin_group_account(admin_users,admin_group_manage,admin_companies)',
|
||||
'admin_group_account(admin_users,admin_group_manage,admin_companies,admin_columns)',
|
||||
'admin_jd_database',
|
||||
])
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user