From aa7e17f95c2d89c332670ae4fc077b8cf2c667fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Thu, 22 Oct 2026 15:48:44 +0800 Subject: [PATCH] =?UTF-8?q?feat(task-board):=20=E6=89=8B=E5=8A=A8=E5=88=B7?= =?UTF-8?q?=E6=96=B0=E9=93=BA=E6=BB=A1=E5=85=A8=E9=83=A8=2016=20=E4=B8=AA?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E9=9D=A2=E6=9D=BF=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 用户点名「只要是任务的功能都要加上」:TaskCenterPanel 的 on-refresh 按各自骨架接线 ——useLiveTaskBoard 两页强拉 history+dashboard+进度;手写 fetch 五页 allSettled (history+dashboard+refreshTaskBatch);useHistoryPolling 三页 refreshTaskViews+活跃进度; useTaskProgressLoop 两页加 progressLoop.refreshOnce;一次性拉取三页直挂各自 load 函数; 品牌检测复用既有 syncTasksAndResumePolling。接线守卫测试扩到 16 页。 --- .../pages/brand/components/BrandBrandTab.vue | 1 + .../brand/components/BrandCollectDataTab.vue | 6 ++++++ .../pages/brand/components/BrandConvertTab.vue | 1 + .../pages/brand/components/BrandDedupeTab.vue | 1 + .../brand/components/BrandDeleteBrandTab.vue | 6 ++++++ .../brand/components/BrandPatrolDeleteTab.vue | 7 +++++++ .../brand/components/BrandPriceTrackTab.vue | 6 ++++++ .../brand/components/BrandProductRiskTab.vue | 6 ++++++ .../pages/brand/components/BrandPublishTab.vue | 6 ++++++ .../brand/components/BrandQueryAsinTab.vue | 7 +++++++ .../brand/components/BrandShopDataCrawlTab.vue | 7 +++++++ .../brand/components/BrandShopMatchTab.vue | 6 ++++++ .../pages/brand/components/BrandSplitTab.vue | 1 + .../pages/brand/components/BrandWithdrawTab.vue | 7 +++++++ .../tests/task-board-poll-resilience.test.ts | 17 ++++++++++++++++- 15 files changed, 84 insertions(+), 1 deletion(-) diff --git a/frontend-vue/src/pages/brand/components/BrandBrandTab.vue b/frontend-vue/src/pages/brand/components/BrandBrandTab.vue index 4c4e620e9..052d1dd2f 100644 --- a/frontend-vue/src/pages/brand/components/BrandBrandTab.vue +++ b/frontend-vue/src/pages/brand/components/BrandBrandTab.vue @@ -63,6 +63,7 @@ id > 0) if (!ids.length) return diff --git a/frontend-vue/src/pages/brand/components/BrandProductRiskTab.vue b/frontend-vue/src/pages/brand/components/BrandProductRiskTab.vue index cf092275f..112e1d5e7 100644 --- a/frontend-vue/src/pages/brand/components/BrandProductRiskTab.vue +++ b/frontend-vue/src/pages/brand/components/BrandProductRiskTab.vue @@ -89,6 +89,7 @@
id > 0) if (!ids.length) return diff --git a/frontend-vue/src/pages/brand/components/BrandPublishTab.vue b/frontend-vue/src/pages/brand/components/BrandPublishTab.vue index 3fca2a5e2..74c2b0216 100644 --- a/frontend-vue/src/pages/brand/components/BrandPublishTab.vue +++ b/frontend-vue/src/pages/brand/components/BrandPublishTab.vue @@ -82,6 +82,7 @@
withQueryAsinFallback(item)); } +/** 手动刷新:强拉历史 + 统计 + 活跃任务进度(轮询意外中断后的自救出口) */ +async function refreshBoard() { + await refreshTaskViews() + await refreshActiveTaskProgress() +} + async function refreshTaskViews() { await Promise.all([loadDashboard(), loadHistory()]); } diff --git a/frontend-vue/src/pages/brand/components/BrandShopDataCrawlTab.vue b/frontend-vue/src/pages/brand/components/BrandShopDataCrawlTab.vue index 34536b711..e691ad0ee 100644 --- a/frontend-vue/src/pages/brand/components/BrandShopDataCrawlTab.vue +++ b/frontend-vue/src/pages/brand/components/BrandShopDataCrawlTab.vue @@ -70,6 +70,7 @@
!item.taskId && !item.resultId && item.taskStatus === 'FAILED') historyItems.value = [...localFailures, ...((await getShopDataCrawlHistory()).items || [])] } +/** 手动刷新:强拉历史 + 统计 + 活跃任务进度(轮询意外中断后的自救出口) */ +async function refreshBoard() { + await refreshViews() + if (activeTaskId.value) await refreshTaskProgress(activeTaskId.value) +} + async function refreshViews() { await Promise.all([loadDashboard(), loadHistory()]) } async function confirmAdd() { diff --git a/frontend-vue/src/pages/brand/components/BrandShopMatchTab.vue b/frontend-vue/src/pages/brand/components/BrandShopMatchTab.vue index f30db06c4..913292431 100644 --- a/frontend-vue/src/pages/brand/components/BrandShopMatchTab.vue +++ b/frontend-vue/src/pages/brand/components/BrandShopMatchTab.vue @@ -69,6 +69,7 @@
message.includes(pattern.toLowerCase())) } async function withTransientRetry(action: () => Promise, onRetry: (attempt: number, maxAttempts: number) => void, maxAttempts = 10) { let attempt = 0; while (true) { if (disposed) throw new Error('component disposed'); try { return await action() } catch (error) { attempt += 1; if (!isTransientBackendError(error) || attempt >= maxAttempts) throw error; onRetry(attempt, maxAttempts); await sleep(getPollIntervalMs()) } } } +/** 手动刷新:强拉历史 + 统计 + 当前轮询任务进度(轮询意外中断后的自救出口) */ +async function refreshBoard() { + await Promise.allSettled([loadHistory(), loadDashboard(), refreshTaskBatch()]) +} + async function refreshTaskBatch() { if (!pollingTaskIds.value.length) return { settledTaskIds: [] as number[] }; try { // F5:主轮询只读 status 等轻量白名单字段,走 light 端点减小响应体;轻量异常/空结果时回退重型 batch(否则会漏刷新结果) const batch = await getPollingProgressBatch('shopMatch', pollingTaskIds.value, { fallback: () => getShopMatchTaskProgressBatch(pollingTaskIds.value) }); const nextSnapshots = { ...taskSnapshots.value }; const settledTaskIds = new Set(); for (const missingId of batch.missingTaskIds || []) { removeTaskLocally(missingId); delete nextSnapshots[missingId]; settledTaskIds.add(missingId) } for (const detail of batch.items || []) { const taskId = detail.task?.id; if (!taskId) continue; const prev = nextSnapshots[taskId]; nextSnapshots[taskId] = prev ? { ...prev, task: { ...(prev.task || {}), ...(detail.task || {}) } } : detail; const status = detail.task?.status || ''; if (!status) continue; taskDetails.value[taskId] = status; if (isTaskTerminalStatus(status)) { removePollingTask(taskId); settledTaskIds.add(taskId); continue } if (status === 'SCHEDULED') { stopPollingTask(taskId); settledTaskIds.add(taskId) } } taskSnapshots.value = nextSnapshots; triggerRef(taskSnapshots); saveTaskSnapshotsToStorage(); saveTaskDetailsToStorage(); restoreScheduledDispatches(); return { settledTaskIds: Array.from(settledTaskIds) } } catch { return { settledTaskIds: [] as number[] } } } function getPollIntervalMs() { return getTaskPollIntervalMs() } diff --git a/frontend-vue/src/pages/brand/components/BrandSplitTab.vue b/frontend-vue/src/pages/brand/components/BrandSplitTab.vue index 5e3a2db73..364ea2914 100644 --- a/frontend-vue/src/pages/brand/components/BrandSplitTab.vue +++ b/frontend-vue/src/pages/brand/components/BrandSplitTab.vue @@ -93,6 +93,7 @@
withWithdrawFallback(item)); } +/** 手动刷新:强拉历史 + 统计 + 活跃任务进度(轮询意外中断后的自救出口) */ +async function refreshBoard() { + await refreshTaskViews() + await refreshActiveTaskProgress() +} + async function refreshTaskViews() { await Promise.all([loadDashboard(), loadHistory()]); } diff --git a/frontend-vue/tests/task-board-poll-resilience.test.ts b/frontend-vue/tests/task-board-poll-resilience.test.ts index 06a78cc73..87f0075d0 100644 --- a/frontend-vue/tests/task-board-poll-resilience.test.ts +++ b/frontend-vue/tests/task-board-poll-resilience.test.ts @@ -37,7 +37,22 @@ test('轮询异常必须吞掉并重试,propagate 模式不得回流', () => { '轮询成功后必须清零失败计数,否则一次抖动会把间隔永久拉长') }) -test('两个任务面板页都接了手动刷新', () => { +test('全部任务面板页都接了手动刷新(用户点名:只要是任务的功能都要有)', () => { + const PANELS_DIR = join(ROOT, 'src/pages/brand/components') + const PAGES = [ + 'BrandAppearancePatentTab.vue', 'BrandSimilarAsinTab.vue', 'BrandShopMatchTab.vue', + 'BrandProductRiskTab.vue', 'BrandCollectDataTab.vue', 'BrandPriceTrackTab.vue', + 'BrandQueryAsinTab.vue', 'BrandPatrolDeleteTab.vue', 'BrandDeleteBrandTab.vue', + 'BrandShopDataCrawlTab.vue', 'BrandPublishTab.vue', 'BrandWithdrawTab.vue', + 'BrandSplitTab.vue', 'BrandDedupeTab.vue', 'BrandConvertTab.vue', 'BrandBrandTab.vue', + ] + for (const page of PAGES) { + const source = readFileSync(join(PANELS_DIR, page), 'utf8') + assert.ok(source.includes(':on-refresh="'), `${page} 没有给 TaskCenterPanel 传 on-refresh`) + } +}) + +test('两个 live 任务面板页的 refreshBoard 实现符合骨架契约', () => { for (const [rel, name] of [[PATENT, '外观专利'], [SIMILAR, '货源查询']] as const) { const source = sourceOf(rel) assert.ok(source.includes(':on-refresh="refreshBoard"'), `${name} 页没有给 TaskCenterPanel 传 on-refresh`)