diff --git a/docs/review-draft-conflict-recovery.md b/docs/review-draft-conflict-recovery.md new file mode 100644 index 00000000..7c78b5f7 --- /dev/null +++ b/docs/review-draft-conflict-recovery.md @@ -0,0 +1,25 @@ +# 审查批注冲突恢复与提示 + +2026-09-29,适用于质检与最终验收的共享批注组件。 + +## 已确认与未确认 + +线上指定任务存在已完成的保存回执和版本 1 的问题记录,而客户截图仍显示 0 个已保存问题。 +提示来自服务端 review_draft_version_conflict,表示请求所带草稿版本不是当前版本;不是正式决定记录大小超限。 +未采集到发生时的完整浏览器请求链,不能确定由多页面操作、重新进入、响应延迟或其他状态切换中的哪一种造成页面落后。 + +本地真实 hook 浏览器复现确认:首次保存收到版本冲突时,旧实现不读取最新草稿,继续保留旧版本和旧列表;自动读取只在未确认操作的重试分支执行。因此反复点击保存可能反复遇到同一冲突。 + +## 修复 + +- 首次或重试保存遇到明确版本冲突,都自动读取最新列表。读取结果仍受任务、被审版本和页面代次保护。 +- 若相同问题 ID 与内容已保存,则按成功处理并清空输入,不重复新增。 +- 若有其他修改,只更新列表并保留输入,让用户检查后再次保存;不自动重发、不覆盖其他问题。 +- 最新列表读取失败或标注版本变化时,保留当前文字,给出明确的更新/重新打开操作。 +- 新版使用“更新问题列表”“查看提交结果”等操作文字;兼容显示旧版已持久化的错误提示。 + +## 验证 + +node tests/browser/review-draft-conflict.mjs 在修复前捕获旧版本仍为 0 的失败;修复后覆盖其他修改、同条已保存、读取失败、标注版本变化。 +node tests/browser/review-decision-failure.mjs 覆盖质检/终审确认失败解除限制、成功结果恢复及未知结果保护。 +本次不改变后端并发校验和客户数据,不自动部署或提交 PR。 diff --git a/src/components/ReviewProblemPanel.tsx b/src/components/ReviewProblemPanel.tsx index 0f377481..e4e31078 100644 --- a/src/components/ReviewProblemPanel.tsx +++ b/src/components/ReviewProblemPanel.tsx @@ -62,7 +62,13 @@ export function ReviewProblemPanel({ review, label, navigationSliceId, writeLock
审查问题 - {review.saving ? "保存中" : review.dirty ? "未保存" : review.message || "已保存"} + {review.loading + ? "正在加载" + : review.saving + ? "保存中" + : review.dirty + ? "未保存" + : review.message || (review.draft ? "已保存" : "尚未加载")}
@@ -196,7 +202,7 @@ export function ReviewProblemPanel({ review, label, navigationSliceId, writeLock )} {review.recoverable && (
- 有未确认保存的文字:{review.recoverable.text.slice(0, 40)} + 这些文字可能还没保存:{review.recoverable.text.slice(0, 40)} @@ -233,7 +239,7 @@ export function ReviewProblemPanel({ review, label, navigationSliceId, writeLock
{review.previousText && (
- 被审版本已变化,旧版未保存文字保留于此 + 标注已更新,查看之前未保存的文字

{review.previousText}

)} @@ -241,17 +247,23 @@ export function ReviewProblemPanel({ review, label, navigationSliceId, writeLock

{review.error}

)} - {!review.error && /请先|已核对上次保存/.test(review.message) && ( + {!review.error && /请先|之前的文字已保存/.test(review.message) && (

{review.message}

)}
-

{review.draft?.problems.length || 0} 个已保存问题

+

+ {review.loading + ? "正在加载问题列表…" + : review.draft + ? `${review.draft.problems.length} 个已保存问题` + : "问题列表尚未加载"} +

{(review.draft?.problems || []).map((problem) => ( {reviewDecision.canRetry && ( )} diff --git a/tests/browser/review-decision-recovery.mjs b/tests/browser/review-decision-recovery.mjs index 1001d0ea..fa0a997f 100644 --- a/tests/browser/review-decision-recovery.mjs +++ b/tests/browser/review-decision-recovery.mjs @@ -53,12 +53,12 @@ try { await page.getByRole("button", { name: "审核通过", exact: true }).click(); await page.getByRole("dialog", { name: "确认审查决定", exact: true }).waitFor(); await page.keyboard.press("Enter"); - await page.getByRole("button", { name: "核对原提交", exact: true }).waitFor(); + await page.getByRole("button", { name: "查看提交结果", exact: true }).waitFor(); await page.getByRole("button", { name: "开始/继续审查", exact: true }).waitFor(); assert.equal(posts.length, 1); assert.equal(queue.filter((c) => c.action === "next").length, 0); - await page.getByRole("button", { name: "核对原提交", exact: true }).click(); - await page.getByRole("button", { name: "核对原提交", exact: true }).waitFor({ state: "hidden" }); + await page.getByRole("button", { name: "查看提交结果", exact: true }).click(); + await page.getByRole("button", { name: "查看提交结果", exact: true }).waitFor({ state: "hidden" }); const receipt = await page.evaluate( async ({ id, op }) => { const r = await fetch(`/api/human-items/${id}/review-operations/${op}`); diff --git a/tests/browser/review-draft-conflict.mjs b/tests/browser/review-draft-conflict.mjs new file mode 100644 index 00000000..d40b591e --- /dev/null +++ b/tests/browser/review-draft-conflict.mjs @@ -0,0 +1,124 @@ +// Local-only hook regression: synthetic responses, no customer API calls. +import assert from "node:assert/strict"; +import { createServer } from "vite"; +import { chromium } from "playwright"; + +const server = await createServer({ + configFile: false, + server: { allowedHosts: ["review-errors.test"], host: "127.0.0.1", port: 5198 }, + plugins: [ + { + name: "review-error-harness", + configureServer(server) { + server.middlewares.use("/review-error-test", async (_req, res) => { + res.setHeader("Content-Type", "text/html"); + res.end( + await server.transformIndexHtml( + "/review-error-test", + `
`, + ), + ); + }); + }, + }, + ], + optimizeDeps: { noDiscovery: true, entries: [], include: ["react", "react-dom/client"] }, +}); +let browser; +try { + console.log("starting local harness"); + await server.listen(); + console.log("launching browser"); + browser = await chromium.launch({ + executablePath: process.env.BROWSER_PATH || "/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge", + headless: true, + args: ["--no-proxy-server", "--host-resolver-rules=MAP review-errors.test 127.0.0.1"], + }); + console.log("browser launched"); + const page = await browser.newPage(); + page.setDefaultTimeout(15000); + page.on("pageerror", (error) => console.error(error.message)); + const base = server.resolvedUrls.local[0].replace("127.0.0.1", "review-errors.test"); + for (const scenario of ["other-change", "already-saved", "read-fails", "result-changed"]) { + console.log("scenario", scenario); + await page.goto(base + "review-error-test"); + await page.waitForFunction(() => window.review?.draft && !window.review.loading); + await page.evaluate(() => window.review.beginProblem({ time: 0, sliceId: "slice", timeBasis: "capture-seconds" })); + await page.waitForFunction(() => window.review.scopePicker); + await page.evaluate(() => window.review.confirmScope("task")); + await page.waitForFunction(() => window.review.editor); + await page.evaluate(() => window.review.setText("当前输入")); + await page.waitForFunction(() => window.review.editor.text === "当前输入"); + await page.evaluate((scenario) => { + const e = window.review.editor; + window.scenario = scenario; + window.serverDraft = { + ...window.serverDraft, + version: 1, + resultVersion: scenario === "result-changed" ? "new-result" : "result", + problems: [ + scenario === "already-saved" + ? { id: e.id, scope: e.scope, text: e.text, atSeconds: 0 } + : { id: "other", scope: "task", text: "其他已保存问题", atSeconds: 0 }, + ], + }; + }, scenario); + await page.evaluate(() => window.review.save()); + if (scenario === "read-fails" || scenario === "result-changed") { + assert.equal(await page.evaluate(() => window.review.draft.version), 0); + assert.equal(await page.evaluate(() => window.review.editor.text), "当前输入"); + assert.equal(await page.evaluate(() => window.writes.length), 1); + assert.match( + await page.evaluate(() => window.review.error), + scenario === "read-fails" ? /更新问题列表/ : /重新打开任务/, + ); + if (scenario === "read-fails") { + await page.evaluate(() => { + window.failRead = false; + return window.review.reload(); + }); + assert.equal(await page.evaluate(() => window.review.draft.version), 1); + } + console.log("PASS", scenario, "input retained and no silent write"); + continue; + } + assert.equal( + await page.evaluate(() => window.review.draft.version), + 1, + "conflict must refresh the stale list automatically", + ); + assert.equal(await page.evaluate(() => window.writes.length), 1, "never auto-resubmit conflicting content"); + if (scenario === "already-saved") { + assert.equal(await page.evaluate(() => window.review.editor), null, "confirmed saved text closes editor"); + assert.equal(await page.evaluate(() => window.review.error), ""); + } else { + assert.equal(await page.evaluate(() => window.review.editor.text), "当前输入", "unsaved input preserved"); + await page.evaluate(() => window.review.save()); + assert.deepEqual(await page.evaluate(() => window.serverDraft.problems.map((p) => p.text)), [ + "其他已保存问题", + "当前输入", + ]); + assert.equal(await page.evaluate(() => window.writes[1].version), 1); + } + console.log("PASS", scenario, "automatic read, no silent overwrite, no duplicate problem"); + } +} finally { + await browser?.close(); + await server.close(); +} diff --git a/tests/browser/review-draft-latency.mjs b/tests/browser/review-draft-latency.mjs index f5fc53d2..ff2f2e90 100644 --- a/tests/browser/review-draft-latency.mjs +++ b/tests/browser/review-draft-latency.mjs @@ -142,7 +142,7 @@ try { await panel.getByRole("button", { name: "保存批注", exact: true }).click(); await panel .getByRole("alert") - .filter({ hasText: /已核对上次保存|请核对最新草稿/ }) + .filter({ hasText: /之前的文字已保存|问题列表已更新/ }) .waitFor(); assert.ok( (await read()).draft.problems.some((p) => p.text === newer), diff --git a/tests/browser/review-drafts.mjs b/tests/browser/review-drafts.mjs index a80b6c72..33079ee0 100644 --- a/tests/browser/review-drafts.mjs +++ b/tests/browser/review-drafts.mjs @@ -150,7 +150,7 @@ try { await page.unroute("**/review-draft"); await input.fill("断网之后新增的文字,不能替代未核对的原操作"); await panel.getByRole("button", { name: "保存批注", exact: true }).click(); - await panel.getByText(/已核对上次保存/).waitFor(); + await panel.getByText(/之前的文字已保存/).waitFor(); saved = (await read()).draft; assert.ok( saved.problems.some((p) => p.text === "模拟断网后保留的批注"),