7299166e96
范围:src 里原生 <select> 由 36 处清零(含全站共享分页条),15 个页面 + 1 个组件。
换法统一:class="admin-filter"(main.css 皮肤 42px/9px/#f8fbfd/focus ring)+
aria-label 定位 + el-option 显式 label;「全部 XX」空值行与 value 形状逐字保留
('' / null / String(id) / '1'/'0' / `${source}|${deviceId}` 等,下游查询参数与后端枚举不动)。
- OldPagination:每页条数下拉换 el-select(局部 import,挂载测试单 mount 也能渲染),壳压回分页条 30px/8px 档
- account 三页(菜单类型/密钥状态/分组)+ GroupsPage/UsersPage 清死 select 规则
- asin 三页(国家/弹窗分组):弹窗分组用 placeholder+clearable+:value-on-clear 钉回 null,守 number|null 契约
- patent 页(国家/分组)
- records 两页(来源/用户/终端覆盖):终端覆盖 value 仍 source|deviceId
- tasks 四页 + 任务看板(业务/状态/类型/来源/店铺/分组/场景):BrandGating/DuplicateCheck/KeywordUsage 三页本地是 34px 紧凑档,
故把 el-select 壳压回本地 34px/7px 与同行输入框齐高(否则高 8px 错位)
测试:mount 全量 21 文件 164 passed;node --test 1924 例 1922 passed(2 红为在册:
date-range-order 环境红、company-config-entry-super-only 由 ee613db0 引入与本次无关);
vue-tsc rc=0。新增 account-select-el / records-select-el 两支换壳契约(值形状 + 空值行 + 点开→点选项)。
218 lines
9.9 KiB
TypeScript
218 lines
9.9 KiB
TypeScript
/**
|
||
* 账户域三页的原生 <select> → el-select(2026-11-17 用户口径「和亚马逊不统一」:
|
||
* 原生 select 的弹层是浏览器直角原生物 ⇒ 换 EP 圆角弹层,外壳走全局 .admin-filter)。
|
||
*
|
||
* 钉住换壳最容易错的两件事:
|
||
* 1. **值形状逐字不变**——菜单类型/密钥状态仍是 '' / 'admin' / 'app' / 'passed'…(空串=不筛),
|
||
* 分组仍是 null 或数字 id(下游 `groupId: groupFilter.value || undefined` 一字不动);
|
||
* 2. **「全部 XX」空值行还在**,且选中它就是"不改筛选条件",不是筛一个叫空的类型。
|
||
*
|
||
* aria-label 由 EP 落在内层 combobox input 上;选项清单走组件树读,点选走「点开→点选项」真实路径
|
||
* (弹层 teleport 到 body)。页面模板靠 main.ts 全局注册 EP 组件,挂载测试不跑 main.ts ⇒
|
||
* 这里必须显式把 ElSelect/ElOption 传进 plugins。
|
||
*
|
||
* 跑法:`npx vitest run tests/mount/account-select-el.mount.test.ts`
|
||
*/
|
||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
||
import { DOMWrapper, flushPromises, mount, type VueWrapper } from '@vue/test-utils'
|
||
import { ElOption, ElSelect } from 'element-plus'
|
||
import { createPinia, setActivePinia, type Pinia } from 'pinia'
|
||
|
||
import MenusPage from '@/pages/account/MenusPage.vue'
|
||
import UserSecretsPage from '@/pages/account/UserSecretsPage.vue'
|
||
import UserSecretUsagePage from '@/pages/account/UserSecretUsagePage.vue'
|
||
import { useAdminSessionStore } from '@/stores/admin-session'
|
||
import { useCompanyTabStore } from '@/stores/company-tab'
|
||
|
||
const menuApi = vi.hoisted(() => ({
|
||
loadMenuManageTree: vi.fn(),
|
||
createMenu: vi.fn(),
|
||
updateMenu: vi.fn(),
|
||
deleteMenu: vi.fn(),
|
||
reorderMenus: vi.fn(),
|
||
}))
|
||
|
||
const secretsApi = vi.hoisted(() => ({
|
||
fetchUserSecretList: vi.fn(),
|
||
fetchAdminSecretBalances: vi.fn(),
|
||
checkUserSecret: vi.fn(),
|
||
deleteUserSecret: vi.fn(),
|
||
saveUserSecretModule: vi.fn(),
|
||
clearUserSecretModule: vi.fn(),
|
||
}))
|
||
|
||
const usageApi = vi.hoisted(() => ({ fetchUserSecretUsage: vi.fn() }))
|
||
|
||
vi.mock('@/pages/account/menu-manage-api', () => menuApi)
|
||
vi.mock('@/api/user-secrets', () => secretsApi)
|
||
vi.mock('@/api/user-secret-usage', () => usageApi)
|
||
|
||
const GROUPS = [
|
||
{ id: 7, groupName: '甲组' },
|
||
{ id: 9, groupName: '乙组' },
|
||
]
|
||
|
||
const MENU_ROWS = [
|
||
{ id: 1, name: '后台菜单', columnKey: 'admin-col', parentId: null, menuType: 'admin', routePath: '/a', sortOrder: 0, children: [] },
|
||
{ id: 2, name: '软件菜单', columnKey: 'app-col', parentId: null, menuType: 'app', routePath: '/b', sortOrder: 1, children: [] },
|
||
]
|
||
|
||
// ---------------- el-select 交互助手(与京东数据库页/亚马逊面同一套口径) ----------------
|
||
|
||
/** 按 aria-label 找对应的 ElSelect 实例(EP 把该属性落在内层 combobox input 上)。 */
|
||
function selectByLabel(wrapper: VueWrapper<Element>, label: string) {
|
||
const found = wrapper.findAllComponents(ElSelect).find((s) => s.find(`[aria-label="${label}"]`).exists())
|
||
expect(found, `应存在 aria-label="${label}" 的下拉`).toBeTruthy()
|
||
return found!
|
||
}
|
||
|
||
/** 某颗下拉的全部选项文案(读 el-option 的 label prop,不依赖插槽文本)。 */
|
||
function optionLabels(wrapper: VueWrapper<Element>, label: string): string[] {
|
||
return selectByLabel(wrapper, label).findAllComponents(ElOption).map((o) => o.props('label') as string)
|
||
}
|
||
|
||
/** 某颗下拉的全部选项 value(形状判据:空串/数字 id/null 逐字对撞)。 */
|
||
function optionValues(wrapper: VueWrapper<Element>, label: string): unknown[] {
|
||
return selectByLabel(wrapper, label).findAllComponents(ElOption).map((o) => o.props('value'))
|
||
}
|
||
|
||
/** 点开指定下拉并点选目标文案的选项(触发 update:modelValue + change,与真实用户一致)。
|
||
* 面板按内层 input 的 aria-controls 圈定,避免另一颗(可能仍挂着的)弹层串台。 */
|
||
async function pickSelectOption(wrapper: VueWrapper<Element>, label: string, optionText: string): Promise<void> {
|
||
const input = wrapper.get(`[aria-label="${label}"]`)
|
||
await input.trigger('click')
|
||
await flushPromises()
|
||
const contentId = input.attributes('aria-controls')
|
||
const scope = (contentId && document.getElementById(contentId)) ?? document.body
|
||
const items = [...scope.querySelectorAll('.el-select-dropdown__item')].filter((el) => !el.classList.contains('is-hidden'))
|
||
const target = items.find((el) => (el.textContent ?? '').trim() === optionText)
|
||
expect(target, `下拉应弹出「${optionText}」选项`).toBeTruthy()
|
||
await new DOMWrapper(target as Element).trigger('click')
|
||
await flushPromises()
|
||
}
|
||
|
||
/** 按文案点按钮(筛选条上的查询/重置)。 */
|
||
async function clickButton(wrapper: VueWrapper<Element>, text: string): Promise<void> {
|
||
const button = wrapper.findAll('button').find((b) => b.text().trim() === text)
|
||
expect(button, `应存在「${text}」按钮`).toBeTruthy()
|
||
await button!.trigger('click')
|
||
await flushPromises()
|
||
await flushPromises()
|
||
}
|
||
|
||
/** 最近一次调用的入参(首屏 + 公司 tab watch 可能各发一次,判"选完落什么参"只认最后一次)。 */
|
||
function lastArgs(fn: { mock: { calls: unknown[][] } }): Record<string, unknown> {
|
||
const calls = fn.mock.calls
|
||
expect(calls.length, '接口应至少被调用一次').toBeGreaterThan(0)
|
||
return calls[calls.length - 1][0] as Record<string, unknown>
|
||
}
|
||
|
||
let pinia: Pinia
|
||
|
||
beforeEach(() => {
|
||
vi.clearAllMocks()
|
||
pinia = createPinia()
|
||
setActivePinia(pinia)
|
||
useAdminSessionStore().user = { id: 1, username: 'root', role: 'super_admin' }
|
||
useCompanyTabStore().setActiveId(1)
|
||
})
|
||
|
||
async function mountMenus(): Promise<VueWrapper<Element>> {
|
||
menuApi.loadMenuManageTree.mockResolvedValue(MENU_ROWS)
|
||
const wrapper = mount(MenusPage, { global: { plugins: [pinia, ElSelect, ElOption] } })
|
||
await flushPromises()
|
||
return wrapper
|
||
}
|
||
|
||
async function mountSecrets(): Promise<VueWrapper<Element>> {
|
||
secretsApi.fetchUserSecretList.mockResolvedValue({ items: [], total: 0, page: 1, pageSize: 15, groupOptions: GROUPS })
|
||
secretsApi.fetchAdminSecretBalances.mockResolvedValue({ items: [] })
|
||
const wrapper = mount(UserSecretsPage, { global: { plugins: [pinia, ElSelect, ElOption] } })
|
||
await flushPromises()
|
||
return wrapper
|
||
}
|
||
|
||
async function mountUsage(): Promise<VueWrapper<Element>> {
|
||
usageApi.fetchUserSecretUsage.mockResolvedValue({ items: [], total: 0, groupOptions: GROUPS })
|
||
const wrapper = mount(UserSecretUsagePage, { global: { plugins: [pinia, ElSelect, ElOption] } })
|
||
await flushPromises()
|
||
return wrapper
|
||
}
|
||
|
||
/** 菜单表格里正在显示的行名(顺序=树展平顺序)。 */
|
||
function visibleMenuNames(wrapper: VueWrapper<Element>): string[] {
|
||
return wrapper.findAll('.menu-name-text').map((el) => el.text().trim())
|
||
}
|
||
|
||
describe('菜单管理页 × el-select', () => {
|
||
it('菜单类型下拉:空值行仍是空串,另两档仍是 admin/app', async () => {
|
||
const wrapper = await mountMenus()
|
||
expect(optionLabels(wrapper, '筛选菜单类型')).toEqual(['全部', '后台', '软件'])
|
||
expect(optionValues(wrapper, '筛选菜单类型')).toEqual(['', 'admin', 'app'])
|
||
})
|
||
|
||
it('选「软件」按 menuType 筛表,选回「全部」恢复全量(空串不参与筛选)', async () => {
|
||
const wrapper = await mountMenus()
|
||
expect(visibleMenuNames(wrapper)).toEqual(['后台菜单', '软件菜单'])
|
||
await pickSelectOption(wrapper, '筛选菜单类型', '软件')
|
||
expect(visibleMenuNames(wrapper)).toEqual(['软件菜单'])
|
||
await pickSelectOption(wrapper, '筛选菜单类型', '全部')
|
||
expect(visibleMenuNames(wrapper)).toEqual(['后台菜单', '软件菜单'])
|
||
})
|
||
})
|
||
|
||
describe('密钥管理页 × el-select', () => {
|
||
it('状态下拉:「全部状态」是空串档,其余各档码逐一在案', async () => {
|
||
const wrapper = await mountSecrets()
|
||
expect(optionLabels(wrapper, '筛选密钥状态')).toEqual([
|
||
'全部状态',
|
||
'检测通过',
|
||
'检测失败',
|
||
'未配齐',
|
||
'无法判定/可重试',
|
||
'未检测',
|
||
])
|
||
expect(optionValues(wrapper, '筛选密钥状态')).toEqual(['', 'passed', 'failed', 'incomplete', 'error', 'unknown'])
|
||
})
|
||
|
||
it('分组下拉:「全部分组」仍是 null,组选项是数字 id', async () => {
|
||
const wrapper = await mountSecrets()
|
||
expect(optionLabels(wrapper, '筛选分组')).toEqual(['全部分组', '甲组', '乙组'])
|
||
expect(optionValues(wrapper, '筛选分组')).toEqual([null, 7, 9])
|
||
})
|
||
|
||
it('落参:checkStatus 是状态码、groupId 是数字;选回空值行后两者都不出现', async () => {
|
||
const wrapper = await mountSecrets()
|
||
await pickSelectOption(wrapper, '筛选密钥状态', '检测失败')
|
||
await pickSelectOption(wrapper, '筛选分组', '甲组')
|
||
await clickButton(wrapper, '查询')
|
||
const selected = lastArgs(secretsApi.fetchUserSecretList)
|
||
expect(selected.checkStatus).toBe('failed')
|
||
expect(selected.groupId).toBe(7)
|
||
|
||
// 空值行=不筛:'' / null 都落回 undefined,查询参数与换壳前逐字一致
|
||
await pickSelectOption(wrapper, '筛选密钥状态', '全部状态')
|
||
await pickSelectOption(wrapper, '筛选分组', '全部分组')
|
||
await clickButton(wrapper, '查询')
|
||
const cleared = lastArgs(secretsApi.fetchUserSecretList)
|
||
expect(cleared.checkStatus).toBeUndefined()
|
||
expect(cleared.groupId).toBeUndefined()
|
||
})
|
||
})
|
||
|
||
describe('密钥用量页 × el-select', () => {
|
||
it('分组下拉与密钥页同口径(全部分组=null),落参仍是数字 id / 缺省', async () => {
|
||
const wrapper = await mountUsage()
|
||
expect(optionLabels(wrapper, '筛选分组')).toEqual(['全部分组', '甲组', '乙组'])
|
||
expect(optionValues(wrapper, '筛选分组')).toEqual([null, 7, 9])
|
||
|
||
await pickSelectOption(wrapper, '筛选分组', '乙组')
|
||
await clickButton(wrapper, '查询')
|
||
expect(lastArgs(usageApi.fetchUserSecretUsage).groupId).toBe(9)
|
||
|
||
await pickSelectOption(wrapper, '筛选分组', '全部分组')
|
||
await clickButton(wrapper, '查询')
|
||
expect(lastArgs(usageApi.fetchUserSecretUsage).groupId).toBeUndefined()
|
||
})
|
||
})
|