fix(用户端): 任务删除目标判定收口——失败/克隆件删得掉、缺标识不假成功
删除判定从 useLiveTaskBoard 内联三分支收成纯函数 task-delete-target:能删任务就删任务 (不再限定 RUNNING,自动克隆件没有结果行也能整条删除),没有任务才回退删结果行, 两者都没有必须显式报错——原来会静默跳过却弹「已删除」把用户挡在死胡同里。 批量入口已确认过,逐条不再二次弹框;「记录不存在」按已删除自愈处理(多标签/多端)。
This commit is contained in:
@@ -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<T extends LiveTaskHistoryItem>(
|
||||
}
|
||||
}
|
||||
|
||||
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} 条失败`)
|
||||
|
||||
@@ -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'
|
||||
}
|
||||
Reference in New Issue
Block a user