diff --git a/frontend-vue/src/shared/composables/useLiveTaskBoard.ts b/frontend-vue/src/shared/composables/useLiveTaskBoard.ts index 8c66b7ed8..731ea5458 100644 --- a/frontend-vue/src/shared/composables/useLiveTaskBoard.ts +++ b/frontend-vue/src/shared/composables/useLiveTaskBoard.ts @@ -6,6 +6,8 @@ import { createCategorizedTimers } from '../utils/categorized-timers.ts' import { saveUrlWithProgress } from '../utils/download-progress.ts' import { runBatchDelete } from '../utils/batch-delete.ts' import { isTerminalTaskStatus } from '../utils/task-terminal.ts' +import { resolveTaskDeleteTarget } from '../utils/task-delete-target.ts' +import { isRecordMissingError } from '../utils/task-queue-state.ts' import { confirmTaskDeletion } from '../task-delete-confirm.ts' import type { TaskItemView } from '../components/tasks/types' @@ -638,31 +640,49 @@ export function useLiveTaskBoard( } } - async function deleteTaskRecord(item: T) { - if (!(await confirmTaskDeletion(item))) return + async function deleteTaskRecord(item: T, opts: { skipConfirm?: boolean } = {}) { + if (!opts.skipConfirm && !(await confirmTaskDeletion(item))) return + const deleteOptions = options.deleteTask try { const status = normalizeTaskStatus(item) - const deleteOptions = options.deleteTask - if (deleteOptions && deleteOptions.shouldDeleteTask(item, status)) { - await deleteOptions.deleteTask(item.taskId as number) - deleteOptions.onTaskDeleted?.(item) - } else if (item.resultId && deleteOptions) { - await deleteOptions.deleteHistory(item.resultId) - deleteOptions.onHistoryDeleted?.(item) + const target = resolveTaskDeleteTarget({ + hasDeleteOptions: Boolean(deleteOptions), + taskId: item.taskId, + resultId: item.resultId, + shouldDeleteTask: Boolean(deleteOptions && deleteOptions.shouldDeleteTask(item, status)), + }) + if (target === 'task') { + await deleteOptions!.deleteTask(item.taskId as number) + deleteOptions!.onTaskDeleted?.(item) + } else if (target === 'history') { + await deleteOptions!.deleteHistory(item.resultId as number) + deleteOptions!.onHistoryDeleted?.(item) + } else { + // 没有任务也没有结果标识:宁可报错也不能假报「已删除」把用户挡在死胡同里 + throw new Error('该记录缺少任务/结果标识,无法删除,请刷新后重试') } await loadDashboard() await loadHistory({ force: true }) ElMessage.success('已删除') } catch (e) { + if (isRecordMissingError(e)) { + // 记录已被别处删掉(多标签/多端):本地同步移除并刷新,别让「记录不存在」被当成删除失败 + if (item.taskId != null) deleteOptions?.onTaskDeleted?.(item) + await loadDashboard().catch(() => undefined) + await loadHistory({ force: true }).catch(() => undefined) + ElMessage.success('记录已不存在,已同步移除本地记录') + return + } ElMessage.error(e instanceof Error ? e.message : '删除失败') } } /** - * 历史记录批量删除:复用单条删除逻辑(删除后原函数各自刷新列表) + * 历史记录批量删除:复用单条删除逻辑(删除后原函数各自刷新列表)。 + * 批量入口已经弹过一次确认,逐条不再重复弹框。 */ async function batchDeleteHistory(views: TaskItemView[]) { - const { total, failed } = await runBatchDelete(views, (view) => deleteTaskRecord(view.source as T)) + const { total, failed } = await runBatchDelete(views, (view) => deleteTaskRecord(view.source as T, { skipConfirm: true })) if (!total) return if (failed > 0) { ElMessage.warning(`删除完成,${failed} 条失败`) diff --git a/frontend-vue/src/shared/utils/task-delete-target.ts b/frontend-vue/src/shared/utils/task-delete-target.ts new file mode 100644 index 000000000..95f7639e7 --- /dev/null +++ b/frontend-vue/src/shared/utils/task-delete-target.ts @@ -0,0 +1,26 @@ +/** + * 任务/历史记录删除的目标判定(纯函数,供 useLiveTaskBoard 与各 Tab 共用)。 + * + * 背景(2026-10-29 现网):外观专利只有 RUNNING 才走「删任务」,其余只删结果行。 + * 失败任务一旦被自动克隆重试(克隆件没有结果行),列表里既删不掉那条任务, + * 批量删除时还会静默跳过、只弹「已删除」——用户看到的就是「删不了」。 + * 这里把判定收成三条:能删任务就删任务(整条记录含统计与重试链), + * 没有任务才回退删结果行,两者都没有必须显式失败,不允许假成功。 + */ +export type TaskDeleteTarget = 'task' | 'history' | 'none' + +export interface TaskDeleteTargetInput { + /** options.deleteTask 是否配置(未配置的看板只能回退删结果行) */ + hasDeleteOptions: boolean + taskId?: number | null + resultId?: number | null + /** 调用方对「这一条该不该删任务」的判定结果(各 Tab 口径不同) */ + shouldDeleteTask: boolean +} + +export function resolveTaskDeleteTarget(input: TaskDeleteTargetInput): TaskDeleteTarget { + if (!input.hasDeleteOptions) return 'none' + if (input.taskId != null && input.shouldDeleteTask) return 'task' + if (input.resultId != null) return 'history' + return 'none' +} diff --git a/frontend-vue/tests/appearance-patent-task-delete.test.ts b/frontend-vue/tests/appearance-patent-task-delete.test.ts new file mode 100644 index 000000000..fe53aa45b --- /dev/null +++ b/frontend-vue/tests/appearance-patent-task-delete.test.ts @@ -0,0 +1,77 @@ +/** + * 外观专利删除链路的守卫(2026-10-29 现网「删不了」)。 + * + * 现网证据:失败任务被自动克隆重试后(克隆件复制源结果行、开始时间逐字相同、 + * 后几代克隆连结果行都没有),旧口径只给 RUNNING 删任务、其余只删结果行—— + * 没有结果行的任务在列表里既没有删除按钮,批量全选删到它也静默跳过只弹「已删除」, + * 用户看到的就是「删不了」。这与巡店删除页已经收敛的正确口径不一致。 + * + * 这里钉住四件事: + * ①外观专利改为「有任务就删任务」,不再用 RUNNING 当门; + * ②历史行只要有任务/结果标识就出删除按钮; + * ③缺标识必须显式报错,不允许假报「已删除」; + * ④批量删除只弹一次确认,不再逐条二次弹框。 + * + * 跑法:`node --test tests/appearance-patent-task-delete.test.ts` + */ +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' + +const here = dirname(fileURLToPath(import.meta.url)) +const tabSource = readFileSync( + resolve(here, '../src/pages/brand/components/BrandAppearancePatentTab.vue'), + 'utf-8', +) +const boardSource = readFileSync( + resolve(here, '../src/shared/composables/useLiveTaskBoard.ts'), + 'utf-8', +) + +function slot(name: string): string { + const match = tabSource.match( + new RegExp(``), + ) + assert.ok(match, `找不到 #${name} 插槽`) + return match[1] +} + +test('外观专利删任务不再限定 RUNNING:有 taskId 就删任务', () => { + const match = tabSource.match(/shouldDeleteTask:\s*\(item\)\s*=>\s*([^,\n]+),/) + assert.ok(match, '找不到 shouldDeleteTask 谓词') + assert.match(match[1], /item\.taskId\s*!=\s*null/, '谓词必须认 taskId') + assert.doesNotMatch(match[1], /RUNNING/, '用 RUNNING 当门会让失败/克隆任务永远删不掉') +}) + +test('历史行有任务或结果标识就要出删除按钮(克隆件没有结果行)', () => { + const history = slot('history-item-actions') + assert.match( + history, + /v-if="itemSource\(item\)\.taskId \|\| itemSource\(item\)\.resultId"/, + '只按 resultId 出按钮时,没有结果行的任务在列表里无法删除', + ) +}) + +test('缺标识必须报错而不是假报已删除', () => { + assert.match(boardSource, /resolveTaskDeleteTarget\(/, '删除目标必须走统一判定') + assert.match( + boardSource, + /throw new Error\('该记录缺少任务\/结果标识/, + 'none 分支必须抛错,否则点击删除既不请求也不报错,用户以为删掉了', + ) +}) + +test('记录已不存在时自愈:同步移除本地记录而不是报删除失败', () => { + assert.match(boardSource, /isRecordMissingError\(e\)/, '必须识别「任务不存在/记录不存在」') + assert.match(boardSource, /记录已不存在,已同步移除本地记录/, '记录已不存在要有可见的同步提示') +}) + +test('批量删除不再逐条弹二次确认', () => { + assert.match( + boardSource, + /deleteTaskRecord\(.*\{ skipConfirm: true \}\)/, + '批量入口已确认过一次,逐条再弹框会让用户以为批量删除没生效', + ) +}) diff --git a/frontend-vue/tests/task-delete-target.test.ts b/frontend-vue/tests/task-delete-target.test.ts new file mode 100644 index 000000000..f86eea058 --- /dev/null +++ b/frontend-vue/tests/task-delete-target.test.ts @@ -0,0 +1,52 @@ +/** + * 删除目标判定的回归用例(2026-10-29 现网「外观专利删不了」)。 + * + * 症状:失败任务被自动克隆重试后,克隆件没有结果行;旧口径只给 RUNNING 删任务、 + * 其余只删结果行,于是这些任务在列表里删不掉,批量全选时还静默跳过、仍弹「已删除」。 + * 这里钉住三条:有任务且允许删任务 → 删任务;否则有结果行 → 删结果行; + * 两者都没有必须返回 none(调用方据此报错,不许假成功)。 + * + * 跑法:`node --test tests/task-delete-target.test.ts` + */ +import { test } from 'node:test' +import assert from 'node:assert/strict' +import { resolveTaskDeleteTarget } from '../src/shared/utils/task-delete-target.ts' + +test('有任务且调用方允许删任务时优先删任务(失败任务/克隆件也能整条删除)', () => { + assert.equal( + resolveTaskDeleteTarget({ hasDeleteOptions: true, taskId: 32744, resultId: undefined, shouldDeleteTask: true }), + 'task', + ) + assert.equal( + resolveTaskDeleteTarget({ hasDeleteOptions: true, taskId: 32699, resultId: 35621, shouldDeleteTask: true }), + 'task', + ) +}) + +test('不允许删任务时回退删结果行(相似 ASIN 的终态口径)', () => { + assert.equal( + resolveTaskDeleteTarget({ hasDeleteOptions: true, taskId: 32699, resultId: 35621, shouldDeleteTask: false }), + 'history', + ) +}) + +test('只有任务、不允许删任务、也没有结果行时返回 none,不得当成已删除', () => { + assert.equal( + resolveTaskDeleteTarget({ hasDeleteOptions: true, taskId: 32744, resultId: undefined, shouldDeleteTask: false }), + 'none', + ) +}) + +test('没有任何任务/结果标识时返回 none', () => { + assert.equal( + resolveTaskDeleteTarget({ hasDeleteOptions: true, shouldDeleteTask: true }), + 'none', + ) +}) + +test('看板未配置删除选项时返回 none', () => { + assert.equal( + resolveTaskDeleteTarget({ hasDeleteOptions: false, taskId: 1, resultId: 2, shouldDeleteTask: true }), + 'none', + ) +})