新增 shared/dispatch-guard.ts(纯 TS 校验,可单测)与 dispatch-guard-ui.ts
(ElMessageBox 弹窗层),在数据流的三个位置设闸:
- 选文件:空选择、非 xlsx/xls/csv、空路径直接拦;重复文件弹确认
- 解析结果:taskId 非法、totalRows 为 0、整批行被丢弃、需要分组却无分组直接拦;
部分行被丢弃弹确认后才允许推送
- 入队前:结构不符、必填字段缺失、items/groups/country_codes 为空数组、
行数页数为 0、JSON 不安全值(NaN/Infinity/BigInt/循环引用/数组洞)
覆盖 11 个推 Python 队列的 Tab 与 dedupe/split/convert 三个纯 Java Tab。
闸位按 Tab 挑选以免留下孤儿后端状态:collect-data 校验前置到
activateCollectDataTask 之前(任务保持 PENDING 无需回滚)、product-risk 的国家
检查提到建任务之前;已建任务后才拦下的复用各 Tab 原有失败补偿路径。
两处边界:对象属性 undefined 放行(taskNo 这类可选字段是惯用写法),只拦数组
元素 undefined 与数组洞;price-track 的 asin_rows_by_country 仅在 mode=asin
时要求非空,status 模式下 loadAsinRowsForAppClient 本就返回 {}。
顺带修复 similar-asin / appearance-patent 的 selectFiles 缺少 try/catch,
上传失败会残留上一批文件与解析结果。
测试:tests/dispatch-guard.test.ts 新增 37 个 test_task_101_* 用例。
This commit is contained in:
@@ -235,6 +235,13 @@ import { getPywebviewApi, type UploadedJavaFile } from '@/shared/bridges/pywebvi
|
||||
import { getTaskPollIntervalMs } from '@/shared/task-progress-config'
|
||||
import { createCategorizedTimers } from '@/shared/utils/categorized-timers'
|
||||
import { saveUrlWithProgress } from '@/shared/utils/download-progress'
|
||||
import {
|
||||
EXCEL_EXTENSIONS,
|
||||
checkQueuePayload,
|
||||
checkSelectedFiles,
|
||||
guardBlocked,
|
||||
} from '@/shared/dispatch-guard'
|
||||
import { passGuard } from '@/shared/dispatch-guard-ui'
|
||||
import { useZiniaoVersion } from '@/shared/utils/ziniao-version'
|
||||
|
||||
interface SessionDeleteBrandItem extends DeleteBrandResultItem {
|
||||
@@ -1054,10 +1061,14 @@ async function selectFiles() {
|
||||
try {
|
||||
const paths = await api.select_brand_xlsx_files()
|
||||
if (!paths?.length) return
|
||||
if (!(await passGuard(checkSelectedFiles(paths, { allowedExtensions: EXCEL_EXTENSIONS })))) return
|
||||
selectedPaths.value = paths
|
||||
uploadedFiles.value = await uploadPathsToJava(paths)
|
||||
ElMessage.success(`已选择 ${paths.length} 个删除品牌文件`)
|
||||
} catch (error) {
|
||||
// 上传失败时清空选择,避免残留上一批文件让用户误以为新文件已就绪
|
||||
selectedPaths.value = []
|
||||
uploadedFiles.value = []
|
||||
ElMessage.error(error instanceof Error ? error.message : '选择失败')
|
||||
}
|
||||
}
|
||||
@@ -1077,10 +1088,13 @@ async function selectFolder() {
|
||||
ElMessage.warning(result.error || '该文件夹下没有 xlsx 文件')
|
||||
return
|
||||
}
|
||||
if (!(await passGuard(checkSelectedFiles(result.items, { allowedExtensions: EXCEL_EXTENSIONS })))) return
|
||||
selectedPaths.value = result.items.map((item) => item.relativePath || item.absolutePath)
|
||||
uploadedFiles.value = await uploadPathsToJava(result.items)
|
||||
ElMessage.success(`已选择文件夹内 ${result.items.length} 个 xlsx 文件`)
|
||||
} catch (error) {
|
||||
selectedPaths.value = []
|
||||
uploadedFiles.value = []
|
||||
ElMessage.error(error instanceof Error ? error.message : '选择失败')
|
||||
}
|
||||
}
|
||||
@@ -1100,6 +1114,21 @@ async function submitRun() {
|
||||
})),
|
||||
})
|
||||
const normalizedItems = normalizeDeleteBrandItems(result.items || [])
|
||||
// 一条都没解析出来说明文件根本没读懂,直接拦下,不写入会话与历史
|
||||
if (!normalizedItems.length) {
|
||||
await passGuard(
|
||||
guardBlocked(
|
||||
'解析结果无法执行',
|
||||
'这批文件里没有解析出任何删除品牌记录。\n' +
|
||||
'请确认文件名能对应到店铺名、表内有数据行且表头与模板一致,修正后重新上传。',
|
||||
'delete-brand.empty-result',
|
||||
),
|
||||
)
|
||||
queuePushResult.value = '解析完成,但没有解析出任何记录'
|
||||
queuePayloadText.value = ''
|
||||
await loadHistory()
|
||||
return
|
||||
}
|
||||
const hasRunnableItems = normalizedItems.some((item) => isUsableMatchedItem(item))
|
||||
const hasStaleMatchedItems = normalizedItems.some((item) => item.matchStatus === 'INDEX_STALE' && item.matched)
|
||||
const hasBlockedItems = normalizedItems.some((item) => !isUsableMatchedItem(item))
|
||||
@@ -1322,6 +1351,16 @@ async function runItem(item: DeleteBrandResultItem, options?: { auto?: boolean }
|
||||
}
|
||||
|
||||
queuePayloadText.value = JSON.stringify(payload, null, 2)
|
||||
const guard = checkQueuePayload(payload, {
|
||||
expectedType: 'delete-brand-run',
|
||||
requiredDataKeys: ['taskId'],
|
||||
nonEmptyArrayKeys: ['items'],
|
||||
})
|
||||
if (!(await passGuard(guard))) {
|
||||
queuePushResult.value = `文件 ${item.sourceFilename || taskId} 数据校验未通过,已阻止推送`
|
||||
saveSessionTask(taskId, sessionTask.items, queuePushResult.value, queuePayloadText.value)
|
||||
return { success: false, retryable: false }
|
||||
}
|
||||
const pushResult = await api.enqueue_json(payload)
|
||||
let qpr = ''
|
||||
if (pushResult?.success) {
|
||||
|
||||
Reference in New Issue
Block a user