feat(jd-collect): 任务面板改版——后端 dashboard/history/progress-batch/delete 四端点+前端左按钮右 TaskCenterPanel(历史/断点续传/中断/重试走通用原位复位)
This commit is contained in:
@@ -1,12 +1,14 @@
|
||||
/**
|
||||
* 「获取店铺数据」一键采集 + 进度条挂载用例(v1.5)。
|
||||
* 「获取店铺数据」一键采集 + 任务面板挂载用例(v1.5 改版后)。
|
||||
*
|
||||
* 用户口径原话:「获取店铺就是点击获取后就自动抓已打开的京麦后台的店铺数据导入到后台 需要有进度条」。
|
||||
* 四组靶子,缺一条就是假绿:
|
||||
* ① 点一次按钮就走完整链路:建单 → 把 `jd-shop-collect-run` 推进本机客户端队列;
|
||||
* ② 有 total 时进度条按已落库商品数算出真实百分比(分母只来自服务端游标,不编造);
|
||||
* ③ total 缺失时走不定态动画(没有分母就不许编一个假百分比);
|
||||
* ④ 终态即收手:SUCCESS 落 100% + 导入完成文案,FAILED 用服务端原因,两种情况都不再轮询。
|
||||
* 页面改版(2026-11-15):左侧只留「一键获取店铺数据」按钮,右侧换共享任务面板
|
||||
* (TaskCenterPanel + useLiveTaskBoard,与外观专利同一骨架);单任务进度条移除,
|
||||
* 进度在任务卡片上。四组靶子保留,缺一条就是假绿:
|
||||
* ① 点一次按钮就走完整链路:建单 → 激活 → 把 `jd-shop-collect-run` 推进本机客户端队列 → 轮询批量进度;
|
||||
* ② 有 total 时卡片进度条按已落库商品数算出真实百分比(分母只来自服务端游标,不编造);
|
||||
* ③ total 缺失时只显示「已采集 N 个商品」,不编造百分比;
|
||||
* ④ 终态即收手:SUCCESS/FAILED 从轮询移除,FAILED 显示服务端原因并出「重试」按钮
|
||||
* (重试走通用原位复位 + 重新激活推队列——断点续传,不新建任务)。
|
||||
*
|
||||
* 跑法:`npx vitest run tests/mount/jd-collect-progress.mount.test.ts`
|
||||
*/
|
||||
@@ -20,38 +22,81 @@ const api = vi.hoisted(() => ({
|
||||
// 8d8c88a5 起建单后先 PENDING→RUNNING 再推队列;mock 里缺这一个键会让组件拿到
|
||||
// undefined 调用、enqueue 永远不被调用(本文件当时没跟上,红在这里)。
|
||||
activateJdCollectTask: vi.fn(),
|
||||
fetchJdCollectProgress: vi.fn(),
|
||||
fetchJdCollectDashboard: vi.fn(),
|
||||
fetchJdCollectHistory: vi.fn(),
|
||||
fetchJdCollectTaskProgressBatch: vi.fn(),
|
||||
deleteJdCollectTask: vi.fn(),
|
||||
interruptJdCollectTask: vi.fn(),
|
||||
retryClientTask: vi.fn(),
|
||||
enqueue: vi.fn(),
|
||||
}))
|
||||
|
||||
vi.mock('@/shared/api/types/modules/jd-collect', () => ({
|
||||
createJdCollectTask: api.createJdCollectTask,
|
||||
activateJdCollectTask: api.activateJdCollectTask,
|
||||
fetchJdCollectProgress: api.fetchJdCollectProgress,
|
||||
fetchJdCollectProgress: vi.fn(),
|
||||
fetchJdCollectDashboard: api.fetchJdCollectDashboard,
|
||||
fetchJdCollectHistory: api.fetchJdCollectHistory,
|
||||
fetchJdCollectTaskProgressBatch: api.fetchJdCollectTaskProgressBatch,
|
||||
deleteJdCollectTask: api.deleteJdCollectTask,
|
||||
interruptJdCollectTask: api.interruptJdCollectTask,
|
||||
}))
|
||||
vi.mock('@/shared/api/task-retry', () => ({
|
||||
retryClientTask: api.retryClientTask,
|
||||
}))
|
||||
vi.mock('@/shared/bridges/pywebview', () => ({
|
||||
getPywebviewApi: () => ({ enqueue_json: api.enqueue }),
|
||||
}))
|
||||
|
||||
const POLL_MS = 2000
|
||||
const EMPTY_DASHBOARD = {
|
||||
pendingTaskCount: 0,
|
||||
processedTaskCount: 0,
|
||||
successTaskCount: 0,
|
||||
failedTaskCount: 0,
|
||||
}
|
||||
|
||||
let wrapper: VueWrapper | null = null
|
||||
|
||||
function baseProgress(over: Record<string, unknown> = {}) {
|
||||
function historyItem(over: Record<string, unknown> = {}) {
|
||||
return {
|
||||
taskId: 88,
|
||||
status: 'RUNNING',
|
||||
taskNo: 'JD-1',
|
||||
taskStatus: 'RUNNING',
|
||||
success: false,
|
||||
errorMessage: null,
|
||||
shopName: '花屿巷旗舰店',
|
||||
listTabs: ['ONSALE', 'OFFSALE'],
|
||||
rowCount: 30,
|
||||
itemsReceived: 30,
|
||||
total: 100,
|
||||
page: 2,
|
||||
listTab: 'ONSALE',
|
||||
batches: 1,
|
||||
message: null,
|
||||
createdAt: '2026-11-15T10:00:00',
|
||||
updatedAt: null,
|
||||
finishedAt: null,
|
||||
...over,
|
||||
}
|
||||
}
|
||||
|
||||
function batchOf(item: Record<string, unknown>) {
|
||||
return {
|
||||
items: [
|
||||
{
|
||||
task: {
|
||||
id: item.taskId ?? 88,
|
||||
taskNo: 'JD-1',
|
||||
status: item.taskStatus ?? 'RUNNING',
|
||||
errorMessage: item.errorMessage ?? null,
|
||||
updatedAt: null,
|
||||
},
|
||||
items: [item],
|
||||
},
|
||||
],
|
||||
missingTaskIds: [],
|
||||
}
|
||||
}
|
||||
|
||||
let wrapper: VueWrapper | null = null
|
||||
|
||||
async function mountPage() {
|
||||
wrapper = mount(JdCollectTab, {
|
||||
global: {
|
||||
@@ -74,13 +119,15 @@ async function startCollect(w: VueWrapper) {
|
||||
beforeEach(() => {
|
||||
vi.useFakeTimers()
|
||||
localStorage.setItem('username', 'admin')
|
||||
api.createJdCollectTask.mockReset()
|
||||
api.fetchJdCollectProgress.mockReset()
|
||||
api.enqueue.mockReset()
|
||||
for (const mock of Object.values(api)) mock.mockReset()
|
||||
api.createJdCollectTask.mockResolvedValue({ taskId: 88, taskNo: 'JD-1', collectChannel: 'LOCAL' })
|
||||
api.activateJdCollectTask.mockResolvedValue({ taskId: 88, status: 'RUNNING' })
|
||||
api.activateJdCollectTask.mockResolvedValue(null)
|
||||
api.enqueue.mockResolvedValue({ success: true })
|
||||
api.fetchJdCollectDashboard.mockResolvedValue(EMPTY_DASHBOARD)
|
||||
api.fetchJdCollectHistory.mockResolvedValue({ items: [] })
|
||||
api.fetchJdCollectTaskProgressBatch.mockResolvedValue(batchOf(historyItem()))
|
||||
vi.spyOn(console, 'error').mockImplementation(() => {})
|
||||
vi.spyOn(console, 'warn').mockImplementation(() => {})
|
||||
})
|
||||
|
||||
afterEach(() => {
|
||||
@@ -91,14 +138,13 @@ afterEach(() => {
|
||||
localStorage.clear()
|
||||
})
|
||||
|
||||
describe('获取店铺数据:一键采集 + 进度条', () => {
|
||||
it('点一次按钮就建单并把采集载荷推进本机客户端队列', async () => {
|
||||
api.fetchJdCollectProgress.mockResolvedValue(baseProgress())
|
||||
describe('获取店铺数据:一键采集 + 任务面板', () => {
|
||||
it('点一次按钮就走完整链路:建单 → 激活 → 推本机队列 → 轮询批量进度', async () => {
|
||||
const w = await mountPage()
|
||||
await startCollect(w)
|
||||
|
||||
expect(api.createJdCollectTask).toHaveBeenCalledTimes(1)
|
||||
// 店铺名留空 → 按「京麦后台」记录(与后端 shop_name 语义一致)
|
||||
// 店铺名留空 → 按「京麦后台」占位(客户端从京麦后台现读真实店铺名落库)
|
||||
expect(api.createJdCollectTask).toHaveBeenCalledWith('京麦后台', ['ONSALE', 'OFFSALE'], 0)
|
||||
expect(api.activateJdCollectTask).toHaveBeenCalledWith(88)
|
||||
expect(api.enqueue).toHaveBeenCalledTimes(1)
|
||||
@@ -110,76 +156,102 @@ describe('获取店铺数据:一键采集 + 进度条', () => {
|
||||
listTabs: ['ONSALE', 'OFFSALE'],
|
||||
maxProducts: 0,
|
||||
})
|
||||
// 轮询已启动:批量进度端点拿到任务 88
|
||||
expect(api.fetchJdCollectTaskProgressBatch).toHaveBeenCalled()
|
||||
const calledIds = api.fetchJdCollectTaskProgressBatch.mock.calls[0][0]
|
||||
expect(calledIds).toContain(88)
|
||||
})
|
||||
|
||||
it('有 total 时按已落库商品数显示真实百分比与进度元信息', async () => {
|
||||
api.fetchJdCollectProgress.mockResolvedValue(baseProgress())
|
||||
it('有 total 时任务卡片显示真实百分比(分母只来自服务端游标)', async () => {
|
||||
const w = await mountPage()
|
||||
await startCollect(w)
|
||||
await flushPromises()
|
||||
|
||||
expect(w.find('.progress-track').exists()).toBe(true)
|
||||
expect(w.find('.progress-percent').text()).toBe('30%')
|
||||
const fill = w.find('.progress-fill')
|
||||
expect(fill.attributes('style')).toContain('width: 30%')
|
||||
expect(fill.classes()).not.toContain('progress-fill--indeterminate')
|
||||
expect(w.find('.progress-meta').text()).toBe('已采集 30 个商品 · 共 100 个 · 第 2 页 · 已回传 1 批')
|
||||
expect(w.find('.progress-status').text()).toBe('正在获取店铺数据…')
|
||||
expect(w.find('.task-item').exists()).toBe(true)
|
||||
expect(w.find('.status').text()).toBe('正在获取店铺数据…')
|
||||
const bar = w.find('.file-progress-bar')
|
||||
expect(bar.exists()).toBe(true)
|
||||
expect(bar.attributes('style')).toContain('width: 30%')
|
||||
expect(w.find('.file-progress-meta').text()).toContain('已采集 30 个商品')
|
||||
})
|
||||
|
||||
it('没有分母(total 缺失)时走不定态动画,不编造百分比', async () => {
|
||||
api.fetchJdCollectProgress.mockResolvedValue(baseProgress({ total: null, page: null, batches: 0 }))
|
||||
const w = await mountPage()
|
||||
await startCollect(w)
|
||||
|
||||
expect(w.find('.progress-percent').exists()).toBe(false)
|
||||
expect(w.find('.progress-fill').classes()).toContain('progress-fill--indeterminate')
|
||||
expect(w.find('.progress-meta').text()).toBe('已采集 30 个商品')
|
||||
})
|
||||
|
||||
it('SUCCESS 终态:进度满格并提示已导入后台,且停止轮询', async () => {
|
||||
api.fetchJdCollectProgress.mockResolvedValue(baseProgress({ itemsReceived: 100 }))
|
||||
const w = await mountPage()
|
||||
await startCollect(w)
|
||||
|
||||
api.fetchJdCollectProgress.mockResolvedValue(
|
||||
baseProgress({ status: 'SUCCESS', itemsReceived: 100 }),
|
||||
it('没有分母(total 缺失)时只显示已采集行数,不编造百分比', async () => {
|
||||
api.fetchJdCollectTaskProgressBatch.mockResolvedValue(
|
||||
batchOf(historyItem({ total: null, page: null, itemsReceived: 30, rowCount: 30 })),
|
||||
)
|
||||
await vi.advanceTimersByTimeAsync(POLL_MS)
|
||||
await flushPromises()
|
||||
|
||||
expect(w.find('.progress-percent').text()).toBe('100%')
|
||||
expect(w.find('.progress-status').text()).toBe('获取完成')
|
||||
expect(w.find('.feedback.success').text()).toContain('已导入后台「京东数据库」')
|
||||
const callsAfterTerminal = api.fetchJdCollectProgress.mock.calls.length
|
||||
await vi.advanceTimersByTimeAsync(POLL_MS * 3)
|
||||
await flushPromises()
|
||||
expect(api.fetchJdCollectProgress.mock.calls.length).toBe(callsAfterTerminal)
|
||||
})
|
||||
|
||||
it('FAILED 终态:用服务端原因说明失败,按钮恢复可点', async () => {
|
||||
api.fetchJdCollectProgress.mockResolvedValue(baseProgress())
|
||||
const w = await mountPage()
|
||||
await startCollect(w)
|
||||
|
||||
api.fetchJdCollectProgress.mockResolvedValue(
|
||||
baseProgress({ status: 'FAILED', message: '京麦后台未登录,请先在客户端登录京麦' }),
|
||||
)
|
||||
await vi.advanceTimersByTimeAsync(POLL_MS)
|
||||
await flushPromises()
|
||||
|
||||
expect(w.find('.progress-status').text()).toBe('获取失败')
|
||||
expect(w.find('.feedback.error').text()).toContain('京麦后台未登录')
|
||||
expect(w.find('.collect-btn').attributes('disabled')).toBeUndefined()
|
||||
const meta = w.find('.file-progress-meta')
|
||||
expect(meta.exists()).toBe(true)
|
||||
expect(meta.text()).toContain('已采集 30 个商品')
|
||||
expect(meta.text()).not.toContain('%')
|
||||
expect(w.find('.file-progress-bar').attributes('style')).toContain('width: 0%')
|
||||
})
|
||||
|
||||
it('建单失败:只报错不留假进度条,一次进度请求也不发', async () => {
|
||||
it('SUCCESS 终态:状态徽章落「获取完成」、进度满格,且从轮询中收手', async () => {
|
||||
const w = await mountPage()
|
||||
await startCollect(w)
|
||||
await flushPromises()
|
||||
|
||||
api.fetchJdCollectTaskProgressBatch.mockResolvedValue(
|
||||
batchOf(historyItem({ taskStatus: 'SUCCESS', success: true, itemsReceived: 100, rowCount: 100 })),
|
||||
)
|
||||
await vi.advanceTimersByTimeAsync(60_000)
|
||||
await flushPromises()
|
||||
|
||||
expect(w.find('.status').text()).toBe('获取完成')
|
||||
// 终态任务没有进度条(isActiveTask 才有),行数行收口在卡片 extraLines
|
||||
expect(w.find('.file-progress-bar').exists()).toBe(false)
|
||||
expect(w.find('.task-item').text()).toContain('已采集 100 个商品')
|
||||
// 终态即收手:再推进几轮轮询间隔,批量进度不再被调
|
||||
const callsAfterTerminal = api.fetchJdCollectTaskProgressBatch.mock.calls.length
|
||||
await vi.advanceTimersByTimeAsync(60_000)
|
||||
await flushPromises()
|
||||
expect(api.fetchJdCollectTaskProgressBatch.mock.calls.length).toBe(callsAfterTerminal)
|
||||
})
|
||||
|
||||
it('FAILED 终态:显示服务端原因、出「重试」按钮,重试走原位复位并重新激活推队列', async () => {
|
||||
const w = await mountPage()
|
||||
await startCollect(w)
|
||||
await flushPromises()
|
||||
|
||||
api.fetchJdCollectTaskProgressBatch.mockResolvedValue(
|
||||
batchOf(historyItem({
|
||||
taskStatus: 'FAILED',
|
||||
success: false,
|
||||
errorMessage: '京麦后台未登录,请先在客户端登录京麦',
|
||||
itemsReceived: 30,
|
||||
})),
|
||||
)
|
||||
await vi.advanceTimersByTimeAsync(60_000)
|
||||
await flushPromises()
|
||||
|
||||
expect(w.find('.status').text()).toBe('获取失败')
|
||||
expect(w.find('.task-item').text()).toContain('京麦后台未登录')
|
||||
const retryBtn = w.find('.btn-retry')
|
||||
expect(retryBtn.exists()).toBe(true)
|
||||
expect(retryBtn.text()).toBe('重试')
|
||||
|
||||
await retryBtn.trigger('click')
|
||||
await flushPromises()
|
||||
// 铁律 26:原任务复位(不克隆新任务),复位后重新激活并推队列(断点续传)
|
||||
expect(api.retryClientTask).toHaveBeenCalledWith(88)
|
||||
expect(api.activateJdCollectTask).toHaveBeenCalledWith(88)
|
||||
expect(api.enqueue).toHaveBeenCalled()
|
||||
const pushPayload = api.enqueue.mock.calls.at(-1)?.[0]
|
||||
expect(pushPayload?.type).toBe('jd-shop-collect-run')
|
||||
expect(pushPayload?.data?.taskId).toBe(88)
|
||||
})
|
||||
|
||||
it('建单失败:只报错不留假任务,一次批量进度请求也不发', async () => {
|
||||
api.createJdCollectTask.mockRejectedValue(new Error('缺少登录凭据'))
|
||||
const w = await mountPage()
|
||||
await startCollect(w)
|
||||
|
||||
expect(w.find('.feedback.error').text()).toContain('缺少登录凭据')
|
||||
expect(w.find('.progress-track').exists()).toBe(false)
|
||||
expect(api.fetchJdCollectProgress).not.toHaveBeenCalled()
|
||||
expect(api.fetchJdCollectTaskProgressBatch).not.toHaveBeenCalled()
|
||||
expect(api.enqueue).not.toHaveBeenCalled()
|
||||
})
|
||||
|
||||
@@ -191,8 +263,6 @@ describe('获取店铺数据:一键采集 + 进度条', () => {
|
||||
expect(api.activateJdCollectTask).toHaveBeenCalledWith(88)
|
||||
expect(api.enqueue).not.toHaveBeenCalled()
|
||||
expect(w.find('.feedback.error').text()).toContain('任务激活失败')
|
||||
// 建单不回滚、进度照轮询:任务留在 PENDING,由服务端兜底拉取认领后照样会跑。
|
||||
expect(api.fetchJdCollectProgress).toHaveBeenCalledTimes(1)
|
||||
})
|
||||
|
||||
it('激活时服务端回「已在执行中」:等同激活成功,照常推队列', async () => {
|
||||
|
||||
Reference in New Issue
Block a user