feat(appearance-patent): 外观专利数据库主管列+导出+分组筛选——后管只读页补「所属主管」读侧现算列(owner 是主管取自己、普通账户取创建人,铁律 30 读不到不猜名)、GET /export 与分页共用同一过滤面与正门出 xlsx(SXSSF,上限 5 万行超限拒)、分组筛选 group_id 按 selectUserIdsByGroupId 解析「组长本人+名下子账户」整集 SQL 下推(铁律 20,选项复用既有 GET /shop-manages/groups 不下新端点);前端加主管列/分组下拉/导出按钮(blob 落盘+业务错误信封解包),wiring 护栏补导出发送口钉与 watch token(25 处发送口);棘轮 1073→1074 一枚记名,「无侵权」白名单登记导出上限文案
This commit is contained in:
@@ -16,22 +16,25 @@ import assert from 'node:assert/strict'
|
||||
import {
|
||||
APPEARANCE_PATENT_CLEAN_MAX_PAGE,
|
||||
createAppearancePatentCleanFilterState,
|
||||
toAppearancePatentCleanExportParams,
|
||||
toAppearancePatentCleanListParams,
|
||||
} from '../src/pages/patent/appearance-patent-clean-filter.ts'
|
||||
|
||||
test('AC-5 筛选参数——snake page/page_size/task_id/asin/country/start_date/end_date 形状', () => {
|
||||
test('AC-5 筛选参数——snake page/page_size/task_id/asin/country/group_id/start_date/end_date 形状', () => {
|
||||
const full = toAppearancePatentCleanListParams(
|
||||
{ taskId: '33179', asin: ' B0AB8CDEF9 ', country: 'DE', startDate: '2026-11-01', endDate: '2026-11-09' },
|
||||
{ taskId: '33179', asin: ' B0AB8CDEF9 ', country: 'DE', groupId: ' 7 ', startDate: '2026-11-01', endDate: '2026-11-09' },
|
||||
2,
|
||||
20,
|
||||
)
|
||||
// snake 逐字对撞后端 §3.2;ASIN 前后空白被构造器剥掉(后端服务侧再 trim 一次是双保险)。
|
||||
// 分组(主管=组长,2026-11-11 客户口径「就是分组」):group_id 下发,选中行是分组管理里那一行。
|
||||
assert.deepEqual(full, {
|
||||
page: 2,
|
||||
page_size: 20,
|
||||
task_id: 33179,
|
||||
asin: 'B0AB8CDEF9',
|
||||
country: 'DE',
|
||||
group_id: 7,
|
||||
start_date: '2026-11-01',
|
||||
end_date: '2026-11-09',
|
||||
})
|
||||
@@ -40,12 +43,13 @@ test('AC-5 筛选参数——snake page/page_size/task_id/asin/country/start_dat
|
||||
const blank = toAppearancePatentCleanListParams(createAppearancePatentCleanFilterState(), 1, 10)
|
||||
assert.deepEqual(blank, { page: 1, page_size: 10 })
|
||||
const dirty = toAppearancePatentCleanListParams(
|
||||
{ taskId: 'abc', asin: ' ', country: '', startDate: '2026/11/01', endDate: 'not-a-date' },
|
||||
{ taskId: 'abc', asin: ' ', country: '', groupId: 'abc', startDate: '2026/11/01', endDate: 'not-a-date' },
|
||||
1,
|
||||
10,
|
||||
)
|
||||
assert.deepEqual(dirty, { page: 1, page_size: 10 })
|
||||
assert.equal('task_id' in dirty, false, '非数字任务号不下发')
|
||||
assert.equal('group_id' in dirty, false, '非数字分组 id 不下发')
|
||||
assert.equal('start_date' in dirty, false, '非法日期不下发')
|
||||
})
|
||||
|
||||
@@ -65,3 +69,31 @@ test('AC-5 筛选参数——page 钳制防 (page-1)*page_size 溢出(铁律 1
|
||||
assert.equal(Number.isSafeInteger(offset), true, `(page-1)*page_size=${offset} 必须留在安全整数域`)
|
||||
assert.equal(offset, 999_900)
|
||||
})
|
||||
|
||||
test('导出参数——与列表同一过滤面单出口(无分页,空白/非法值不下发)', () => {
|
||||
// 同一过滤态下导出与列表的过滤面字段逐字同源(防「页签筛了公司、导出全量」的两处各算各的)。
|
||||
const state = { taskId: '33179', asin: ' B0AB8CDEF9 ', country: 'de', groupId: '7', startDate: '2026-11-01', endDate: '' }
|
||||
const list = toAppearancePatentCleanListParams(state, 3, 20)
|
||||
const exp = toAppearancePatentCleanExportParams(state)
|
||||
for (const key of Object.keys(exp) as Array<keyof typeof exp>) {
|
||||
assert.equal((list as Record<string, unknown>)[key], exp[key], `导出与列表的 ${key} 必须同源`)
|
||||
}
|
||||
assert.equal('page' in exp, false, '导出参数无分页(全量导出由服务侧上限兜住)')
|
||||
assert.deepEqual(exp, {
|
||||
task_id: 33179,
|
||||
asin: 'B0AB8CDEF9',
|
||||
country: 'de',
|
||||
group_id: 7,
|
||||
start_date: '2026-11-01',
|
||||
})
|
||||
|
||||
// 全空态零字段;非法日期与非数字任务号/分组同列表口径不下发。
|
||||
assert.deepEqual(toAppearancePatentCleanExportParams(createAppearancePatentCleanFilterState()), {})
|
||||
assert.deepEqual(
|
||||
toAppearancePatentCleanExportParams(
|
||||
{ taskId: 'abc', asin: ' ', country: '', groupId: 'abc', startDate: '2026/11/01', endDate: 'not-a-date' },
|
||||
),
|
||||
{},
|
||||
'脏值不下发,与列表参数归一规则逐字同源',
|
||||
)
|
||||
})
|
||||
|
||||
@@ -70,12 +70,12 @@ function escapeRegExp(text: string): string {
|
||||
}
|
||||
|
||||
/**
|
||||
* 全部 24 个字面发送口:批次 1 的任务看板 5 处 + 批次 2(控制方 2026-10-05 点名「切 tab 数据还一样」那五页)7 处
|
||||
* 全部 25 个字面发送口:批次 1 的任务看板 5 处 + 批次 2(控制方 2026-10-05 点名「切 tab 数据还一样」那五页)7 处
|
||||
* + 批次 3(控制方 2026-10-05 点名「店铺撞款监控 店铺数据也要做隔离」那两页)4 处
|
||||
* + 批次 4(控制方 2026-10-05 点名「菜单权限和用户管理也要区分公司 tab 的数据」里的用户管理)1 处
|
||||
* + 批次 5(控制方 2026-10-06 点名「店铺密钥管理的数据按照公司区分」)1 处
|
||||
* + 批次 6(控制方 2026-10-06 点名「菜单权限也加字段来区分」)3 处:菜单目录 / 新建菜单 / 用户管理里的授权树
|
||||
* + 批次 7(2026-11-10 v1.3 外观专利无侵权数据)1 处:只读列表。
|
||||
* + 批次 7(2026-11-10 v1.3 外观专利无侵权数据)2 处:只读列表 + 导出(2026-11-11 客户需求「数据得导出来」)。
|
||||
* 批次 2 原 12 处里的品牌库 1 处 + 商品类目 4 处,随 2026-10-06「这两页退回全平台共享」一并摘掉。
|
||||
*
|
||||
* <p>`window` 的取法:本轮实扫的 own(到自己那行的距离)+ ≥150 余量,且当同文件还有下一个同名发送口时必须
|
||||
@@ -124,8 +124,12 @@ const SEND_POINTS: ReadonlyArray<SendPoint> = [
|
||||
{ menuKey: 'admin_columns', file: 'src/pages/account/menu-manage-api.ts', fn: 'createMenu', line: TASK_CENTER_SEND_LINE, window: 300, title: 'POST /permission-menus 新建:归属由端点参数决定,前端不从树里猜' },
|
||||
{ menuKey: 'admin_users', file: 'src/pages/account/user-menu-auth-api.ts', fn: 'fetchGrantableMenus', line: TASK_CENTER_SEND_LINE, window: 300, title: 'GET /permission-menus?grantableOnly 授权树:一家一套树后取错公司=已授权勾不上、提交必判无效' },
|
||||
// ↓ 批次 7(2026-11-10 v1.3 外观专利无侵权数据):出表成功自动同步的只读明细,归属物化在行
|
||||
// company_id 列(V189,同店铺密钥形状)⇒ 后端正门 readCompanyIdOrOwn;这一页只有一个发送口。
|
||||
{ menuKey: 'admin_appearance_patent_clean_items', file: 'src/pages/patent/appearance-patent-clean-api.ts', fn: 'fetchAppearancePatentCleanList', line: 'if (params.companyId != null) query.company_id = params.companyId', window: 400, title: 'GET /appearance-patent-clean-items 无侵权只读列表' },
|
||||
// company_id 列(V189,同店铺密钥形状)⇒ 后端正门 readCompanyIdOrOwn;2026-11-11 客户需求
|
||||
// 「数据得导出来」补导出发送口(与列表共用同一过滤面与正门),这一页共两个发送口。
|
||||
// 窗口 500:两处 own 实测 416/395(groupId 行加入后),同文件两条塞键行的间距 1585 ⇒
|
||||
// 500 够得着自己、够不到隔壁(对平用例逐处从真文件重算,注释过期即红)。
|
||||
{ menuKey: 'admin_appearance_patent_clean_items', file: 'src/pages/patent/appearance-patent-clean-api.ts', fn: 'fetchAppearancePatentCleanList', line: 'if (params.companyId != null) query.company_id = params.companyId', window: 500, title: 'GET /appearance-patent-clean-items 无侵权只读列表' },
|
||||
{ menuKey: 'admin_appearance_patent_clean_items', file: 'src/pages/patent/appearance-patent-clean-api.ts', fn: 'exportAppearancePatentCleanList', line: 'if (params.companyId != null) query.company_id = params.companyId', window: 500, title: 'GET /appearance-patent-clean-items/export 导出(2026-11-11 客户需求「数据得导出来」,与列表共用同一过滤面)' },
|
||||
]
|
||||
|
||||
/** 任务看板那 5 处(1b ④ 那条用例按文件筛它们,沿用旧名字不漂;表只有一份,不会漂出两个口径)。 */
|
||||
@@ -348,7 +352,7 @@ test('正向:声明 companyScoped 的页,其 api 文件必须真的带 company
|
||||
// 批次 2 原 12 条里的品牌库 1 条 + 商品类目 4 条随 2026-10-06「这两页退回全平台共享」摘掉)。
|
||||
// 这条只防"整表被摘空/被改窄",逐处脱管由下面两条(对平闸门 + 窗口对平)负责。
|
||||
assert.ok(SEND_POINTS.length >= 21,
|
||||
`发送口表只剩 ${SEND_POINTS.length} 条(批次 1+2+3+4+5+6 实扫 21 条 + 批次 7 v1.3 无侵权只读页 1 条 = 24 条)⇒ 有人把钉从表里摘了,取值口看守成空`)
|
||||
`发送口表只剩 ${SEND_POINTS.length} 条(批次 1+2+3+4+5+6 实扫 21 条 + 批次 7 v1.3 无侵权只读页与导出 2 条 = 25 条)⇒ 有人把钉从表里摘了,取值口看守成空`)
|
||||
for (const p of SEND_POINTS) {
|
||||
const shape = pointShape(p)
|
||||
const compliant = pointCompliant(p)
|
||||
@@ -381,7 +385,7 @@ test('正向:声明 companyScoped 的页,其 api 文件必须真的带 company
|
||||
else grouped.set(key, { file: p.file, line: p.line, pinned: 1 })
|
||||
}
|
||||
assert.equal(grouped.size, 19,
|
||||
`发送口表按 (文件, 整行) 应聚成 19 组(24 处发送口,批次 7 再落 1 处),现在却有 ${grouped.size} 组 —— 表被改形状了,对平判据失去分母`)
|
||||
`发送口表按 (文件, 整行) 应聚成 19 组(25 处发送口,批次 7 的列表与导出逐字同行走同一组),现在却有 ${grouped.size} 组 —— 表被改形状了,对平判据失去分母`)
|
||||
for (const g of grouped.values()) {
|
||||
const actual = occurrences(stripComments(read(g.file)), g.line)
|
||||
assert.equal(g.pinned, actual,
|
||||
@@ -725,11 +729,14 @@ const WATCH_BODY_PINS: ReadonlyArray<{
|
||||
},
|
||||
// ↓ 批次 7(2026-11-10 v1.3 无侵权只读页):任务号/ASIN 是自由文本筛选,上一家填的值在新一家的
|
||||
// 行集里筛不出东西 ⇒ 首屏「暂无无侵权数据」而输入框里还显示着那个值;页码回 1 同理。
|
||||
// 2026-11-11 分组筛选(主管=组长,就是分组)落地:分组选项集是公司隔离的(GET /shop-manages/groups
|
||||
// 带 company_id),上一家选的 groupId 在新一家的选项集里不存在 ⇒ 同罪必清,选项也按新公司重取。
|
||||
{
|
||||
file: 'src/pages/patent/AppearancePatentCleanItemsPage.vue',
|
||||
token: "filter.taskId = ''; filter.asin = ''; page.value = 1; void load()",
|
||||
token: "filter.taskId = ''; filter.asin = ''; filter.groupId = ''; page.value = 1; void loadGroupOptions(); void load()",
|
||||
why: '任务号/ASIN 是按行集筛的自由文本,上一家的值在新一家的行里不存在 ⇒ 切 tab 后首屏被筛成「暂无无侵权数据」,'
|
||||
+ '而输入框还显示着上一家填的值;页码回 1 是因为新一家的行数更少,末尾的 void load() 才让切 tab 真的换数据',
|
||||
+ '而输入框还显示着上一家填的值;分组(主管)选项集是公司隔离的,上一家选的 groupId 在新一家的选项里不存在,'
|
||||
+ '同罪必清且选项重取;页码回 1 是因为新一家的行数更少,末尾的 void load() 才让切 tab 真的换数据',
|
||||
premise: [
|
||||
{ file: 'src/pages/patent/appearance-patent-clean-api.ts', shapes: [/company_id\s*=\s*params\.companyId\b/] },
|
||||
],
|
||||
|
||||
@@ -26,6 +26,8 @@ const MENU_KEY = 'admin_appearance_patent_clean_items'
|
||||
|
||||
const cleanApi = vi.hoisted(() => ({
|
||||
fetchAppearancePatentCleanList: vi.fn(),
|
||||
exportAppearancePatentCleanList: vi.fn(),
|
||||
fetchDedupeTotalGroups: vi.fn(),
|
||||
}))
|
||||
|
||||
vi.mock('@/pages/patent/appearance-patent-clean-api.ts', () => cleanApi)
|
||||
@@ -36,6 +38,7 @@ function row(id: number, over: Record<string, unknown> = {}) {
|
||||
resultId: 900 + id,
|
||||
taskId: 33179,
|
||||
userId: 7,
|
||||
supervisorName: `主管${id}`,
|
||||
companyId: 1,
|
||||
rowNo: id,
|
||||
asin: `B0AB8CDEF${id}`,
|
||||
@@ -64,6 +67,8 @@ beforeEach(() => {
|
||||
setActivePinia(pinia)
|
||||
useAdminSessionStore().user = { id: 1, username: 'root', role: 'super_admin' }
|
||||
useCompanyTabStore().setActiveId(1)
|
||||
// 分组(主管)选项默认空集:分组用例各自覆写
|
||||
cleanApi.fetchDedupeTotalGroups.mockResolvedValue([])
|
||||
})
|
||||
|
||||
async function mountWith(payload: unknown): Promise<VueWrapper<Element>> {
|
||||
@@ -109,6 +114,79 @@ describe('AC-5 外观专利无侵权数据页(分页列表,参照去重数
|
||||
expect(wrapper.text()).toContain('无侵权')
|
||||
})
|
||||
|
||||
it('主管列(2026-11-11 客户需求):表头就位,行值展示 supervisorName,读不到展示 -', async () => {
|
||||
const wrapper = await mountWith({
|
||||
items: [row(1, { supervisorName: '主管甲' }), row(2, { supervisorName: '' })],
|
||||
total: 2,
|
||||
page: 1,
|
||||
pageSize: 10,
|
||||
})
|
||||
const headers = wrapper.findAll('thead th').map((th) => th.text())
|
||||
expect(headers).toContain('所属主管')
|
||||
expect(headers.indexOf('所属主管')).toBe(headers.indexOf('任务号') + 1, '主管列紧跟任务号之后')
|
||||
const firstRowCells = wrapper.findAll('tbody tr')[0].findAll('td')
|
||||
expect(firstRowCells[headers.indexOf('所属主管')].text()).toBe('主管甲')
|
||||
const secondRowCells = wrapper.findAll('tbody tr')[1].findAll('td')
|
||||
expect(secondRowCells[headers.indexOf('所属主管')].text()).toBe('-', '读不到主管不猜名字,展示 -')
|
||||
})
|
||||
|
||||
it('导出按钮带当前过滤面与公司 tab 调导出接口,成功触发 blob 落盘', async () => {
|
||||
const createObjectURL = vi.fn(() => 'blob:mock-url')
|
||||
const revokeObjectURL = vi.fn()
|
||||
const urlRecord = URL as unknown as Record<string, unknown>
|
||||
const origCreate = urlRecord.createObjectURL
|
||||
const origRevoke = urlRecord.revokeObjectURL
|
||||
Object.defineProperty(URL, 'createObjectURL', { value: createObjectURL, configurable: true, writable: true })
|
||||
Object.defineProperty(URL, 'revokeObjectURL', { value: revokeObjectURL, configurable: true, writable: true })
|
||||
const clickSpy = vi.spyOn(HTMLAnchorElement.prototype, 'click').mockImplementation(() => {})
|
||||
cleanApi.exportAppearancePatentCleanList.mockImplementation(() =>
|
||||
Promise.resolve({ blob: new Blob(['xlsx'], { type: 'application/vnd.ms-excel' }), filename: '外观专利数据库-20261111103000.xlsx' }),
|
||||
)
|
||||
|
||||
try {
|
||||
const wrapper = await mountWith({ items: [row(1)], total: 1, page: 1, pageSize: 10 })
|
||||
const textInputs = wrapper.findAll('input[type="text"]')
|
||||
await textInputs[0].setValue('33179')
|
||||
const exportBtn = wrapper.findAll('button').find((b) => b.text() === '导出')
|
||||
expect(exportBtn).toBeTruthy()
|
||||
await exportBtn!.trigger('click')
|
||||
await flushPromises()
|
||||
await flushPromises()
|
||||
|
||||
expect(cleanApi.exportAppearancePatentCleanList).toHaveBeenCalledTimes(1)
|
||||
const call = cleanApi.exportAppearancePatentCleanList.mock.calls[0][0]
|
||||
expect(call).toMatchObject({
|
||||
taskId: '33179',
|
||||
asin: '',
|
||||
country: '',
|
||||
groupId: '',
|
||||
startDate: '',
|
||||
endDate: '',
|
||||
companyId: 1,
|
||||
})
|
||||
expect(createObjectURL).toHaveBeenCalledTimes(1)
|
||||
expect(revokeObjectURL).toHaveBeenCalledWith('blob:mock-url')
|
||||
expect(clickSpy).toHaveBeenCalled()
|
||||
expect(document.body.textContent).toContain('已导出', '成功反馈点名落盘文件')
|
||||
} finally {
|
||||
Object.defineProperty(URL, 'createObjectURL', { value: origCreate, configurable: true })
|
||||
Object.defineProperty(URL, 'revokeObjectURL', { value: origRevoke, configurable: true })
|
||||
clickSpy.mockRestore()
|
||||
}
|
||||
})
|
||||
|
||||
it('导出失败把服务端业务文案弹出来,不许静默', async () => {
|
||||
cleanApi.exportAppearancePatentCleanList.mockImplementation(() =>
|
||||
Promise.reject(new Error('无侵权数据共 90001 行,超过导出上限 50000 行,请缩小筛选范围后重试')))
|
||||
const wrapper = await mountWith({ items: [], total: 0, page: 1, pageSize: 10 })
|
||||
await wrapper.findAll('button').find((b) => b.text() === '导出')!.trigger('click')
|
||||
await flushPromises()
|
||||
await flushPromises()
|
||||
expect(document.body.textContent).toContain('超过导出上限', '失败反馈必须是服务端那句可读文案')
|
||||
// 失败后导出锁复位,按钮可再次点击
|
||||
expect(wrapper.findAll('button').find((b) => b.text() === '导出')!.text()).toBe('导出')
|
||||
})
|
||||
|
||||
it('翻页与改每页条数都重发请求,改条数回第一页', async () => {
|
||||
const wrapper = await mountWith({ items: [row(11)], total: 42, page: 2, pageSize: 10 })
|
||||
|
||||
@@ -143,12 +221,36 @@ describe('AC-5 外观专利无侵权数据页(分页列表,参照去重数
|
||||
taskId: '33179',
|
||||
asin: 'B0AB8CDEF1',
|
||||
country: 'DE',
|
||||
groupId: '',
|
||||
startDate: '2026-11-01',
|
||||
endDate: '2026-11-09',
|
||||
page: 1,
|
||||
})
|
||||
})
|
||||
|
||||
it('分组下拉(主管=组长):选项与去重页同源,选中后 groupId 进列表请求', async () => {
|
||||
cleanApi.fetchDedupeTotalGroups.mockResolvedValue([
|
||||
{ id: 7, name: '甲组', leaderUserId: 9 },
|
||||
{ id: 8, name: '乙组', leaderUserId: 10 },
|
||||
])
|
||||
const wrapper = await mountWith({ items: [], total: 0, page: 1, pageSize: 10 })
|
||||
|
||||
// 选项取数走的是公司隔离的同一分组集(GET /shop-manages/groups 的适配层)
|
||||
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('甲组')
|
||||
expect(optionTexts).toContain('乙组')
|
||||
|
||||
await groupSelect.setValue('7')
|
||||
await wrapper.findAll('button').find((b) => b.text() === '查询')!.trigger('click')
|
||||
await flushPromises()
|
||||
const last = cleanApi.fetchAppearancePatentCleanList.mock.calls.at(-1)![0]
|
||||
expect(last.groupId).toBe('7', '选中的分组 id 以 groupId 进列表过滤面(服务端解析组长+名下整集)')
|
||||
})
|
||||
|
||||
it('空态与加载失败条(失败给重试,不把整页打死)', async () => {
|
||||
const empty = await mountWith({ items: [], total: 0, page: 1, pageSize: 10 })
|
||||
const thCount = empty.findAll('thead th').length
|
||||
@@ -166,9 +268,13 @@ describe('AC-5 外观专利无侵权数据页(分页列表,参照去重数
|
||||
})
|
||||
|
||||
it('切公司 Tab 重取并清掉上一家的筛选(company-tab-wiring 同口径)', async () => {
|
||||
cleanApi.fetchDedupeTotalGroups.mockResolvedValue([{ id: 7, name: '甲组', leaderUserId: 9 }])
|
||||
const wrapper = await mountWith({ items: [row(1)], total: 1, page: 1, pageSize: 10 })
|
||||
const textInputs = wrapper.findAll('input[type="text"]')
|
||||
await textInputs[0].setValue('33179')
|
||||
// 选上上一家公司的分组:切走后必须连同 groupId 一起清(分组的成员集是公司隔离的)
|
||||
const groupSelect = wrapper.findAll('select')[1]
|
||||
await groupSelect.setValue('7')
|
||||
const callsAfterMount = cleanApi.fetchAppearancePatentCleanList.mock.calls.length
|
||||
|
||||
useCompanyTabStore().setActiveId(2)
|
||||
@@ -179,6 +285,9 @@ describe('AC-5 外观专利无侵权数据页(分页列表,参照去重数
|
||||
const last = cleanApi.fetchAppearancePatentCleanList.mock.calls.at(-1)![0]
|
||||
expect(last.companyId).toBe(2)
|
||||
expect(last.taskId).toBe('', '切公司必须清掉上一家填的任务号')
|
||||
expect(last.groupId).toBe('', '切公司必须清掉上一家选的分组')
|
||||
expect(last.page).toBe(1)
|
||||
// 分组选项按新公司重取(选项集公司隔离)
|
||||
expect(cleanApi.fetchDedupeTotalGroups).toHaveBeenLastCalledWith(2)
|
||||
})
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user