diff --git a/frontend-vue/src/pages/brand/components/BrandCollectDataTab.vue b/frontend-vue/src/pages/brand/components/BrandCollectDataTab.vue index aecfe191a..6065c39e1 100644 --- a/frontend-vue/src/pages/brand/components/BrandCollectDataTab.vue +++ b/frontend-vue/src/pages/brand/components/BrandCollectDataTab.vue @@ -656,22 +656,25 @@ async function loadHistory() { } } -async function deleteTaskRecord(item: CollectDataHistoryItem) { - if (!(await confirmTaskDeletion(item))) return +async function deleteTaskRecord(item: CollectDataHistoryItem, opts: { skipConfirm?: boolean; silent?: boolean } = {}) { + if (!opts.skipConfirm && !(await confirmTaskDeletion(item))) return try { if (item.resultId) { await deleteCollectDataHistory(item.resultId) } else if (item.taskId) { await deleteCollectDataTask(item.taskId) } else { + if (opts.silent) throw new Error('缺少记录标识') return } if (item.taskId) { progressLoop.remove(item.taskId) } + if (opts.silent) return ElMessage.success('已删除') await Promise.all([loadDashboard(), loadHistory()]) } catch (error) { + if (opts.silent) throw error ElMessage.error(error instanceof Error ? error.message : '删除失败') } } @@ -764,13 +767,15 @@ onBeforeUnmount(() => { }) /** - * 历史记录批量删除:复用单条删除逻辑(删除后原函数各自刷新列表) + * 历史记录批量删除:复用单条删除逻辑(silent 模式逐条不弹框、不逐条刷新)。 + * 批量入口已确认过一次,全部删完统一刷新一次、只报一次总数。 */ async function batchDeleteHistory(views: TaskItemView[]) { - const { total, failed } = await runBatchDelete(views, (view) => deleteTaskRecord(itemSource(view))) + const { total, failed } = await runBatchDelete(views, (view) => deleteTaskRecord(itemSource(view), { skipConfirm: true, silent: true })) if (!total) return + await Promise.allSettled([loadDashboard(), loadHistory()]) if (failed > 0) { - ElMessage.warning(`删除完成,${failed} 条失败`) + ElMessage.warning(`删除完成:成功 ${total - failed} 条,失败 ${failed} 条`) } else { ElMessage.success(`已删除 ${total} 条历史记录`) } diff --git a/frontend-vue/src/pages/brand/components/BrandPatrolDeleteTab.vue b/frontend-vue/src/pages/brand/components/BrandPatrolDeleteTab.vue index 4ade32e66..aa717714f 100644 --- a/frontend-vue/src/pages/brand/components/BrandPatrolDeleteTab.vue +++ b/frontend-vue/src/pages/brand/components/BrandPatrolDeleteTab.vue @@ -1149,8 +1149,8 @@ async function downloadResult(item: PatrolDeleteHistoryItem) { } } -async function deleteTaskRecord(item: PatrolDeleteHistoryItem) { - if (!(await confirmTaskDeletion(item))) return +async function deleteTaskRecord(item: PatrolDeleteHistoryItem, opts: { skipConfirm?: boolean; silent?: boolean } = {}) { + if (!opts.skipConfirm && !(await confirmTaskDeletion(item))) return try { if (item.taskId) { await deletePatrolDeleteTask(item.taskId); @@ -1163,6 +1163,7 @@ async function deleteTaskRecord(item: PatrolDeleteHistoryItem) { throw new Error("缺少可删除的任务标识"); } removeHistoryItemLocally(item); + if (opts.silent) return await Promise.allSettled([loadCandidates(), refreshTaskViews()]); ElMessage.success("已删除"); } catch (error) { @@ -1171,10 +1172,12 @@ async function deleteTaskRecord(item: PatrolDeleteHistoryItem) { clearActiveQueueTask(); } removeHistoryItemLocally(item); + if (opts.silent) return await loadCandidates(); ElMessage.success("记录已不存在,已同步移除本地记录"); return; } + if (opts.silent) throw error ElMessage.error(error instanceof Error ? error.message : "删除失败"); } } @@ -1206,13 +1209,15 @@ onUnmounted(() => { }); /** - * 历史记录批量删除:复用单条删除逻辑(删除后原函数各自刷新列表) + * 历史记录批量删除:复用单条删除逻辑(silent 模式逐条不弹框、不逐条刷新)。 + * 批量入口已确认过一次,全部删完统一刷新一次、只报一次总数。 */ async function batchDeleteHistory(views: TaskItemView[]) { - const { total, failed } = await runBatchDelete(views, (view) => deleteTaskRecord(itemSource(view))) + const { total, failed } = await runBatchDelete(views, (view) => deleteTaskRecord(itemSource(view), { skipConfirm: true, silent: true })) if (!total) return + await Promise.allSettled([loadCandidates(), refreshTaskViews()]) if (failed > 0) { - ElMessage.warning(`删除完成,${failed} 条失败`) + ElMessage.warning(`删除完成:成功 ${total - failed} 条,失败 ${failed} 条`) } else { ElMessage.success(`已删除 ${total} 条历史记录`) } diff --git a/frontend-vue/src/pages/brand/components/BrandPriceTrackTab.vue b/frontend-vue/src/pages/brand/components/BrandPriceTrackTab.vue index 937581692..9b2b47b52 100644 --- a/frontend-vue/src/pages/brand/components/BrandPriceTrackTab.vue +++ b/frontend-vue/src/pages/brand/components/BrandPriceTrackTab.vue @@ -1699,8 +1699,8 @@ async function downloadResult(item: PriceTrackHistoryItem) { } } -async function deleteTaskRecord(item: PriceTrackHistoryItem) { - if (!(await confirmTaskDeletion(item))) return +async function deleteTaskRecord(item: PriceTrackHistoryItem, opts: { skipConfirm?: boolean; silent?: boolean } = {}) { + if (!opts.skipConfirm && !(await confirmTaskDeletion(item))) return try { if (item.resultId != null) { await deletePriceTrackHistory(item.resultId) @@ -1712,6 +1712,7 @@ async function deleteTaskRecord(item: PriceTrackHistoryItem) { } if (item.taskId != null) removePollingTask(item.taskId) removeMatchedRowsLocally([item]) + if (opts.silent) return await loadHistory() await loadDashboard() syncPollingIdsWithHistory() @@ -1721,11 +1722,13 @@ async function deleteTaskRecord(item: PriceTrackHistoryItem) { if (item.taskId != null) removePollingTask(item.taskId) removeMatchedRowsLocally([item]) removeHistoryItemLocally(item) + if (opts.silent) return await loadDashboard() syncPollingIdsWithHistory() ElMessage.success('记录已不存在,已同步移除本地记录') return } + if (opts.silent) throw e ElMessage.error(e instanceof Error ? e.message : '删除失败') } } @@ -1773,13 +1776,16 @@ onUnmounted(() => { }) /** - * 历史记录批量删除:复用单条删除逻辑(删除后原函数各自刷新列表) + * 历史记录批量删除:复用单条删除逻辑(silent 模式逐条不弹框、不逐条刷新)。 + * 批量入口已确认过一次,全部删完统一刷新一次、只报一次总数。 */ async function batchDeleteHistory(views: TaskItemView[]) { - const { total, failed } = await runBatchDelete(views, (view) => deleteTaskRecord(itemSource(view))) + const { total, failed } = await runBatchDelete(views, (view) => deleteTaskRecord(itemSource(view), { skipConfirm: true, silent: true })) if (!total) return + await Promise.allSettled([loadHistory(), loadDashboard()]) + syncPollingIdsWithHistory() if (failed > 0) { - ElMessage.warning(`删除完成,${failed} 条失败`) + ElMessage.warning(`删除完成:成功 ${total - failed} 条,失败 ${failed} 条`) } else { ElMessage.success(`已删除 ${total} 条历史记录`) } diff --git a/frontend-vue/src/pages/brand/components/BrandProductRiskTab.vue b/frontend-vue/src/pages/brand/components/BrandProductRiskTab.vue index f74dbe9de..1f568fd38 100644 --- a/frontend-vue/src/pages/brand/components/BrandProductRiskTab.vue +++ b/frontend-vue/src/pages/brand/components/BrandProductRiskTab.vue @@ -522,14 +522,15 @@ function syncPollingIdsWithHistory() { } } -async function deleteTaskRecord(item: ProductRiskHistoryItem) { - if (!(await confirmTaskDeletion(item))) return +async function deleteTaskRecord(item: ProductRiskHistoryItem, opts: { skipConfirm?: boolean; silent?: boolean } = {}) { + if (!opts.skipConfirm && !(await confirmTaskDeletion(item))) return try { if (item.resultId != null && item.resultId > 0) { await deleteProductRiskHistory(item.resultId) } else if (item.taskId != null && item.taskId > 0) { await deleteProductRiskTask(item.taskId) } else { + if (opts.silent) throw new Error('缺少记录标识') ElMessage.warning('无法删除:缺少记录标识') return } @@ -537,6 +538,7 @@ async function deleteTaskRecord(item: ProductRiskHistoryItem) { removePollingTask(item.taskId) } removeMatchedRowsLocally([item]) + if (opts.silent) return await loadHistory() await loadDashboard() syncPollingIdsWithHistory() @@ -548,11 +550,13 @@ async function deleteTaskRecord(item: ProductRiskHistoryItem) { } removeMatchedRowsLocally([item]) removeHistoryItemLocally(item) + if (opts.silent) return await loadDashboard() syncPollingIdsWithHistory() ElMessage.success('记录已不存在,已同步移除本地记录') return } + if (opts.silent) throw e ElMessage.error(e instanceof Error ? e.message : '删除失败') } } @@ -1314,13 +1318,16 @@ onUnmounted(() => { }) /** - * 历史记录批量删除:复用单条删除逻辑(删除后原函数各自刷新列表) + * 历史记录批量删除:复用单条删除逻辑(silent 模式逐条不弹框、不逐条刷新)。 + * 批量入口已确认过一次,全部删完统一刷新一次、只报一次总数。 */ async function batchDeleteHistory(views: TaskItemView[]) { - const { total, failed } = await runBatchDelete(views, (view) => deleteTaskRecord(itemSource(view))) + const { total, failed } = await runBatchDelete(views, (view) => deleteTaskRecord(itemSource(view), { skipConfirm: true, silent: true })) if (!total) return + await Promise.allSettled([loadHistory(), loadDashboard()]) + syncPollingIdsWithHistory() if (failed > 0) { - ElMessage.warning(`删除完成,${failed} 条失败`) + ElMessage.warning(`删除完成:成功 ${total - failed} 条,失败 ${failed} 条`) } else { ElMessage.success(`已删除 ${total} 条历史记录`) } diff --git a/frontend-vue/src/pages/brand/components/BrandPublishTab.vue b/frontend-vue/src/pages/brand/components/BrandPublishTab.vue index 74c2b0216..a21141352 100644 --- a/frontend-vue/src/pages/brand/components/BrandPublishTab.vue +++ b/frontend-vue/src/pages/brand/components/BrandPublishTab.vue @@ -1091,30 +1091,34 @@ function removeTaskLocally(taskId: number) { saveQueueState() } -async function deleteTaskRecord(detail: PublishTaskDetailVo) { +async function deleteTaskRecord(detail: PublishTaskDetailVo, opts: { skipConfirm?: boolean; silent?: boolean } = {}) { const taskId = detail.task?.id if (!taskId || isDeletingTask(taskId)) return - try { - await ElMessageBox.confirm( - `确定删除上架任务 #${taskId}?任务明细和结果文件也会一并删除。`, - '删除任务', - { - confirmButtonText: '删除', - cancelButtonText: '取消', - type: 'warning', - }, - ) - } catch { - return + if (!opts.skipConfirm) { + try { + await ElMessageBox.confirm( + `确定删除上架任务 #${taskId}?任务明细和结果文件也会一并删除。`, + '删除任务', + { + confirmButtonText: '删除', + cancelButtonText: '取消', + type: 'warning', + }, + ) + } catch { + return + } } deletingTaskIds.value = [...deletingTaskIds.value, taskId] try { await deletePublishTask(taskId) removeTaskLocally(taskId) + if (opts.silent) return ElMessage.success('任务已删除') await Promise.all([loadDashboard(), loadHistory()]) } catch (error) { + if (opts.silent) throw error ElMessage.error(error instanceof Error ? error.message : '删除任务失败') } finally { deletingTaskIds.value = deletingTaskIds.value.filter((id) => id !== taskId) @@ -1142,13 +1146,15 @@ onBeforeUnmount(() => { }) /** - * 历史记录批量删除:复用单条删除逻辑(删除后原函数各自刷新列表) + * 历史记录批量删除:复用单条删除逻辑(silent 模式逐条不弹框、不逐条刷新)。 + * 批量入口已确认过一次,全部删完统一刷新一次、只报一次总数。 */ async function batchDeleteHistory(views: TaskItemView[]) { - const { total, failed } = await runBatchDelete(views, (view) => deleteTaskRecord(itemSource(view))) + const { total, failed } = await runBatchDelete(views, (view) => deleteTaskRecord(itemSource(view), { skipConfirm: true, silent: true })) if (!total) return + await Promise.allSettled([loadDashboard(), loadHistory()]) if (failed > 0) { - ElMessage.warning(`删除完成,${failed} 条失败`) + ElMessage.warning(`删除完成:成功 ${total - failed} 条,失败 ${failed} 条`) } else { ElMessage.success(`已删除 ${total} 条历史记录`) } diff --git a/frontend-vue/src/pages/brand/components/BrandQueryAsinTab.vue b/frontend-vue/src/pages/brand/components/BrandQueryAsinTab.vue index ce5f9bdd6..b748d2328 100644 --- a/frontend-vue/src/pages/brand/components/BrandQueryAsinTab.vue +++ b/frontend-vue/src/pages/brand/components/BrandQueryAsinTab.vue @@ -1058,8 +1058,8 @@ async function downloadResult(item: QueryAsinHistoryItem) { } } -async function deleteTaskRecord(item: QueryAsinHistoryItem) { - if (!(await confirmTaskDeletion(item))) return +async function deleteTaskRecord(item: QueryAsinHistoryItem, opts: { skipConfirm?: boolean; silent?: boolean } = {}) { + if (!opts.skipConfirm && !(await confirmTaskDeletion(item))) return try { if (item.taskId) { await deleteQueryAsinTask(item.taskId); @@ -1073,6 +1073,7 @@ async function deleteTaskRecord(item: QueryAsinHistoryItem) { } else { throw new Error("缺少可删除的任务标识"); } + if (opts.silent) return await Promise.all([loadCandidates(), refreshTaskViews()]); resetQueueWorkerIfIdle(); ElMessage.success("已删除"); @@ -1083,11 +1084,13 @@ async function deleteTaskRecord(item: QueryAsinHistoryItem) { } clearTaskStartTime(item.taskId); removeHistoryItemLocally(item); + if (opts.silent) return await loadCandidates(); resetQueueWorkerIfIdle(); ElMessage.success("记录已不存在,已同步移除本地记录"); return; } + if (opts.silent) throw error ElMessage.error(error instanceof Error ? error.message : "删除失败"); } } @@ -1118,13 +1121,16 @@ onUnmounted(() => { }); /** - * 历史记录批量删除:复用单条删除逻辑(删除后原函数各自刷新列表) + * 历史记录批量删除:复用单条删除逻辑(silent 模式逐条不弹框、不逐条刷新)。 + * 批量入口已确认过一次,全部删完统一刷新一次、只报一次总数。 */ async function batchDeleteHistory(views: TaskItemView[]) { - const { total, failed } = await runBatchDelete(views, (view) => deleteTaskRecord(itemSource(view))) + const { total, failed } = await runBatchDelete(views, (view) => deleteTaskRecord(itemSource(view), { skipConfirm: true, silent: true })) if (!total) return + await Promise.allSettled([loadCandidates(), refreshTaskViews()]) + resetQueueWorkerIfIdle(); if (failed > 0) { - ElMessage.warning(`删除完成,${failed} 条失败`) + ElMessage.warning(`删除完成:成功 ${total - failed} 条,失败 ${failed} 条`) } else { ElMessage.success(`已删除 ${total} 条历史记录`) } diff --git a/frontend-vue/src/pages/brand/components/BrandShopDataCrawlTab.vue b/frontend-vue/src/pages/brand/components/BrandShopDataCrawlTab.vue index 77a1f8991..76e797efe 100644 --- a/frontend-vue/src/pages/brand/components/BrandShopDataCrawlTab.vue +++ b/frontend-vue/src/pages/brand/components/BrandShopDataCrawlTab.vue @@ -616,12 +616,12 @@ async function downloadResult(item: ShopDataCrawlHistoryItem) { if (result.success) ElMessage.success(`已保存:${result.path || filename}`) else if (result.error && result.error !== '用户取消') ElMessage.error(userNotice(result.error)) } -async function deleteTaskRecord(item: ShopDataCrawlHistoryItem) { - if (!(await confirmTaskDeletion(item))) return +async function deleteTaskRecord(item: ShopDataCrawlHistoryItem, opts: { skipConfirm?: boolean; silent?: boolean } = {}) { + if (!opts.skipConfirm && !(await confirmTaskDeletion(item))) return try { if (!item.taskId && !item.resultId) { historyItems.value = historyItems.value.filter((row) => row !== item) - ElMessage.success('已删除') + if (!opts.silent) ElMessage.success('已删除') return } if (item.taskId && !isTerminal(item.taskStatus)) await deleteShopDataCrawlTask(item.taskId) @@ -630,8 +630,12 @@ async function deleteTaskRecord(item: ShopDataCrawlHistoryItem) { else throw new Error('缺少记录标识') if (item.taskId === activeTaskId.value) clearActiveTask() historyItems.value = historyItems.value.filter((row) => historyKey(row) !== historyKey(item)) + if (opts.silent) return await loadDashboard(); ElMessage.success('已删除') - } catch (error) { ElMessage.error(error instanceof Error ? error.message : '删除失败') } + } catch (error) { + if (opts.silent) throw error + ElMessage.error(error instanceof Error ? error.message : '删除失败') + } } onMounted(async () => { @@ -655,13 +659,15 @@ onUnmounted(() => { }) /** - * 历史记录批量删除:复用单条删除逻辑(删除后原函数各自刷新列表) + * 历史记录批量删除:复用单条删除逻辑(silent 模式逐条不弹框、不逐条刷新)。 + * 批量入口已确认过一次,全部删完统一刷新一次、只报一次总数。 */ async function batchDeleteHistory(views: TaskItemView[]) { - const { total, failed } = await runBatchDelete(views, (view) => deleteTaskRecord(itemSource(view))) + const { total, failed } = await runBatchDelete(views, (view) => deleteTaskRecord(itemSource(view), { skipConfirm: true, silent: true })) if (!total) return + await loadDashboard().catch(() => undefined) if (failed > 0) { - ElMessage.warning(`删除完成,${failed} 条失败`) + ElMessage.warning(`删除完成:成功 ${total - failed} 条,失败 ${failed} 条`) } else { ElMessage.success(`已删除 ${total} 条历史记录`) } diff --git a/frontend-vue/src/pages/brand/components/BrandShopMatchTab.vue b/frontend-vue/src/pages/brand/components/BrandShopMatchTab.vue index 913292431..ed64958d3 100644 --- a/frontend-vue/src/pages/brand/components/BrandShopMatchTab.vue +++ b/frontend-vue/src/pages/brand/components/BrandShopMatchTab.vue @@ -635,8 +635,8 @@ function statusClass(item: ShopMatchHistoryItem) { const status = resolvedTaskSt // 失败任务也可能有已跑出来的部分结果文件(后端按已收分片组装),有文件就允许下载 function canDownload(item: ShopMatchHistoryItem) { const status = resolvedTaskStatus(item); return !!item.resultId && (!!item.fileReady || !!item.downloadUrl) && (status === 'SUCCESS' || status === 'COMPLETED' || status === 'FAILED') } async function downloadResult(item: ShopMatchHistoryItem) { if (!item.resultId) return; const url = getShopMatchResultDownloadUrl(item.resultId); const filename = item.outputFilename || `${item.shopName || 'result'}.xlsx`; const result = await saveUrlWithProgress(url, filename, `shop-match:${item.resultId}`); if (result.success) ElMessage.success(`已保存: ${result.path || filename}`); else if (result.error && result.error !== '用户取消') ElMessage.error(userNotice(result.error)) } -async function deleteTaskRecord(item: ShopMatchHistoryItem) { - if (!(await confirmTaskDeletion(item))) return +async function deleteTaskRecord(item: ShopMatchHistoryItem, opts: { skipConfirm?: boolean; silent?: boolean } = {}) { + if (!opts.skipConfirm && !(await confirmTaskDeletion(item))) return const taskId = normalizeTaskId(item.taskId) const resultId = Number(item.resultId || 0) try { @@ -650,6 +650,7 @@ async function deleteTaskRecord(item: ShopMatchHistoryItem) { } else { throw new Error('缺少可删除的任务标识') } + if (opts.silent) return await Promise.allSettled([loadHistory(), loadCandidates(), loadDashboard()]) ElMessage.success('删除成功') } catch (error) { @@ -660,10 +661,12 @@ async function deleteTaskRecord(item: ShopMatchHistoryItem) { historyItems.value = historyItems.value.filter((row) => Number(row.resultId || 0) !== resultId) } removeMatchedRowsLocally([item]) + if (opts.silent) return await Promise.allSettled([loadHistory(), loadCandidates(), loadDashboard()]) ElMessage.success('记录已不存在,本地记录已同步清理') return } + if (opts.silent) throw error ElMessage.error(error instanceof Error ? error.message : '删除失败') } } @@ -678,11 +681,16 @@ onUnmounted(() => { disposed = true; stopPolling(); stopScheduleHeartbeat(); cle /** * 历史记录批量删除:复用单条删除逻辑(删除后原函数各自刷新列表) */ +/** + * 历史记录批量删除:复用单条删除逻辑(silent 模式逐条不弹框、不逐条刷新)。 + * 批量入口已确认过一次,全部删完统一刷新一次、只报一次总数。 + */ async function batchDeleteHistory(views: TaskItemView[]) { - const { total, failed } = await runBatchDelete(views, (view) => deleteTaskRecord(itemSource(view))) + const { total, failed } = await runBatchDelete(views, (view) => deleteTaskRecord(itemSource(view), { skipConfirm: true, silent: true })) if (!total) return + await Promise.allSettled([loadHistory(), loadCandidates(), loadDashboard()]) if (failed > 0) { - ElMessage.warning(`删除完成,${failed} 条失败`) + ElMessage.warning(`删除完成:成功 ${total - failed} 条,失败 ${failed} 条`) } else { ElMessage.success(`已删除 ${total} 条历史记录`) } diff --git a/frontend-vue/src/pages/brand/components/BrandWithdrawTab.vue b/frontend-vue/src/pages/brand/components/BrandWithdrawTab.vue index 9b6e0ab62..b5ece8c41 100644 --- a/frontend-vue/src/pages/brand/components/BrandWithdrawTab.vue +++ b/frontend-vue/src/pages/brand/components/BrandWithdrawTab.vue @@ -1102,8 +1102,8 @@ async function downloadResult(item: WithdrawTaskGroupItem) { } } -async function deleteTaskRecord(item: WithdrawTaskGroupItem) { - if (!(await confirmTaskDeletion(item))) return +async function deleteTaskRecord(item: WithdrawTaskGroupItem, opts: { skipConfirm?: boolean; silent?: boolean } = {}) { + if (!opts.skipConfirm && !(await confirmTaskDeletion(item))) return try { if (item.taskId) { await deleteWithdrawTask(item.taskId); @@ -1117,6 +1117,7 @@ async function deleteTaskRecord(item: WithdrawTaskGroupItem) { } else { throw new Error("缺少可删除的任务标识"); } + if (opts.silent) return await Promise.all([loadCandidates(), refreshTaskViews()]); resetQueueWorkerIfIdle(); ElMessage.success("已删除"); @@ -1127,11 +1128,13 @@ async function deleteTaskRecord(item: WithdrawTaskGroupItem) { } clearTaskStartTime(item.taskId); removeHistoryItemLocally(item); + if (opts.silent) return await loadCandidates(); resetQueueWorkerIfIdle(); ElMessage.success("记录已不存在,已同步移除本地记录"); return; } + if (opts.silent) throw error ElMessage.error(error instanceof Error ? error.message : "删除失败"); } } @@ -1161,13 +1164,16 @@ onUnmounted(() => { }); /** - * 历史记录批量删除:复用单条删除逻辑(删除后原函数各自刷新列表) + * 历史记录批量删除:复用单条删除逻辑(silent 模式逐条不弹框、不逐条刷新)。 + * 批量入口已确认过一次,全部删完统一刷新一次、只报一次总数。 */ async function batchDeleteHistory(views: TaskItemView[]) { - const { total, failed } = await runBatchDelete(views, (view) => deleteTaskRecord(itemSource(view))) + const { total, failed } = await runBatchDelete(views, (view) => deleteTaskRecord(itemSource(view), { skipConfirm: true, silent: true })) if (!total) return + await Promise.allSettled([loadCandidates(), refreshTaskViews()]) + resetQueueWorkerIfIdle(); if (failed > 0) { - ElMessage.warning(`删除完成,${failed} 条失败`) + ElMessage.warning(`删除完成:成功 ${total - failed} 条,失败 ${failed} 条`) } else { ElMessage.success(`已删除 ${total} 条历史记录`) } diff --git a/frontend-vue/src/shared/composables/useLiveTaskBoard.ts b/frontend-vue/src/shared/composables/useLiveTaskBoard.ts index ff0a1ef93..febcff4bf 100644 --- a/frontend-vue/src/shared/composables/useLiveTaskBoard.ts +++ b/frontend-vue/src/shared/composables/useLiveTaskBoard.ts @@ -648,7 +648,7 @@ export function useLiveTaskBoard( } } - async function deleteTaskRecord(item: T, opts: { skipConfirm?: boolean } = {}) { + async function deleteTaskRecord(item: T, opts: { skipConfirm?: boolean; silent?: boolean } = {}) { if (!opts.skipConfirm && !(await confirmTaskDeletion(item))) return const deleteOptions = options.deleteTask try { @@ -669,6 +669,7 @@ export function useLiveTaskBoard( // 没有任务也没有结果标识:宁可报错也不能假报「已删除」把用户挡在死胡同里 throw new Error('该记录缺少任务/结果标识,无法删除,请刷新后重试') } + if (opts.silent) return await loadDashboard() await loadHistory({ force: true }) ElMessage.success('已删除') @@ -676,24 +677,27 @@ export function useLiveTaskBoard( if (isRecordMissingError(e)) { // 记录已被别处删掉(多标签/多端):本地同步移除并刷新,别让「记录不存在」被当成删除失败 if (item.taskId != null) deleteOptions?.onTaskDeleted?.(item) + if (opts.silent) return await loadDashboard().catch(() => undefined) await loadHistory({ force: true }).catch(() => undefined) ElMessage.success('记录已不存在,已同步移除本地记录') return } + if (opts.silent) throw e ElMessage.error(e instanceof Error ? e.message : '删除失败') } } /** - * 历史记录批量删除:复用单条删除逻辑(删除后原函数各自刷新列表)。 - * 批量入口已经弹过一次确认,逐条不再重复弹框。 + * 历史记录批量删除:复用单条删除逻辑(silent 模式逐条不弹框、不逐条刷新)。 + * 批量入口已经弹过一次确认,全部删完只统一刷新一次、报一次总数。 */ async function batchDeleteHistory(views: TaskItemView[]) { - const { total, failed } = await runBatchDelete(views, (view) => deleteTaskRecord(view.source as T, { skipConfirm: true })) + const { total, failed } = await runBatchDelete(views, (view) => deleteTaskRecord(view.source as T, { skipConfirm: true, silent: true })) if (!total) return + await Promise.allSettled([loadDashboard(), loadHistory({ force: true })]) if (failed > 0) { - ElMessage.warning(`删除完成,${failed} 条失败`) + ElMessage.warning(`删除完成:成功 ${total - failed} 条,失败 ${failed} 条`) } else { ElMessage.success(`已删除 ${total} 条历史记录`) } diff --git a/frontend-vue/tests/appearance-patent-task-delete.test.ts b/frontend-vue/tests/appearance-patent-task-delete.test.ts index fe53aa45b..1cf10c3bc 100644 --- a/frontend-vue/tests/appearance-patent-task-delete.test.ts +++ b/frontend-vue/tests/appearance-patent-task-delete.test.ts @@ -71,7 +71,32 @@ test('记录已不存在时自愈:同步移除本地记录而不是报删除 test('批量删除不再逐条弹二次确认', () => { assert.match( boardSource, - /deleteTaskRecord\(.*\{ skipConfirm: true \}\)/, - '批量入口已确认过一次,逐条再弹框会让用户以为批量删除没生效', + /deleteTaskRecord\(.*\{ skipConfirm: true, silent: true \}\)/, + '批量入口已确认过一次,逐条再弹框(确认框或成功提示)会让用户以为批量删除没生效', ) }) + +test('批量删除只报一次总数,不逐条弹成功提示', () => { + const fn = boardSource.slice( + boardSource.indexOf('async function batchDeleteHistory'), + boardSource.indexOf('function dispose'), + ) + assert.ok(fn.includes('runBatchDelete'), '批量入口必须走 runBatchDelete') + assert.match( + fn, + /已删除 \$\{total\} 条历史记录/, + '删完只报一次总数(含失败时报告成功/失败条数)', + ) + assert.match( + fn, + /Promise\.allSettled\(\[loadDashboard\(\), loadHistory/, + '批量删完统一刷新一次列表,不逐条刷新', + ) + // 逐条成功提示必须被 silent 挡住:silent 模式下单条函数不再弹「已删除」 + const single = boardSource.slice( + boardSource.indexOf('async function deleteTaskRecord'), + boardSource.indexOf('async function batchDeleteHistory'), + ) + assert.match(single, /if \(opts\.silent\) return/, 'silent 模式必须跳过逐条刷新与成功提示') + assert.match(single, /if \(opts\.silent\) throw e/, 'silent 模式下单条失败要抛错交给批量计数') +})