style(admin): 全站原生下拉统一换 el-select——弹层圆角与亚马逊面一致(2026-11-17 用户口径「样式咋不是圆角 和亚马逊不统一 其他地方也要看看」)
范围: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 两支换壳契约(值形状 + 空值行 + 点开→点选项)。
This commit is contained in:
@@ -0,0 +1,217 @@
|
||||
/**
|
||||
* 账户域三页的原生 <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()
|
||||
})
|
||||
})
|
||||
@@ -14,8 +14,9 @@
|
||||
import { readFileSync } from 'node:fs'
|
||||
import { resolve } from 'node:path'
|
||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
import { flushPromises, mount, type VueWrapper } from '@vue/test-utils'
|
||||
import { DOMWrapper, flushPromises, mount, type VueWrapper } from '@vue/test-utils'
|
||||
import { createPinia, setActivePinia, type Pinia } from 'pinia'
|
||||
import { ElOption, ElSelect } from 'element-plus'
|
||||
|
||||
import AppearancePatentCleanItemsPage from '@/pages/patent/AppearancePatentCleanItemsPage.vue'
|
||||
import { adminPages } from '@/router/routes'
|
||||
@@ -74,12 +75,40 @@ beforeEach(() => {
|
||||
|
||||
async function mountWith(payload: unknown): Promise<VueWrapper<Element>> {
|
||||
cleanApi.fetchAppearancePatentCleanList.mockImplementation(() => Promise.resolve(payload))
|
||||
const wrapper = mount(AppearancePatentCleanItemsPage, { global: { plugins: [pinia] } })
|
||||
const wrapper = mount(AppearancePatentCleanItemsPage, { global: { plugins: [pinia, ElSelect, ElOption] } })
|
||||
await flushPromises()
|
||||
await flushPromises()
|
||||
return wrapper
|
||||
}
|
||||
|
||||
// ---------------- el-select 交互助手(2026-11-17 筛选行/分页条下拉换 el-select,与亚马逊面统一) ----------------
|
||||
// aria-label 经 EP 的 ariaLabel prop 落在内层 combobox input 上;弹层 teleport 到 body,
|
||||
// ElOption 仍在挂载树里 ⇒ 选项清单走组件树读,点选走「点开→点选项」真实路径。
|
||||
|
||||
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!
|
||||
}
|
||||
|
||||
function optionLabels(wrapper: VueWrapper<Element>, label: string): string[] {
|
||||
return selectByLabel(wrapper, label).findAllComponents(ElOption).map((o) => o.props('label') as string)
|
||||
}
|
||||
|
||||
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()
|
||||
}
|
||||
|
||||
describe('外观专利数据库页(明细表,2026-11-11 恢复「昨天那个格式」)', () => {
|
||||
it('页面组件落位:明细表 + 明细端点 + 导出,卡片视图与删除入口已下架', () => {
|
||||
const src = readFileSync(resolve(process.cwd(), PAGE_PATH), 'utf-8')
|
||||
@@ -215,14 +244,13 @@ describe('外观专利数据库页(明细表,2026-11-11 恢复「昨天那
|
||||
cleanApi.fetchDedupeTotalGroups.mockResolvedValue([{ id: 7, name: '甲组', leaderUserId: 9 }])
|
||||
const wrapper = await mountWith({ items: [], total: 0, page: 1, pageSize: 10 })
|
||||
|
||||
const textInputs = wrapper.findAll('.form-group input[type="text"]')
|
||||
const textInputs = wrapper.findAll('.form-group input[type="text"]:not(.el-select__input)')
|
||||
expect(textInputs).toHaveLength(2, '任务号+ASIN 两个筛选框恢复(客户要一目了然)')
|
||||
await textInputs[0].setValue('33874')
|
||||
await textInputs[1].setValue('B0CLEAN')
|
||||
|
||||
const selects = wrapper.findAll('select')
|
||||
await selects[0].setValue('DE') // 国家排在前(模板顺序:任务号/ASIN/国家/分组)
|
||||
await selects[1].setValue('7') // 分组(主管=组长)
|
||||
await pickSelectOption(wrapper, '筛选国家', '德国') // 国家排在前(模板顺序:任务号/ASIN/国家/分组)
|
||||
await pickSelectOption(wrapper, '筛选分组', '甲组') // 分组(主管=组长)
|
||||
const dateInputs = wrapper.findAll('input[type="date"]')
|
||||
await dateInputs[0].setValue('2026-11-01')
|
||||
await dateInputs[1].setValue('2026-11-09')
|
||||
@@ -249,13 +277,12 @@ describe('外观专利数据库页(明细表,2026-11-11 恢复「昨天那
|
||||
const wrapper = await mountWith({ items: [], total: 0, page: 1, pageSize: 10 })
|
||||
expect(cleanApi.fetchDedupeTotalGroups).toHaveBeenCalledWith(1)
|
||||
|
||||
const groupSelect = wrapper.findAll('select')[1] // 模板顺序:国家在前、分组在后
|
||||
const optionTexts = groupSelect.findAll('option').map((o) => o.text())
|
||||
expect(optionTexts).toContain('全部分组')
|
||||
expect(optionTexts).toContain('甲组')
|
||||
const groups = optionLabels(wrapper, '筛选分组')
|
||||
expect(groups).toContain('全部分组')
|
||||
expect(groups).toContain('甲组')
|
||||
|
||||
const callsBeforeSelect = cleanApi.fetchAppearancePatentCleanList.mock.calls.length
|
||||
await groupSelect.setValue('7')
|
||||
await pickSelectOption(wrapper, '筛选分组', '甲组')
|
||||
await flushPromises()
|
||||
expect(cleanApi.fetchAppearancePatentCleanList.mock.calls.length).toBe(callsBeforeSelect + 1,
|
||||
'选中分组必须立刻重查')
|
||||
@@ -267,7 +294,7 @@ describe('外观专利数据库页(明细表,2026-11-11 恢复「昨天那
|
||||
|
||||
it('重置把筛选面回空并回第一页重取', async () => {
|
||||
const wrapper = await mountWith({ items: [], total: 0, page: 1, pageSize: 10 })
|
||||
const textInputs = wrapper.findAll('.form-group input[type="text"]')
|
||||
const textInputs = wrapper.findAll('.form-group input[type="text"]:not(.el-select__input)')
|
||||
await textInputs[0].setValue('33874')
|
||||
await textInputs[1].setValue('B0CLEAN')
|
||||
const callsBefore = cleanApi.fetchAppearancePatentCleanList.mock.calls.length
|
||||
@@ -288,8 +315,9 @@ describe('外观专利数据库页(明细表,2026-11-11 恢复「昨天那
|
||||
expect(cleanApi.fetchAppearancePatentCleanList).toHaveBeenCalledTimes(2)
|
||||
expect(cleanApi.fetchAppearancePatentCleanList.mock.calls[1][0].page).toBe(3)
|
||||
|
||||
const sizeSelect = wrapper.find('.page-size-select')
|
||||
await sizeSelect.setValue('50')
|
||||
// 每页条数下拉 2026-11-17 随分页条一起换 el-select(OldPagination 内局部注册)。
|
||||
expect(wrapper.find('.page-size-select').exists()).toBe(true, '分页条下拉保留 .page-size-select 定位类')
|
||||
await pickSelectOption(wrapper, '每页条数', '50条/页')
|
||||
await flushPromises()
|
||||
const last = cleanApi.fetchAppearancePatentCleanList.mock.calls.at(-1)![0]
|
||||
expect(last.pageSize).toBe(50)
|
||||
@@ -314,11 +342,10 @@ describe('外观专利数据库页(明细表,2026-11-11 恢复「昨天那
|
||||
it('切公司 Tab 重取并清掉上一家的筛选(company-tab-wiring 同口径)', async () => {
|
||||
cleanApi.fetchDedupeTotalGroups.mockResolvedValue([{ id: 7, name: '甲组', leaderUserId: 9 }])
|
||||
const wrapper = await mountWith({ items: [item(1)], total: 1, page: 1, pageSize: 10 })
|
||||
const textInputs = wrapper.findAll('.form-group input[type="text"]')
|
||||
const textInputs = wrapper.findAll('.form-group input[type="text"]:not(.el-select__input)')
|
||||
await textInputs[0].setValue('33874')
|
||||
await textInputs[1].setValue('B0CLEAN')
|
||||
const groupSelect = wrapper.findAll('select')[1]
|
||||
await groupSelect.setValue('7')
|
||||
await pickSelectOption(wrapper, '筛选分组', '甲组')
|
||||
const callsBefore = cleanApi.fetchAppearancePatentCleanList.mock.calls.length
|
||||
|
||||
useCompanyTabStore().setActiveId(2)
|
||||
|
||||
@@ -600,8 +600,10 @@ describe('京东数据库页(v1.4 Phase 5)', () => {
|
||||
expect(jdApi.fetchJdProductList).toHaveBeenCalledTimes(2)
|
||||
expect(jdApi.fetchJdProductList.mock.calls[1][0].page).toBe(3)
|
||||
|
||||
const sizeSelect = wrapper.find('.page-size-select')
|
||||
await sizeSelect.setValue('50')
|
||||
// 每页条数下拉 2026-11-17 随分页条一起换 el-select(OldPagination 内局部注册):
|
||||
// 点开→点选项,不再走原生 setValue。
|
||||
expect(wrapper.find('.page-size-select').exists()).toBe(true, '分页条下拉保留 .page-size-select 定位类')
|
||||
await pickSelectOption(wrapper, '每页条数', '50条/页')
|
||||
await flushPromises()
|
||||
const last = jdApi.fetchJdProductList.mock.calls.at(-1)![0]
|
||||
expect(last.pageSize).toBe(50)
|
||||
|
||||
@@ -0,0 +1,215 @@
|
||||
/**
|
||||
* 日志管理页 / 生成记录页的原生 <select> → el-select(2026-11-17 用户口径「和亚马逊不统一」:
|
||||
* 原生 select 的弹层是浏览器直角原生物 ⇒ 换 EP 圆角弹层,外壳走全局 .admin-filter)。
|
||||
*
|
||||
* 这里钉住换壳时最容易错的两件事:
|
||||
* 1. **值形状逐字不变**——「全部来源」/「全部用户」空行仍是 ''、用户仍是 String(id)、
|
||||
* 终端仍是 `${source}|${deviceId}`、模式仍是 'full'/'selected' 常量(后端按这些字符串解析,
|
||||
* 形状一动就错单,而界面上看起来只是"选了个下拉");
|
||||
* 2. **选中 → 落参的链路仍只有一处**——来源 source、用户 Number(uid)、终端 '|' 切分与 mode 常量。
|
||||
*
|
||||
* aria-label 经 EP 的 ariaLabel prop 落在内层 combobox input 上,选项清单走组件树读
|
||||
* (弹层 teleport 到 body),点选走「点开→点选项」真实路径。
|
||||
* 不用 readFileSync(source-pin-ratchet 对台账外新文件带读点即红),全部走真实挂载断言。
|
||||
*
|
||||
* 跑法:`npx vitest run tests/mount/records-select-el.mount.test.ts`
|
||||
*/
|
||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
import { DOMWrapper, flushPromises, mount, type VueWrapper } from '@vue/test-utils'
|
||||
import { createPinia, setActivePinia, type Pinia } from 'pinia'
|
||||
import { defineComponent, h } from 'vue'
|
||||
import { ElOption, ElSelect } from 'element-plus'
|
||||
|
||||
import DeviceLogsPage from '@/pages/records/DeviceLogsPage.vue'
|
||||
import RecordsHistoryPage from '@/pages/records/RecordsHistoryPage.vue'
|
||||
import { useAdminSessionStore } from '@/stores/admin-session'
|
||||
|
||||
const deviceLogsApi = vi.hoisted(() => ({
|
||||
fetchDeviceLogFiles: vi.fn(),
|
||||
fetchDeviceLogContent: vi.fn(),
|
||||
fetchDeviceLogConfig: vi.fn(),
|
||||
fetchDeviceLogDevices: vi.fn(),
|
||||
deviceLogDownloadUrl: vi.fn((id: number) => `/api/admin/device-logs/${id}/download`),
|
||||
deleteDeviceLogFile: vi.fn(),
|
||||
deleteDeviceLogOverride: vi.fn(),
|
||||
updateDeviceLogGlobalMode: vi.fn(),
|
||||
updateDeviceLogOverride: vi.fn(),
|
||||
}))
|
||||
|
||||
const historyApi = vi.hoisted(() => ({
|
||||
fetchHistoryList: vi.fn(),
|
||||
fetchHistoryUserOptions: vi.fn(),
|
||||
}))
|
||||
|
||||
vi.mock('@/api/device-logs', () => deviceLogsApi)
|
||||
vi.mock('@/pages/records/history-api.ts', () => historyApi)
|
||||
|
||||
/** 采集配置弹窗(el-dialog)用桩:真实 dialog 把内容 teleport 到 body,wrapper 里就查不到;
|
||||
* 桩只留一层 div 并把默认插槽摊在挂载树里,modelValue 与真实一样控制开关。 */
|
||||
const DialogStub = defineComponent({
|
||||
name: 'ElDialogStub',
|
||||
props: { modelValue: { type: Boolean, default: false } },
|
||||
setup(props, { slots }) {
|
||||
return () => (props.modelValue ? h('div', { class: 'dialog-stub' }, slots.default?.()) : null)
|
||||
},
|
||||
})
|
||||
|
||||
// ---------------- el-select 交互助手(与京东数据库页/亚马逊面同一套口径) ----------------
|
||||
|
||||
/** 按 aria-label 找对应的 ElSelect 组件实例(页面里还有 OldPagination 的「每页条数」,靠 aria-label 区分)。 */
|
||||
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!
|
||||
}
|
||||
|
||||
/** 读某颗下拉的全部选项文案(label prop;组件树查询不受弹层 teleport 影响)。 */
|
||||
function optionLabels(wrapper: VueWrapper<Element>, label: string): string[] {
|
||||
return selectByLabel(wrapper, label).findAllComponents(ElOption).map((o) => o.props('label') as string)
|
||||
}
|
||||
|
||||
/** 读某颗下拉的全部选项 value(形状判据:空串/字符串 id/`source|deviceId`/mode 常量)。 */
|
||||
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>
|
||||
}
|
||||
|
||||
const USERS = [
|
||||
{ id: 7, username: '张三' },
|
||||
{ id: 8, username: '李四' },
|
||||
]
|
||||
|
||||
let pinia: Pinia
|
||||
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks()
|
||||
pinia = createPinia()
|
||||
setActivePinia(pinia)
|
||||
useAdminSessionStore().user = { id: 1, username: 'root', role: 'super_admin' }
|
||||
historyApi.fetchHistoryUserOptions.mockResolvedValue(USERS)
|
||||
})
|
||||
|
||||
async function mountDeviceLogs(): Promise<VueWrapper<Element>> {
|
||||
deviceLogsApi.fetchDeviceLogFiles.mockResolvedValue({ items: [], total: 0, page: 1, pageSize: 15, retentionDays: 7 })
|
||||
deviceLogsApi.fetchDeviceLogConfig.mockResolvedValue({ globalMode: 'full', overrides: [] })
|
||||
deviceLogsApi.fetchDeviceLogDevices.mockResolvedValue([
|
||||
{ source: 'client', deviceId: 'dev-1', deviceName: '工位A', lastUploadAt: null },
|
||||
])
|
||||
const wrapper = mount(DeviceLogsPage, {
|
||||
global: { plugins: [pinia, ElSelect, ElOption], stubs: { ElDialog: DialogStub } },
|
||||
})
|
||||
await flushPromises()
|
||||
await flushPromises()
|
||||
return wrapper
|
||||
}
|
||||
|
||||
describe('日志管理页 × el-select', () => {
|
||||
it('筛选条两颗下拉:空行/字符串 id/来源常量逐字不变', async () => {
|
||||
const wrapper = await mountDeviceLogs()
|
||||
expect(optionLabels(wrapper, '来源')).toEqual(['全部来源', '桌面客户端', '麦象采集机'])
|
||||
expect(optionValues(wrapper, '来源')).toEqual(['', 'client', 'maixiang'])
|
||||
// 用户清单很长 ⇒ filterable;值仍是 String(id)(下游 `uidFilter.value ? Number(...)` 判空)
|
||||
expect(selectByLabel(wrapper, '指定用户').props('filterable')).toBe(true)
|
||||
expect(optionLabels(wrapper, '指定用户')).toEqual(['全部用户', '张三', '李四'])
|
||||
expect(optionValues(wrapper, '指定用户')).toEqual(['', '7', '8'])
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('选中来源/用户后查询:source 走常量、uid 仍是数字', async () => {
|
||||
const wrapper = await mountDeviceLogs()
|
||||
await pickSelectOption(wrapper, '来源', '麦象采集机')
|
||||
await pickSelectOption(wrapper, '指定用户', '李四')
|
||||
await clickButton(wrapper, '查询')
|
||||
const args = lastArgs(deviceLogsApi.fetchDeviceLogFiles)
|
||||
expect(args.source).toBe('maixiang')
|
||||
expect(args.uid).toBe(8)
|
||||
expect(typeof args.uid).toBe('number')
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('重置回到空值首行:不发 source、不发 uid(空串的「全部」语义不变)', async () => {
|
||||
const wrapper = await mountDeviceLogs()
|
||||
await pickSelectOption(wrapper, '来源', '桌面客户端')
|
||||
await pickSelectOption(wrapper, '指定用户', '张三')
|
||||
await clickButton(wrapper, '重置')
|
||||
const args = lastArgs(deviceLogsApi.fetchDeviceLogFiles)
|
||||
expect(args.source).toBeUndefined()
|
||||
expect(args.uid).toBeUndefined()
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('采集配置弹窗:终端值仍是 `source|deviceId`、模式仍是 full/selected 常量', async () => {
|
||||
const wrapper = await mountDeviceLogs()
|
||||
await clickButton(wrapper, '采集配置')
|
||||
expect(optionLabels(wrapper, '选择终端')).toEqual(['选择终端(最近上报的设备)', '桌面客户端 · 工位A(dev-1)'])
|
||||
expect(optionValues(wrapper, '选择终端')).toEqual(['', 'client|dev-1'])
|
||||
expect(optionLabels(wrapper, '覆盖模式')).toEqual(['全量采集', '精选采集'])
|
||||
expect(optionValues(wrapper, '覆盖模式')).toEqual(['full', 'selected'])
|
||||
|
||||
await pickSelectOption(wrapper, '选择终端', '桌面客户端 · 工位A(dev-1)')
|
||||
await pickSelectOption(wrapper, '覆盖模式', '全量采集')
|
||||
await clickButton(wrapper, '添加/更新覆盖')
|
||||
expect(deviceLogsApi.updateDeviceLogOverride).toHaveBeenCalledWith('client', 'dev-1', '工位A', 'full')
|
||||
wrapper.unmount()
|
||||
})
|
||||
})
|
||||
|
||||
describe('生成记录页 × el-select', () => {
|
||||
async function mountHistory(): Promise<VueWrapper<Element>> {
|
||||
historyApi.fetchHistoryList.mockResolvedValue({ items: [], total: 0, page: 1, pageSize: 10 })
|
||||
const wrapper = mount(RecordsHistoryPage, { global: { plugins: [pinia, ElSelect, ElOption] } })
|
||||
await flushPromises()
|
||||
await flushPromises()
|
||||
return wrapper
|
||||
}
|
||||
|
||||
it('指定用户下拉:空行 + String(id) 值形状不变', async () => {
|
||||
const wrapper = await mountHistory()
|
||||
expect(selectByLabel(wrapper, '指定用户').props('filterable')).toBe(true)
|
||||
expect(optionLabels(wrapper, '指定用户')).toEqual(['全部用户', '张三', '李四'])
|
||||
expect(optionValues(wrapper, '指定用户')).toEqual(['', '7', '8'])
|
||||
wrapper.unmount()
|
||||
})
|
||||
|
||||
it('选用户查询发数字 userId;选回「全部用户」不发 userId', async () => {
|
||||
const wrapper = await mountHistory()
|
||||
await pickSelectOption(wrapper, '指定用户', '李四')
|
||||
await clickButton(wrapper, '查询')
|
||||
expect(lastArgs(historyApi.fetchHistoryList).userId).toBe(8)
|
||||
|
||||
await pickSelectOption(wrapper, '指定用户', '全部用户')
|
||||
await clickButton(wrapper, '查询')
|
||||
expect(lastArgs(historyApi.fetchHistoryList).userId).toBeUndefined()
|
||||
wrapper.unmount()
|
||||
})
|
||||
})
|
||||
@@ -9,6 +9,7 @@
|
||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
import { flushPromises, mount, type VueWrapper } from '@vue/test-utils'
|
||||
import { createPinia, setActivePinia, type Pinia } from 'pinia'
|
||||
import { ElOption, ElSelect } from 'element-plus'
|
||||
|
||||
import KeywordUsagePage from '@/pages/tasks/KeywordUsagePage.vue'
|
||||
import BrandGatingPanel from '@/pages/tasks/BrandGatingPanel.vue'
|
||||
@@ -50,7 +51,9 @@ const loadingDirective = { mounted() {}, updated() {} }
|
||||
function mountPage(component: Parameters<typeof mount>[0], pinia: Pinia): VueWrapper {
|
||||
return mount(component, {
|
||||
global: {
|
||||
plugins: [pinia],
|
||||
// 筛选下拉 2026-11-17 换成 el-select(原生 select 弹层是直角原生物,与亚马逊页不统一),
|
||||
// 两支页面都要把 EP 组件注册进来,否则渲染成未解析标签。
|
||||
plugins: [pinia, ElSelect, ElOption],
|
||||
directives: { loading: loadingDirective },
|
||||
},
|
||||
})
|
||||
|
||||
@@ -17,12 +17,30 @@
|
||||
*/
|
||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
import { flushPromises, mount, type VueWrapper } from '@vue/test-utils'
|
||||
import { ElOption, ElSelect } from 'element-plus'
|
||||
import { createPinia, setActivePinia, type Pinia } from 'pinia'
|
||||
|
||||
import UserSecretsPage from '@/pages/account/UserSecretsPage.vue'
|
||||
import { useAdminSessionStore } from '@/stores/admin-session'
|
||||
import { useCompanyTabStore } from '@/stores/company-tab'
|
||||
|
||||
/* 筛选下拉 2026-11-17 起是 el-select(原生 select 的弹层是浏览器直角原生物,用户要求与亚马逊统一)。
|
||||
页面模板不带局部 import、靠 main.ts 全局注册,挂载测试不跑 main.ts ⇒ 必须在这里显式注册,
|
||||
否则拿到的是未解析的空壳,`findAllComponents(ElSelect)` 一条也找不到。 */
|
||||
const EL_PLUGINS = [ElSelect, ElOption]
|
||||
|
||||
/** 按 aria-label 找下拉: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)
|
||||
}
|
||||
|
||||
const secretsApi = vi.hoisted(() => ({
|
||||
fetchUserSecretList: vi.fn(),
|
||||
fetchAdminSecretBalances: vi.fn(),
|
||||
@@ -106,7 +124,7 @@ describe('密钥管理页:检测结果按 check_code 分档渲染', () => {
|
||||
|
||||
async function mountWith(rowValue: Record<string, unknown>) {
|
||||
secretsApi.fetchUserSecretList.mockResolvedValue({ items: [rowValue], total: 1, page: 1, pageSize: 15, groupOptions: [] })
|
||||
const wrapper = mount(UserSecretsPage, { global: { plugins: [pinia] } })
|
||||
const wrapper = mount(UserSecretsPage, { global: { plugins: [pinia, ...EL_PLUGINS] } })
|
||||
await flushPromises()
|
||||
return wrapper
|
||||
}
|
||||
@@ -239,7 +257,7 @@ describe('密钥管理页:检测结果按 check_code 分档渲染', () => {
|
||||
|
||||
it('筛选项把 error 这一档的两个可能读法都点名(选了要能筛到无可用通道的行)', async () => {
|
||||
const wrapper = await mountWith(busyRow())
|
||||
const options = wrapper.findAll('.secrets-filter-row select')[0].findAll('option').map((option) => option.text().trim())
|
||||
const options = optionLabels(wrapper, '筛选密钥状态')
|
||||
expect(options).toContain('无法判定/可重试')
|
||||
expect(options).not.toContain('无法判定')
|
||||
})
|
||||
@@ -249,7 +267,7 @@ describe('密钥管理页:检测结果按 check_code 分档渲染', () => {
|
||||
secretsApi.checkUserSecret.mockResolvedValue([
|
||||
{ moduleKey: 'proxy', checkStatus: 'error', checkCode: 'channel_busy', checkMessage: BUSY_MESSAGE, checkLatencyMs: 30, checkedAt: '2026-11-02T15:51:07', viaProxy: false },
|
||||
])
|
||||
const wrapper = mount(UserSecretsPage, { global: { plugins: [pinia] } })
|
||||
const wrapper = mount(UserSecretsPage, { global: { plugins: [pinia, ...EL_PLUGINS] } })
|
||||
await flushPromises()
|
||||
const checkButton = wrapper.findAll('button').find((button) => button.text().trim() === '立即检测')
|
||||
expect(checkButton, '行内应有「立即检测」入口').toBeDefined()
|
||||
|
||||
@@ -19,7 +19,14 @@ const messageMock = vi.hoisted(() => ({ success: vi.fn() }))
|
||||
vi.mock('@/pages/records/workbench-client-api.ts', () => api)
|
||||
vi.mock('@/components/admin-confirm', () => ({ openAdminConfirm: confirmMock }))
|
||||
vi.mock('@/components/admin-feedback-ui', () => ({ showAdminFeedback: feedbackMock }))
|
||||
vi.mock('element-plus', () => ({ ElMessage: messageMock }))
|
||||
// 整包 mock element-plus 时,凡被挂载树里其它组件「局部 import」的 EP 组件都要一并给桩:
|
||||
// OldPagination 2026-11-17 起用 ElSelect/ElOption 渲染每页条数下拉,缺桩会
|
||||
// 让 render 拿到 undefined 抛 shapeFlag 错(本文件曾因此红)。样式与弹层不参与本页断言。
|
||||
vi.mock('element-plus', () => ({
|
||||
ElMessage: messageMock,
|
||||
ElSelect: { name: 'ElSelect', render: () => null },
|
||||
ElOption: { name: 'ElOption', render: () => null },
|
||||
}))
|
||||
|
||||
const SHA = 'c'.repeat(64)
|
||||
const row = {
|
||||
|
||||
Reference in New Issue
Block a user