From 4f948a2510dc8e57448bfa0aef456d026341153c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Tue, 20 Oct 2026 01:26:19 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E4=BA=A7=E5=93=81=E9=A3=8E=E9=99=A9):=20co?= =?UTF-8?q?nfirm=20=E5=BC=B9=E7=AA=97=E7=9A=84=E6=A0=87=E9=A2=98=E4=B8=8D?= =?UTF-8?q?=E5=86=8D=E8=B0=8E=E7=A7=B0=E3=80=8C=E5=B7=B2=E9=98=BB=E6=AD=A2?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E3=80=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 真机验收(本地起 vite+桩后端,用真组件跑到真弹窗)点出来的:checkQueuePayload 把 blockTitle/confirmTitle 传成同一个串,于是「仍然继续/取消」那种问句的弹窗顶着一句 「任务数据不完整,已阻止推送」——它一样东西都没阻止,用户读到的第一行就是反的。 checkParseResult 早就是两档分开(解析结果无法执行/解析结果需要确认),这里补齐。 调用方自带 title 时仍两档共用,不改既有行为。 顺带记两条真机读数:确认框确实拦住推送(弹窗开着时入队 0 次,点仍然继续才 1 次、 点取消则始终 0 次);「一个国家都没选」那条 block 在界面上点不出来——最后一个国家的 勾选框是 disabled、还会弹「至少保留 1 个国家」,所以 product-risk.no-country 只是 给恢复空快照兜底的防线,不是日常路径。 --- frontend-vue/src/shared/dispatch-guard.ts | 5 ++++- frontend-vue/tests/dispatch-guard.test.ts | 23 +++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/frontend-vue/src/shared/dispatch-guard.ts b/frontend-vue/src/shared/dispatch-guard.ts index 57b322a18..5e220b295 100644 --- a/frontend-vue/src/shared/dispatch-guard.ts +++ b/frontend-vue/src/shared/dispatch-guard.ts @@ -461,6 +461,9 @@ export function checkQueuePayload( options: QueuePayloadOptions = {}, ): GuardResult { const title = options.title || '任务数据不完整,已阻止推送' + // 真机验收时点出来的:confirm 档也顶着「已阻止推送」的标题,可它并没有阻止,问的是「要不要继续」。 + // 调用方自带 title 时两档共用(沿用既有行为),只有走默认文案才按档位分开。 + const confirmTitle = options.title || '任务数据需要确认' const issues: GuardIssue[] = [] if (!isPlainObject(payload)) { @@ -587,7 +590,7 @@ export function checkQueuePayload( issues.push(...options.extraIssues(data)) } - return buildResult(title, title, issues) + return buildResult(title, confirmTitle, issues) } export interface UnsafeJsonPath { diff --git a/frontend-vue/tests/dispatch-guard.test.ts b/frontend-vue/tests/dispatch-guard.test.ts index bb386c357..84124f3a4 100644 --- a/frontend-vue/tests/dispatch-guard.test.ts +++ b/frontend-vue/tests/dispatch-guard.test.ts @@ -527,3 +527,26 @@ test('test_queue_deferral_budget_decision', () => { assert.equal(shouldDeferQueuePush(hard, 0, 10), false, '真失败没有重试一说') assert.equal(shouldDeferQueuePush(busy, 0, 0), false) }) + +test('test_queue_payload_title_matches_what_the_dialog_actually_does', () => { + // 2026-10-20 真机验收点出来的:confirm 档也顶着「已阻止推送」的标题——弹窗没阻止任何东西, + // 它问的是"要不要继续"。用户读到的第一行就是反的,签字这件事从标题上已经先错一步。 + const confirm = checkQueuePayload({ type: 'x', data: { a: 1 } }, { + expectedType: 'x', + extraIssues: () => [{ code: 'c.suspicious', severity: 'confirm', message: '这样跑出来的表可能是空的,确定继续吗?' }], + }) + assert.equal(confirm.needsConfirm, true) + assert.doesNotMatch(confirm.title, /已阻止/, '没阻止就不能说阻止了') + assert.match(confirm.title, /需要确认/) + + const blocked = checkQueuePayload({ type: 'x', data: {} }, { expectedType: 'x', requiredDataKeys: ['taskId'] }) + assert.equal(blocked.ok, false) + assert.match(blocked.title, /已阻止推送/, 'block 档照旧说"已阻止"') + + const custom = checkQueuePayload({ type: 'x', data: { taskId: 1 } }, { + expectedType: 'x', + title: '自定义标题', + extraIssues: () => [{ code: 'c.s', severity: 'confirm', message: 'm' }], + }) + assert.equal(custom.title, '自定义标题', '调用方自带标题时两档共用,不改既有行为') +})