feat(jd/account): 授权树按平台过滤+平台超管空态直建京东档分组——用户弹窗选京东只发京东侧菜单(京东数据库+双侧账号域三件,platform-scope 唯一算法出口、侧边栏委托同源),翻档时另一侧勾选自动收敛(pruneCheckedIdsToTree),京东档账号不再整树混发亚马逊授权;分类管理弹窗京东侧零分组时给平台超管开直建口子(POST shop-manages/groups platform 恒 jd、组长=当前登录人),建完 group-created 让父页整条作用域重取翻到新组接着建分类,不再死在「你还不属于任何数据权限分组」(2026-11-17 用户口径「admin 权限最大」)。判据:tests/user-menu-tree-platform-filter.test.ts 钉过滤/收敛/两消费方同形(B79-12 钉法);分类管理弹窗挂载 6 例(直建表单/无登录人/失败不发事件/翻组重取/非超管维持文案/有组不出口子)+京东页挂载 2 例页面级链路;vue-tsc rc=0
This commit is contained in:
@@ -14,6 +14,7 @@ import { flushPromises, mount, type VueWrapper } from '@vue/test-utils'
|
||||
import { createPinia, setActivePinia, type Pinia } from 'pinia'
|
||||
|
||||
import JdCategoryManageDialog from '@/pages/jd/JdCategoryManageDialog.vue'
|
||||
import { useAdminSessionStore } from '@/stores/admin-session'
|
||||
|
||||
const jdApi = vi.hoisted(() => ({
|
||||
fetchJdProductGroups: vi.fn(),
|
||||
@@ -22,9 +23,14 @@ const jdApi = vi.hoisted(() => ({
|
||||
deleteJdProductGroup: vi.fn(),
|
||||
}))
|
||||
|
||||
const groupApi = vi.hoisted(() => ({
|
||||
createShopGroup: vi.fn(),
|
||||
}))
|
||||
|
||||
const confirmMock = vi.hoisted(() => vi.fn())
|
||||
|
||||
vi.mock('@/pages/jd/jd-product-api.ts', () => jdApi)
|
||||
vi.mock('@/pages/account/shop-group-api.ts', () => groupApi)
|
||||
vi.mock('@/components/admin-confirm', () => ({ openAdminConfirm: confirmMock }))
|
||||
|
||||
/** 分组 id 常量:默认作用域就这一个可见且可写的组(组长档形状)。 */
|
||||
@@ -40,7 +46,10 @@ beforeEach(() => {
|
||||
vi.clearAllMocks()
|
||||
pinia = createPinia()
|
||||
setActivePinia(pinia)
|
||||
// 空态直建分组(2026-11-17 用户口径「admin 权限最大」)需要当前登录人做组长。
|
||||
useAdminSessionStore().user = { id: 9, username: 'admin', role: 'super_admin' } as never
|
||||
jdApi.fetchJdProductGroups.mockResolvedValue([])
|
||||
groupApi.createShopGroup.mockResolvedValue({ id: 21, name: '京东-团队', ownerGroupId: 21, sortOrder: 0, productCount: 0 })
|
||||
confirmMock.mockResolvedValue(true)
|
||||
})
|
||||
|
||||
@@ -255,3 +264,98 @@ describe('京东分类管理对话框(V204 独立页 2026-11-17 并入京东
|
||||
wrapper.unmount()
|
||||
})
|
||||
})
|
||||
|
||||
/** 平台超管空态直建分组(2026-11-17 用户口径「admin 权限最大」):京东侧还没有任何
|
||||
* 数据权限分组时(平台闸上线后 jd 档组全空,B117-02 前置未做),平台超管在弹窗里
|
||||
* 直接建第一个京东档分组,不再死在「你还不属于任何数据权限分组」。 */
|
||||
describe('平台超管空态直建京东档分组', () => {
|
||||
function mountEmpty(platformSuperAdmin: boolean): VueWrapper<Element> {
|
||||
return mount(JdCategoryManageDialog, {
|
||||
global: { plugins: [pinia] },
|
||||
props: { visible: true, ownerGroupId: 0, ownerGroupName: '', editable: false, platformSuperAdmin },
|
||||
})
|
||||
}
|
||||
|
||||
it('平台超管空态:出直建表单(不是死路文案),提交走分组管理同一条 POST 且 platform 恒 jd、组长=当前登录人', async () => {
|
||||
const wrapper = mountEmpty(true)
|
||||
await flushPromises()
|
||||
await flushPromises()
|
||||
expect(jdApi.fetchJdProductGroups).not.toHaveBeenCalled()
|
||||
expect(wrapper.get('.manage-empty').text()).toContain('京东侧还没有数据权限分组')
|
||||
expect(wrapper.get('[aria-label="新分组名称"]').exists()).toBe(true)
|
||||
|
||||
const input = wrapper.get('[aria-label="新分组名称"]')
|
||||
await input.setValue('京东-团队')
|
||||
await wrapper.findAll('button').find((b) => b.text() === '新建分组')!.trigger('click')
|
||||
await flushPromises()
|
||||
await flushPromises()
|
||||
expect(groupApi.createShopGroup).toHaveBeenCalledTimes(1)
|
||||
expect(groupApi.createShopGroup).toHaveBeenCalledWith('京东-团队', [], 9, 'jd')
|
||||
expect(wrapper.emitted('group-created'), '建组成功即通知父页重取作用域').toBeTruthy()
|
||||
expect((input.element as HTMLInputElement).value).toBe('', '成功后清输入')
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('没有当前登录人就不发请求并给可见错误(组长缺了这单没法建)', async () => {
|
||||
useAdminSessionStore().user = null
|
||||
const wrapper = mountEmpty(true)
|
||||
await flushPromises()
|
||||
await wrapper.get('[aria-label="新分组名称"]').setValue('京东-团队')
|
||||
await wrapper.findAll('button').find((b) => b.text() === '新建分组')!.trigger('click')
|
||||
await flushPromises()
|
||||
expect(groupApi.createShopGroup).not.toHaveBeenCalled()
|
||||
expect(wrapper.text()).toContain('无法获取当前登录用户')
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('建组失败:错误进红条、不发 group-created(父页作用域不动)', async () => {
|
||||
groupApi.createShopGroup.mockRejectedValueOnce(new Error('分组名称已存在'))
|
||||
const wrapper = mountEmpty(true)
|
||||
await flushPromises()
|
||||
await wrapper.get('[aria-label="新分组名称"]').setValue('京东-团队')
|
||||
await wrapper.findAll('button').find((b) => b.text() === '新建分组')!.trigger('click')
|
||||
await flushPromises()
|
||||
await flushPromises()
|
||||
expect(wrapper.text()).toContain('分组名称已存在')
|
||||
expect(wrapper.emitted('group-created')).toBeFalsy()
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('父页把 ownerGroupId 翻到新组后:直建表单消失、按新组重取分类(不用关弹窗重开)', async () => {
|
||||
const wrapper = mountEmpty(true)
|
||||
await flushPromises()
|
||||
await wrapper.get('[aria-label="新分组名称"]').setValue('京东-团队')
|
||||
await wrapper.findAll('button').find((b) => b.text() === '新建分组')!.trigger('click')
|
||||
await flushPromises()
|
||||
const emittedBefore = wrapper.emitted('group-created')?.length ?? 0
|
||||
await wrapper.setProps({ ownerGroupId: 21, ownerGroupName: '京东-团队', editable: true })
|
||||
await flushPromises()
|
||||
await flushPromises()
|
||||
expect(jdApi.fetchJdProductGroups).toHaveBeenLastCalledWith(21)
|
||||
expect(jdApi.fetchJdProductGroups).toHaveBeenCalledWith(21)
|
||||
expect(wrapper.find('[aria-label="新分组名称"]').exists()).toBe(false, '有组了直建口子就关')
|
||||
expect(wrapper.emitted('group-created')?.length).toBe(emittedBefore, '翻组重取不再重复通知父页')
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('非平台超管的空态维持原状:死路文案照旧、无直建表单(口子不开给组长/公司超管)', async () => {
|
||||
const wrapper = mountEmpty(false)
|
||||
await flushPromises()
|
||||
expect(wrapper.get('.manage-empty').text()).toBe('你还不属于任何数据权限分组')
|
||||
expect(wrapper.find('[aria-label="新分组名称"]').exists()).toBe(false)
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('平台超管但已有分组(ownerGroupId>0):直建口子不出现(完整分组管理归「分组管理」页)', async () => {
|
||||
jdApi.fetchJdProductGroups.mockResolvedValue([group(7, '裙装', 3)])
|
||||
const wrapper = mount(JdCategoryManageDialog, {
|
||||
global: { plugins: [pinia] },
|
||||
props: { visible: true, ownerGroupId: GROUP_A, ownerGroupName: '甲组', editable: true, platformSuperAdmin: true },
|
||||
})
|
||||
await flushPromises()
|
||||
await flushPromises()
|
||||
expect(wrapper.find('[aria-label="新分组名称"]').exists()).toBe(false)
|
||||
expect(wrapper.text()).not.toContain('京东侧还没有数据权限分组')
|
||||
wrapper.unmount()
|
||||
})
|
||||
})
|
||||
|
||||
@@ -45,7 +45,12 @@ const jdApi = vi.hoisted(() => ({
|
||||
|
||||
const confirmMock = vi.hoisted(() => vi.fn())
|
||||
|
||||
const groupApi = vi.hoisted(() => ({
|
||||
createShopGroup: vi.fn(),
|
||||
}))
|
||||
|
||||
vi.mock('@/pages/jd/jd-product-api.ts', () => jdApi)
|
||||
vi.mock('@/pages/account/shop-group-api.ts', () => groupApi)
|
||||
vi.mock('@/components/admin-confirm', () => ({ openAdminConfirm: confirmMock }))
|
||||
|
||||
function item(id: number, over: Record<string, unknown> = {}) {
|
||||
@@ -103,6 +108,7 @@ beforeEach(() => {
|
||||
jdApi.fetchJdCategoryScope.mockResolvedValue(singleGroupScope())
|
||||
jdApi.fetchJdProductGroups.mockResolvedValue([])
|
||||
jdApi.fetchJdProductCategories.mockResolvedValue([])
|
||||
groupApi.createShopGroup.mockResolvedValue({ id: 21, name: '京东-团队', ownerGroupId: 21, sortOrder: 0, productCount: 0 })
|
||||
confirmMock.mockResolvedValue(true)
|
||||
})
|
||||
|
||||
@@ -343,6 +349,55 @@ describe('分类管理入口(V204 独立页并入京东数据库页)', () =>
|
||||
})
|
||||
})
|
||||
|
||||
/** 平台超管空态直建分组(2026-11-17 用户口径「admin 权限最大」):京东侧还没有任何
|
||||
* 数据权限分组时,分类管理弹窗给平台超管开直建口子;建完 group-created ⇒ 父页整条
|
||||
* 作用域重取,当前分组翻到新组、分类下拉与弹窗列表随新组走——从「死路」到「接着建
|
||||
* 分类」一气呵成。scope.platformSuperAdmin 是这条链的唯一开关,非超管维持空态文案。 */
|
||||
describe('平台超管空态直建分组(页面级链路)', () => {
|
||||
it('超管 + 京东侧零分组:弹窗出直建表单,建组走 POST(jd 档) 且作用域重取翻到新组', async () => {
|
||||
let scopeFetchCount = 0
|
||||
jdApi.fetchJdCategoryScope.mockImplementation(() => {
|
||||
scopeFetchCount += 1
|
||||
return scopeFetchCount === 1
|
||||
? Promise.resolve({ platformSuperAdmin: true, defaultGroupId: null, groups: [] })
|
||||
: Promise.resolve({
|
||||
platformSuperAdmin: true,
|
||||
defaultGroupId: 21,
|
||||
groups: [{ id: 21, name: '京东-团队', label: '京东-团队', editable: true }],
|
||||
})
|
||||
})
|
||||
const wrapper = await mountWith({ items: [item(1, { groupId: null, groupName: '' })], total: 1, page: 1, pageSize: 20 })
|
||||
await wrapper.findAll('button').find((b) => b.text() === '分类管理')!.trigger('click')
|
||||
await flushPromises()
|
||||
const modal = wrapper.get('.manage-modal')
|
||||
expect(modal.get('[aria-label="新分组名称"]').exists()).toBe(true, '超管空态不是死路文案')
|
||||
|
||||
await modal.get('[aria-label="新分组名称"]').setValue('京东-团队')
|
||||
await modal.findAll('button').find((b) => b.text() === '新建分组')!.trigger('click')
|
||||
await flushPromises()
|
||||
await flushPromises()
|
||||
await flushPromises()
|
||||
expect(groupApi.createShopGroup).toHaveBeenCalledWith('京东-团队', [], 1, 'jd')
|
||||
expect(jdApi.fetchJdCategoryScope).toHaveBeenCalledTimes(2, 'group-created ⇒ 父页整条作用域重取')
|
||||
expect(jdApi.fetchJdProductGroups).toHaveBeenLastCalledWith(21)
|
||||
expect(wrapper.find('[aria-label="新分组名称"]').exists()).toBe(false, '有组了直建口子关掉')
|
||||
expect(wrapper.get('.manage-modal').text()).toContain('本组暂无分类,先新建一个', '接着就能建分类')
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('非超管 + 京东侧零分组:弹窗维持空态文案,无直建表单(口子不开给组长/公司超管)', async () => {
|
||||
jdApi.fetchJdCategoryScope.mockResolvedValue({ platformSuperAdmin: false, defaultGroupId: null, groups: [] })
|
||||
const wrapper = await mountWith({ items: [item(1)], total: 1, page: 1, pageSize: 20 })
|
||||
await wrapper.findAll('button').find((b) => b.text() === '分类管理')!.trigger('click')
|
||||
await flushPromises()
|
||||
const modal = wrapper.get('.manage-modal')
|
||||
expect(modal.text()).toContain('你还不属于任何数据权限分组')
|
||||
expect(modal.find('[aria-label="新分组名称"]').exists()).toBe(false)
|
||||
expect(groupApi.createShopGroup).not.toHaveBeenCalled()
|
||||
wrapper.unmount()
|
||||
})
|
||||
})
|
||||
|
||||
describe('京东数据库页(v1.4 Phase 5)', () => {
|
||||
it('挂载后按首屏分页参数取列表(pageSize 默认 20、不带公司维度),行数=本页条数', async () => {
|
||||
const wrapper = await mountWith({ items: [item(1), item(2), item(3)], total: 42, page: 1, pageSize: 20 })
|
||||
|
||||
@@ -0,0 +1,86 @@
|
||||
import { test } from 'node:test'
|
||||
import assert from 'node:assert/strict'
|
||||
import { filterMenuTreeNodesByPlatform, platformsOfMenuKey } from '../src/config/platform-scope.ts'
|
||||
import { filterMenuTreeByPlatform } from '../src/layout/platform-menu-filter.ts'
|
||||
import type { MenuOptionNode } from '../src/pages/account/user-menu-auth.ts'
|
||||
import { pruneCheckedIdsToTree } from '../src/pages/account/user-menu-auth.ts'
|
||||
|
||||
/**
|
||||
* 授权树按平台过滤(2026-11-17 用户口径「这边也没有去掉亚马逊的」):建号/编辑弹窗的
|
||||
* 菜单权限树在选「京东」时只留京东侧菜单(京东数据库+双侧账号域三件),亚马逊菜单整枝
|
||||
* 隐藏;切平台时勾选集收敛进可见树(pruneCheckedIdsToTree),否则京东档账号保存后仍带
|
||||
* 亚马逊授权,平台分侧被静默架空。
|
||||
*
|
||||
* 算法与侧边栏同源(platform-scope.filterMenuTreeNodesByPlatform 唯一出口)——本文件
|
||||
* 同时钉「两个消费方同形」:同一夹具喂侧边栏版与授权树版,逐层 key 序列必须一致
|
||||
* (B79-12 同款钉法:一句判据在册有多份正本时,同形性本身要有人钉)。
|
||||
*/
|
||||
|
||||
const node = (id: number, key: string, children?: MenuOptionNode[]): MenuOptionNode => {
|
||||
const out: MenuOptionNode = { id, key, name: `菜单${id}`, sort: id, parentId: null, type: 'admin' }
|
||||
if (children) out.children = children
|
||||
return out
|
||||
}
|
||||
|
||||
/** 授权树实测形状缩影:混编分组(京东库+亚马逊页混在一个分组下)+两侧叶子。 */
|
||||
const TREE: MenuOptionNode[] = [
|
||||
node(1, 'admin_group_account', [
|
||||
node(11, 'admin_users'),
|
||||
node(12, 'admin_group_manage'),
|
||||
node(13, 'admin_companies'),
|
||||
node(14, 'admin_columns'),
|
||||
]),
|
||||
node(2, 'admin_jd_database'),
|
||||
node(3, 'admin_group_shop', [
|
||||
node(31, 'admin_shop_keys'),
|
||||
node(32, 'admin_shop_manage'),
|
||||
]),
|
||||
]
|
||||
|
||||
const keysOf = (nodes: MenuOptionNode[]): string[] =>
|
||||
nodes.map((n) => (n.children?.length ? `${n.key}(${keysOf(n.children).join(',')})` : n.key))
|
||||
|
||||
test('京东侧:只剩京东数据库+双侧账号域三件,亚马逊分组整枝消失', () => {
|
||||
const jd = filterMenuTreeNodesByPlatform(TREE, 'jd')
|
||||
assert.deepEqual(keysOf(jd), [
|
||||
'admin_group_account(admin_users,admin_group_manage,admin_companies)',
|
||||
'admin_jd_database',
|
||||
])
|
||||
})
|
||||
|
||||
test('亚马逊侧:京东独占菜单消失,亚马逊菜单与账号域分组原样', () => {
|
||||
const amazon = filterMenuTreeNodesByPlatform(TREE, 'amazon')
|
||||
assert.deepEqual(keysOf(amazon), [
|
||||
'admin_group_account(admin_users,admin_group_manage,admin_companies,admin_columns)',
|
||||
'admin_group_shop(admin_shop_keys,admin_shop_manage)',
|
||||
])
|
||||
})
|
||||
|
||||
test('与侧边栏过滤同形:同一夹具两个消费方逐层 key 一致(B79-12 钉法)', () => {
|
||||
for (const platform of ['amazon', 'jd'] as const) {
|
||||
const viaSidebar = keysOf(filterMenuTreeByPlatform(TREE as never, platform) as never)
|
||||
const viaAuthTree = keysOf(filterMenuTreeNodesByPlatform(TREE, platform))
|
||||
assert.deepEqual(viaAuthTree, viaSidebar, `platform=${platform} 两处消费方必须同形`)
|
||||
}
|
||||
})
|
||||
|
||||
test('判定出口不变:京东独占/双侧/默认亚马逊三个档位原样(改档位先改这里再改清单)', () => {
|
||||
assert.deepEqual(platformsOfMenuKey('admin_jd_database'), ['jd'])
|
||||
assert.deepEqual(platformsOfMenuKey('admin_users'), ['amazon', 'jd'])
|
||||
assert.deepEqual(platformsOfMenuKey('admin_shop_keys'), ['amazon'])
|
||||
})
|
||||
|
||||
test('pruneCheckedIdsToTree:勾选集收敛进可见树,隐藏侧 id 被剔除且原数组不动', () => {
|
||||
const jd = filterMenuTreeNodesByPlatform(TREE, 'jd')
|
||||
const checked = [11, 12, 2, 31, 99]
|
||||
const snapshot = checked.slice()
|
||||
const pruned = pruneCheckedIdsToTree(checked, jd)
|
||||
assert.deepEqual(pruned, [2, 11, 12], '只留可见树内的 id(31=亚马逊店务、99=不存在)')
|
||||
assert.deepEqual(checked, snapshot, '入参数组不被改写')
|
||||
})
|
||||
|
||||
test('pruneCheckedIdsToTree:空树全剪、空勾选原样空、非法 id 不复活', () => {
|
||||
assert.deepEqual(pruneCheckedIdsToTree([1, 2], []), [], '可见树为空=无可保留')
|
||||
assert.deepEqual(pruneCheckedIdsToTree([], TREE), [])
|
||||
assert.deepEqual(pruneCheckedIdsToTree([0, -3, 'x', 11.7], TREE), [11], '非法 id 按 normalizeMenuIds 口径收敛(丢弃/取整),不会原样漏进提交集')
|
||||
})
|
||||
Reference in New Issue
Block a user