diff --git a/frontend-vue/src/pages/brand/components/BrandSimilarAsinTab.vue b/frontend-vue/src/pages/brand/components/BrandSimilarAsinTab.vue index 7bc6acf18..a69ed0b89 100644 --- a/frontend-vue/src/pages/brand/components/BrandSimilarAsinTab.vue +++ b/frontend-vue/src/pages/brand/components/BrandSimilarAsinTab.vue @@ -146,7 +146,7 @@ import { } from '@/shared/dispatch-guard' import { passGuard } from '@/shared/dispatch-guard-ui' import { formatDateTime } from '@/shared/utils/datetime' -import { resultBuildFailed, taskStatusClass, taskStatusText } from '@/shared/utils/task-status-text' +import { isCompletedTask, resultBuildFailed, taskStatusClass, taskStatusText } from '@/shared/utils/task-status-text' import { getStoredApiSecret } from '@/shared/utils/api-secret-store' // ---- 文件选择 / 上传(公共组合式函数)---- @@ -305,19 +305,20 @@ function toAsinTaskView(item: SimilarAsinHistoryItem): TaskItemView { function statusText(item: SimilarAsinHistoryItem) { const status = normalizeTaskStatus(item) + if (status === 'FAILED') return taskStatusText('FAILED') if (status === 'RUNNING') return taskStatusText(status) if (status === 'PENDING') return taskStatusText(status, { text: { PENDING: '已解析待启动' } }) if (isResultPreparing(item)) return '结果生成中' if (isResultBuildFailed(item)) return '结果生成失败' - if (status === 'SUCCESS' || item.success) return taskStatusText('SUCCESS') - return status === 'FAILED' ? taskStatusText('FAILED') : '等待中' + if (isCompletedTask(status)) return taskStatusText('SUCCESS') + return '等待中' } function statusClass(item: SimilarAsinHistoryItem) { const status = normalizeTaskStatus(item) + if (status === 'FAILED' || isResultBuildFailed(item)) return taskStatusClass('FAILED') if (status === 'RUNNING' || isResultPreparing(item)) return taskStatusClass('RUNNING') - if (isResultBuildFailed(item) || status === 'FAILED') return taskStatusClass('FAILED') - if (status === 'SUCCESS' || item.success) return taskStatusClass('SUCCESS') + if (isCompletedTask(status)) return taskStatusClass('SUCCESS') return 'pending' } diff --git a/frontend-vue/src/shared/utils/task-status-text.ts b/frontend-vue/src/shared/utils/task-status-text.ts index 8429c31f6..87d7b4590 100644 --- a/frontend-vue/src/shared/utils/task-status-text.ts +++ b/frontend-vue/src/shared/utils/task-status-text.ts @@ -124,3 +124,15 @@ export function resultBuildFailed(fileStatus?: string | null, downloadable = fal if (downloadable) return false; return (fileStatus || '').toUpperCase() === 'FAILED'; } + +/** + * 任务行终态是否算「已完成」——结果行的 success 位不参与判定。 + * + * `biz_file_result.success` 是 `NOT NULL DEFAULT 1` 的列:解析建行那一刻就是 1,只有走正常收尾才回写。 + * 而通用兜底判死只 UPDATE `biz_file_task`,不碰这一列,于是被心跳超时判死的任务它仍是 1。 + * 2026-10-16 任务 31060(客户端只回传 51/510 分片、结果文件从未生成)就是这样显示成「已完成」的。 + */ +export function isCompletedTask(taskStatus?: string | null): boolean { + const key = normalizeStatusKey(taskStatus); + return key === 'SUCCESS' || key === 'COMPLETED'; +} diff --git a/frontend-vue/tests/similar-asin-fake-completed.test.ts b/frontend-vue/tests/similar-asin-fake-completed.test.ts new file mode 100644 index 000000000..915e1fa3b --- /dev/null +++ b/frontend-vue/tests/similar-asin-fake-completed.test.ts @@ -0,0 +1,56 @@ +import { test } from 'node:test' +import assert from 'node:assert/strict' +import { readFileSync } from 'node:fs' +import { fileURLToPath } from 'node:url' +import { resolve, dirname } from 'node:path' +import { isCompletedTask } from '../src/shared/utils/task-status-text.ts' + +const here = dirname(fileURLToPath(import.meta.url)) + +function tabSource(name: string): string { + return readFileSync(resolve(here, `../src/pages/brand/components/${name}.vue`), 'utf-8') +} + +function bodyOf(source: string, name: string): string { + const match = source.match(new RegExp(`function ${name}\\([\\s\\S]*?\\n\\}`)) + assert.ok(match, `找不到函数 ${name}`) + return match[0] +} + +// 2026-10-16 任务 31060:biz_file_task 已被通用兜底判死(status=FAILED,「任务心跳超时,已自动失败」), +// 客户端只回传了 51/510 个分片,结果文件从未生成。历史列表却显示「已完成」—— +// 因为 biz_file_result.success 是 `NOT NULL DEFAULT 1` 的列,解析建行那一刻就是 1, +// 只有走正常收尾才会回写;兜底判死只 UPDATE biz_file_task,不碰这一列。 +// 前端 `if (status === 'SUCCESS' || item.success)` 于是被这一位单独点亮。 +test('已完成只认任务行终态,结果行的 success 位不参与判定', () => { + assert.equal(isCompletedTask('SUCCESS'), true) + assert.equal(isCompletedTask('COMPLETED'), true) + assert.equal(isCompletedTask('success'), true, '大小写不敏感') + assert.equal(isCompletedTask('FAILED'), false, '任务已判死时不得算完成') + assert.equal(isCompletedTask('RUNNING'), false) + assert.equal(isCompletedTask('PENDING'), false) + assert.equal(isCompletedTask(null), false, '任务行缺失时不得凭结果行默认位算完成') + assert.equal(isCompletedTask(undefined), false) + assert.equal(isCompletedTask(''), false) +}) + +// 外观专利页的同型缺陷已由 appearance-patent-failed-status.test.ts 用「FAILED 分支排在最前」钉住, +// 本次只动货源查询页,不去改另一页的历史口径。 +const source = tabSource('BrandSimilarAsinTab') + +test('BrandSimilarAsinTab 的 statusText 必须先判 FAILED,再谈已完成', () => { + const body = bodyOf(source, 'statusText') + const failedIdx = body.indexOf("status === 'FAILED'") + const completedIdx = body.indexOf('isCompletedTask(status)') + assert.ok(failedIdx >= 0, 'statusText 缺少 FAILED 分支') + assert.ok(completedIdx >= 0, 'statusText 必须走 isCompletedTask 判定已完成') + assert.ok(failedIdx < completedIdx, 'FAILED 排在已完成之后时,判死任务会被别的结果位翻案') +}) + +test('BrandSimilarAsinTab 不得再用结果行的 success 位单独点亮已完成', () => { + for (const fn of ['statusText', 'statusClass']) { + const body = bodyOf(source, fn) + assert.ok(!/\|\|\s*item\.success/.test(body), + `${fn} 里 || item.success 就是 31060 假绿灯的短路:biz_file_result.success 默认 1,判死任务不回写`) + } +})