From 974d0c77d000b072306fd782a643683c90a8c0ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Fri, 9 Oct 2026 17:52:08 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E7=BB=93=E6=9E=9C=E6=96=87=E4=BB=B6):=20?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=8F=AF=E4=B8=8B=E8=BD=BD=E5=B0=B1=E4=B8=8D?= =?UTF-8?q?=E5=88=A4"=E7=BB=93=E6=9E=9C=E7=94=9F=E6=88=90=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5"=E2=80=94=E2=80=94=E4=B8=A4=E9=A1=B5=E5=85=B1?= =?UTF-8?q?=E7=94=A8=E4=B8=80=E6=9D=A1=E5=88=A4=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 货源查询任务 30456 结果文件已生成、下载按钮可用,但徽标仍按 fileStatus=FAILED 判红。前端加一条:能下载就不算生成失败。判据抽到 task-status-text.resultBuildFailed, 货源查询与外观专利两个 tab 同用一个出口,外观专利 statusText 里"整体失败优先于 生成失败"的 carve-out 由用例盯住不得回流。 --- .../components/BrandAppearancePatentTab.vue | 4 +- .../brand/components/BrandSimilarAsinTab.vue | 4 +- .../src/shared/utils/task-status-text.ts | 12 ++++ ...ult-build-failed-when-downloadable.test.ts | 59 +++++++++++++++++++ 4 files changed, 75 insertions(+), 4 deletions(-) create mode 100644 frontend-vue/tests/result-build-failed-when-downloadable.test.ts diff --git a/frontend-vue/src/pages/brand/components/BrandAppearancePatentTab.vue b/frontend-vue/src/pages/brand/components/BrandAppearancePatentTab.vue index 746463310..f7a86150f 100644 --- a/frontend-vue/src/pages/brand/components/BrandAppearancePatentTab.vue +++ b/frontend-vue/src/pages/brand/components/BrandAppearancePatentTab.vue @@ -100,7 +100,7 @@ import { createRowsVersionTracker } from '@/shared/api/task-progress-polling.ts' import { checkParseResult } from '@/shared/dispatch-guard' import { passGuard } from '@/shared/dispatch-guard-ui' import { formatDateTime } from '@/shared/utils/datetime' -import { taskStatusClass, taskStatusText } from '@/shared/utils/task-status-text' +import { resultBuildFailed, taskStatusClass, taskStatusText } from '@/shared/utils/task-status-text' import { getStoredApiSecret } from '@/shared/utils/api-secret-store' // ---- 文件选择 / 上传(公共组合式函数)---- @@ -285,7 +285,7 @@ function normalizeTaskStatus(item: AppearancePatentHistoryItem) { } function isResultBuildFailed(item: AppearancePatentHistoryItem) { - return (item.fileStatus || '').toUpperCase() === 'FAILED' + return resultBuildFailed(item.fileStatus, canDownload(item)) } function pendingResultHint(item: AppearancePatentHistoryItem) { diff --git a/frontend-vue/src/pages/brand/components/BrandSimilarAsinTab.vue b/frontend-vue/src/pages/brand/components/BrandSimilarAsinTab.vue index 573c3e608..baed49dda 100644 --- a/frontend-vue/src/pages/brand/components/BrandSimilarAsinTab.vue +++ b/frontend-vue/src/pages/brand/components/BrandSimilarAsinTab.vue @@ -145,7 +145,7 @@ import { } from '@/shared/dispatch-guard' import { passGuard } from '@/shared/dispatch-guard-ui' import { formatDateTime } from '@/shared/utils/datetime' -import { taskStatusClass, taskStatusText } from '@/shared/utils/task-status-text' +import { resultBuildFailed, taskStatusClass, taskStatusText } from '@/shared/utils/task-status-text' import { getStoredApiSecret } from '@/shared/utils/api-secret-store' // ---- 文件选择 / 上传(公共组合式函数)---- @@ -336,7 +336,7 @@ function normalizeTaskStatus(item: SimilarAsinHistoryItem) { } function isResultBuildFailed(item: SimilarAsinHistoryItem) { - return (item.fileStatus || '').toUpperCase() === 'FAILED' + return resultBuildFailed(item.fileStatus, canDownload(item)) } function pendingResultHint(item: SimilarAsinHistoryItem) { diff --git a/frontend-vue/src/shared/utils/task-status-text.ts b/frontend-vue/src/shared/utils/task-status-text.ts index f41eb51e3..6b6f2a7ee 100644 --- a/frontend-vue/src/shared/utils/task-status-text.ts +++ b/frontend-vue/src/shared/utils/task-status-text.ts @@ -85,3 +85,15 @@ export const RUNNING_UNTIL_DONE_STATUS_OPTIONS: TaskStatusOptions = { textFallback: '执行中', classFallback: 'running', }; + +/** + * 结果文件作业是否算"生成失败"——文件已经能下载就不算。 + * + * 作业行可能因一次多余的重试被改红,而结果文件其实已经生成好了: + * 2026-10-09 任务 30456 就是任务与结果行都是 SUCCESS、xlsx 可下载, + * `biz_task_file_job` 却是 FAILED,界面于是同时出现"结果生成失败"红徽章和可用的下载按钮。 + */ +export function resultBuildFailed(fileStatus?: string | null, downloadable = false): boolean { + if (downloadable) return false; + return (fileStatus || '').toUpperCase() === 'FAILED'; +} diff --git a/frontend-vue/tests/result-build-failed-when-downloadable.test.ts b/frontend-vue/tests/result-build-failed-when-downloadable.test.ts new file mode 100644 index 000000000..2d7328b3c --- /dev/null +++ b/frontend-vue/tests/result-build-failed-when-downloadable.test.ts @@ -0,0 +1,59 @@ +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 { resultBuildFailed } 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-09 任务 30456:任务与结果行都是 SUCCESS、xlsx 能下载, +// 结果文件作业行却因一次多余的重试被改成 FAILED。界面不能同时给红徽章和可用下载键。 +test('文件已经能下载就不判结果生成失败', () => { + assert.equal(resultBuildFailed('FAILED', true), false) + assert.equal(resultBuildFailed('failed', true), false) +}) + +test('文件还没出来时作业 FAILED 仍然判失败', () => { + assert.equal(resultBuildFailed('FAILED', false), true) + assert.equal(resultBuildFailed('failed'), true, '缺省参数与大小写都要照旧判失败') +}) + +test('其它作业状态一律不算失败', () => { + assert.equal(resultBuildFailed('SUCCESS', false), false) + assert.equal(resultBuildFailed('RUNNING', true), false) + assert.equal(resultBuildFailed(undefined, false), false) + assert.equal(resultBuildFailed('', false), false) +}) + +for (const tab of ['BrandSimilarAsinTab', 'BrandAppearancePatentTab']) { + test(`${tab} 的判失败必须走这条规则并带上可下载判据`, () => { + const body = bodyOf(tabSource(tab), 'isResultBuildFailed') + assert.match(body, /resultBuildFailed\(item\.fileStatus, canDownload\(item\)\)/, + '必须把"文件可下载"传进判据,否则作业行假红还会盖住成功的任务') + assert.ok(!body.includes("(item.fileStatus || '').toUpperCase() === 'FAILED'"), + '不许退回只看 fileStatus 的老写法') + }) +} + +// 外观专利页有一条与货源查询相反的历史决定(2026-09-28,任务 29473/29479): +// 心跳判死的任务始终显示失败,后台把文件补出来了也不能改口成"结果生成中/成功"。 +// 上面那条"可下载就不判失败"不许把这条覆盖掉——FAILED 分支必须仍然排在最前。 +test('外观专利:任务已判死时,文件出现也不改失败口径', () => { + const body = bodyOf(tabSource('BrandAppearancePatentTab'), 'statusText') + const failedIdx = body.indexOf("status === 'FAILED'") + const buildFailedIdx = body.indexOf('isResultBuildFailed(item)') + assert.ok(failedIdx >= 0, 'statusText 缺少 FAILED 分支') + assert.ok(buildFailedIdx >= 0, 'statusText 缺少 isResultBuildFailed 分支') + assert.ok(failedIdx < buildFailedIdx, 'FAILED 必须先于作业级判定分支,否则判死任务会因文件出现改口') +})