✨ Keep annotation editing and submission in the focused workspace

This commit is contained in:
d-robotics 2026-09-18 03:28:56 +08:00
parent 9fae45f4eb
commit e462437a15
6 changed files with 638 additions and 41 deletions

View File

@ -12,7 +12,9 @@
原 Space、C、逐帧、B/V、字典命名与撤销快捷键继续使用同一编辑器;右下角另提供撤销/重做按钮。确认全部切片仍需再次确认,处理请求被接收不代表生成完成,服务端完成生成后才进入描述编辑。原布局继续保留原来的滚动方式。
描述阶段固定编辑区、长列表分页、内嵌字典、单相机放大和窗口过小时暂停,由后续任务交付。当前双画面尺寸验证使用五档实际浏览器内容区,不代表已覆盖各种操作系统缩放设置。
任务 03 将动作描述接入相同骨架:右侧固定文本、精确边界、保存和取消,底部固定撤销/重做与送检入口。N 定起点,再按 N / Enter 定结束点后仍聚焦编辑区;Enter 进入文本,Ctrl / ⌘ + Enter 优先保存当前描述。已有描述可在专注视图点击“取消编辑”,丢弃当前未保存修改;保存、撤销、重做仍走现有版本与归属校验。跨片草稿继续保留,提交时必须先处理草稿;真实送检仍等待审核数据准备完成。
长列表分页、内嵌字典、长文本展开、单相机放大和窗口过小时暂停,由后续任务交付。当前双画面尺寸验证使用五档实际浏览器内容区,不代表已覆盖各种操作系统缩放设置。
## 源码恢复与业务数据恢复
@ -23,3 +25,5 @@
本地浏览器回归脚本:`tests/browser/annotation-workspace-shell.mjs`。使用隔离本地项目和已有认证会话文件,覆盖导航回退、刷新偏好、实际媒体/帧与草稿保留、延迟保存 API 回读以及撤销/重做。传入第二个真实本地账号的会话文件可额外验证同一浏览器存储中的账号隔离。会话文件和原始测试证据仅存放在忽略的 `local-data/` 中。
切片阶段的本地浏览器验收脚本为 `tests/browser/annotation-workspace-slice.mjs`,只允许本地隔离 fixture。`ANNOTATION_TASK_ID` 可选择仍处于切片阶段的隔离任务;默认运行几何与编辑检查,不保存草稿。`ANNOTATION_GENERATE=1` 才执行真实两步确认并等待生成,这会推进该 fixture 的阶段;不要为重跑检查而重置已完成任务。`ANNOTATION_VERIFY_GENERATED=1` 可只检查已生成的主 fixture 和公共 API 回读。原始截图、认证会话和日志仍仅存放在忽略目录。
描述阶段浏览器验收为 `tests/browser/annotation-workspace-annotation.mjs`:默认使用 annotate-primary 检查五档内容区、固定编辑、过期版本真实拒绝、保存/撤销/重做回读和草稿拦截。`ANNOTATION_SUBMIT=1` 仅允许 annotate-delayed 专用任务执行真实送检,推进后不应重跑或重置;`ANNOTATION_VERIFY_SUBMITTED=1` 配合该任务 ID 只回读已完成送检。shell 回归以 `ANNOTATION_SLICE_TASK_ID` 指定仍处于切片阶段的 pool fixture,默认 pool-01,避免误用已生成的 slice-primary。

View File

@ -1800,7 +1800,7 @@ export function CaptureAnnotationWorkbench({
<div
className={cn(
"p-5 pb-3 bg-[color:var(--app-panel)]",
phase === "annotate" && "md:sticky md:top-0 z-30 !p-2",
phase === "annotate" && !focusedLayout && "md:sticky md:top-0 z-30 !p-2",
)}
data-testid="capture-video-panel"
>
@ -1843,7 +1843,7 @@ export function CaptureAnnotationWorkbench({
data-camera="left"
className={cn(
"h-[clamp(120px,28dvh,280px)] w-full bg-black object-contain",
phase === "annotate" && !mediaOnly && "!h-[clamp(100px,24vh,240px)]",
phase === "annotate" && !mediaOnly && !focusedLayout && "!h-[clamp(100px,24vh,240px)]",
mediaOnly && "!h-[clamp(120px,20dvh,200px)]",
!showLeft && "hidden",
)}
@ -1858,7 +1858,7 @@ export function CaptureAnnotationWorkbench({
data-camera="right"
className={cn(
"h-[clamp(120px,28dvh,280px)] w-full bg-black object-contain",
phase === "annotate" && !mediaOnly && "!h-[clamp(100px,24vh,240px)]",
phase === "annotate" && !mediaOnly && !focusedLayout && "!h-[clamp(100px,24vh,240px)]",
mediaOnly && "!h-[clamp(120px,20dvh,200px)]",
!showRight && "hidden",
)}
@ -2402,8 +2402,8 @@ export function CaptureAnnotationWorkbench({
</div>
)}
{!mediaOnly && phase === "annotate" && !selectedDiscarded ? (
<div className="px-5 py-4">
<div className="mb-3 flex flex-wrap items-center justify-between gap-3">
<div className="capture-annotation-stage px-5 py-4">
<div className="capture-annotation-heading mb-3 flex flex-wrap items-center justify-between gap-3">
<div className="flex flex-wrap items-center gap-3">
<h3 className="text-sm font-semibold text-slate-800 dark:text-gray-100">
当前切片标注 · {selectedSlice.name || `切片 ${selectedSliceIndex + 1}`}
@ -2419,11 +2419,14 @@ export function CaptureAnnotationWorkbench({
<span>{annotationGaps.length ? `${annotationGaps.length} 处留空` : "已完整标注"}</span>
</span>
</div>
<p className="mb-3 text-xs text-slate-500" data-testid="optional-annotation-hint">
允许部分或全部留空;留空不代表无效或舍弃,仍保留视频交付并接受质检、验收。
</p>
<details className="capture-annotation-help" open={!focusedLayout}>
<summary>标注说明</summary>
<p className="mb-3 text-xs text-slate-500" data-testid="optional-annotation-hint">
允许部分或全部留空;留空不代表无效或舍弃,仍保留视频交付并接受质检、验收。
</p>
</details>
{!readOnly && !isQualityReview ? (
<div className="mb-3 flex flex-wrap items-center gap-2">
<div className="capture-annotation-tools mb-3 flex flex-wrap items-center gap-2">
{!sliceAligned ? (
<p role="alert" className="w-full text-xs text-red-600">
历史切片未对齐统一帧边界,请确认后使用“重新切片”。系统不会自动移动已有标注。
@ -3195,7 +3198,7 @@ export function CaptureAnnotationWorkbench({
</span>
</div>
<div className="mt-3 grid grid-cols-1 gap-3 text-xs sm:grid-cols-2">
<div className="capture-description-boundaries mt-3 grid grid-cols-1 gap-3 text-xs sm:grid-cols-2">
{(["start", "end"] as const).map((field) => (
<div key={field} className="min-w-0 space-y-1">
<label className="block">
@ -3259,18 +3262,21 @@ export function CaptureAnnotationWorkbench({
</div>
))}
</div>
<p className="mt-1 text-[11px] text-slate-400">
{selectingEnd
? "上下两组逐帧按钮同步画面、播放头和右边界;结束点不能越过下一段。"
: "结束点已锁定。普通播放不改变区间;可点击「调整结束点」重新定位。"}
</p>
<details className="capture-description-help" open={!focusedLayout}>
<summary>边界说明</summary>
<p className="mt-1 text-[11px] text-slate-400">
{selectingEnd
? "上下两组逐帧按钮同步画面、播放头和右边界;结束点不能越过下一段。"
: "结束点已锁定。普通播放不改变区间;可点击「调整结束点」重新定位。"}
</p>
</details>
{error ? (
<p role="alert" className="mt-2 text-xs text-red-600">
{error}
</p>
) : null}
<div className="mt-3 flex flex-wrap items-center justify-between gap-2 border-t border-slate-200 pt-3 dark:border-[#2a2b2f]">
{isNewAnnotation ? (
<div className="capture-description-actions mt-3 flex flex-wrap items-center justify-between gap-2 border-t border-slate-200 pt-3 dark:border-[#2a2b2f]">
{isNewAnnotation || focusedLayout ? (
<button
type="button"
disabled={saving}
@ -3283,7 +3289,7 @@ export function CaptureAnnotationWorkbench({
}}
className="text-xs text-slate-500"
>
取消新增
{isNewAnnotation ? "取消新增" : "取消编辑"}
</button>
) : null}
{!isNewAnnotation ? (
@ -3341,6 +3347,28 @@ export function CaptureAnnotationWorkbench({
)}
{phase !== "materializing" && !mediaOnly && (
<footer className="flex flex-wrap items-center justify-between gap-3 border-t border-slate-200 bg-slate-50 px-5 py-3 dark:border-[#202227] dark:bg-[#121316]">
{!isQualityReview && !readOnly ? (
<div className="capture-history-controls flex gap-2">
<button
type="button"
disabled={saving || readOnly}
onClick={() => void onHistoryCommand?.("undo")}
className="rounded border px-3 py-1 text-xs"
title="撤销(Ctrl / ⌘ + Z)"
>
撤销
</button>
<button
type="button"
disabled={saving || readOnly}
onClick={() => void onHistoryCommand?.("redo")}
className="rounded border px-3 py-1 text-xs"
title="重做(Ctrl / ⌘ + Shift + Z)"
>
重做
</button>
</div>
) : null}
{isQualityReview && !readOnly ? (
<>
<div className="flex items-center gap-2 text-xs text-slate-500 dark:text-gray-400">
@ -3446,26 +3474,6 @@ export function CaptureAnnotationWorkbench({
</>
) : phase === "slice" ? (
<>
<div className="capture-history-controls flex gap-2">
<button
type="button"
disabled={saving || readOnly}
onClick={() => void onHistoryCommand?.("undo")}
className="rounded border px-3 py-1 text-xs"
title="撤销(Ctrl / ⌘ + Z)"
>
撤销
</button>
<button
type="button"
disabled={saving || readOnly}
onClick={() => void onHistoryCommand?.("redo")}
className="rounded border px-3 py-1 text-xs"
title="重做(Ctrl / ⌘ + Shift + Z)"
>
重做
</button>
</div>
<span className="mr-auto text-xs text-amber-700">
{claimLocked
? "任务已归您处理;离开前请确认切片,未确认编辑离开后不保留。"

View File

@ -3450,7 +3450,7 @@ export default function AnnotationOperations({ workPage = false }: { workPage?:
const adaptiveSliceLayout = workspaceMode === "annotate" && tab === "queue" && combinedEditorPhase === "slice";
const focusedStageLayout =
workPage && workspaceLayout === "focused" && ["slice", "materializing"].includes(combinedEditorPhase);
workPage && workspaceLayout === "focused" && ["slice", "materializing", "annotate"].includes(combinedEditorPhase);
const recoverableWork = humanPools.mine.filter((item) =>
isOwnedRecoverableAnnotationItem(item, projectId, currentUser?.id),
);

View File

@ -718,3 +718,261 @@
.annotation-operations-page[data-workspace-compact] [data-testid="slice-disposition-panel"] .font-semibold {
max-width: 200px;
}
/* Annotation uses the same mounted transport and grid as slicing. Its two
timelines share the left bottom track; the existing editor owns the right. */
.annotation-operations-page[data-workspace-compact][data-workspace-stage="annotate"] {
display: flex;
flex-direction: column;
min-height: 0;
}
.annotation-operations-page[data-workspace-compact] > * {
margin-block: 0;
}
.annotation-operations-page[data-workspace-compact] .annotation-task-workspace,
.annotation-operations-page[data-workspace-compact] .annotation-task-detail,
.annotation-operations-page[data-workspace-compact] .capture-workbench-host,
.annotation-operations-page[data-workspace-compact] .capture-workbench {
flex: 1 1 0;
min-height: 0;
}
.annotation-operations-page[data-workspace-compact] .annotation-task-detail-panel,
.annotation-operations-page[data-workspace-compact] .annotation-task-detail,
.annotation-operations-page[data-workspace-compact] .capture-workbench-host {
display: flex;
flex-direction: column;
min-width: 0;
}
.annotation-operations-page[data-workspace-compact] .annotation-task-detail {
padding-bottom: 0;
}
.annotation-operations-page[data-workspace-compact] .annotation-task-detail > * {
margin-block: 0;
}
.annotation-operations-page[data-workspace-compact] [data-testid="capture-video-panel"] {
display: grid;
min-height: 0;
min-width: 0;
position: static;
padding: 0 !important;
}
.annotation-operations-page[data-workspace-compact] .capture-video-surface {
contain: size;
min-height: 0;
min-width: 0;
}
.annotation-operations-page[data-workspace-compact] .capture-video-surface > video {
height: 100% !important;
width: 100%;
min-height: 0;
min-width: 0;
}
.annotation-operations-page[data-workspace-compact][data-workspace-stage="annotate"] .capture-timeline-editor {
grid-template-rows: 14px 16px 30px;
align-self: start;
height: 64px;
}
.annotation-operations-page[data-workspace-compact][data-workspace-stage="annotate"]
.capture-timeline-editor
> div:first-of-type {
margin: 0;
font-size: 11px;
}
.annotation-operations-page[data-workspace-compact][data-workspace-stage="annotate"]
[data-testid="capture-slice-timeline"] {
height: 30px;
}
.annotation-operations-page[data-workspace-compact][data-workspace-stage="annotate"]
[data-testid="capture-slice-timeline"]
> .h-16 {
top: 2px;
height: 26px;
padding-block: 0;
}
.annotation-operations-page[data-workspace-compact] .capture-annotation-stage {
position: absolute;
right: 0;
top: 38px;
bottom: 168px;
width: var(--workspace-editor-width);
display: flex;
flex-direction: column;
padding: 6px;
gap: 4px;
background: var(--app-panel);
}
.annotation-operations-page[data-workspace-compact] .capture-annotation-heading {
margin: 0;
gap: 2px;
font-size: 11px;
}
.annotation-operations-page[data-workspace-compact] .capture-annotation-heading > div {
gap: 2px;
}
.annotation-operations-page[data-workspace-compact] .capture-annotation-heading h3 {
font-size: 12px;
}
.annotation-operations-page[data-workspace-compact] [data-testid="optional-annotation-hint"] {
margin: 0;
font-size: 10px;
}
.annotation-operations-page[data-workspace-compact] .capture-annotation-tools {
margin: 0;
gap: 4px;
}
.annotation-operations-page[data-workspace-compact] .capture-annotation-tools button {
padding: 3px 5px;
font-size: 11px;
}
.annotation-operations-page[data-workspace-compact] .capture-annotation-tools > [role="status"] {
font-size: 10px;
}
.annotation-operations-page[data-workspace-compact] [data-testid="slice-annotation-timeline"] {
position: fixed;
left: 20px;
bottom: 12px;
width: calc(100% - var(--workspace-editor-width) - var(--workspace-region-gap) - 40px);
min-height: 0;
height: 62px;
}
.annotation-operations-page[data-workspace-compact] [data-testid="slice-annotation-timeline"] > p {
display: none;
}
.annotation-operations-page[data-workspace-compact] [data-testid="annotation-description-editor"] {
flex: 1 1 0;
min-height: 0;
max-height: none;
margin: 0;
padding: 6px;
overflow: visible;
display: flex;
flex-direction: column;
gap: 4px;
box-shadow: none;
}
.annotation-operations-page[data-workspace-compact] [data-testid="annotation-description-editor"] > * {
margin: 0;
}
.annotation-operations-page[data-workspace-compact] [data-testid="annotation-description-editor"] > div:first-child {
gap: 4px;
}
.annotation-operations-page[data-workspace-compact]
[data-testid="annotation-description-editor"]
> div:first-child
> span {
font-size: 11px;
}
.annotation-operations-page[data-workspace-compact] [aria-label="动作描述"] {
flex: 1 1 60px;
min-height: 48px;
padding: 6px;
resize: none;
}
.annotation-operations-page[data-workspace-compact] .capture-description-boundaries {
gap: 6px;
font-size: 10px;
}
.annotation-operations-page[data-workspace-compact] .capture-description-boundaries input {
padding: 2px 4px;
margin-top: 2px;
}
.annotation-operations-page[data-workspace-compact] .capture-description-boundaries button {
padding: 1px 6px;
}
.annotation-operations-page[data-workspace-compact] .capture-description-actions {
flex: none;
padding-top: 4px;
gap: 4px;
}
.annotation-operations-page[data-workspace-compact] .capture-description-actions button {
padding: 4px 6px;
font-size: 11px;
}
.annotation-operations-page[data-workspace-compact][data-workspace-stage="annotate"]
[data-testid="slice-disposition-panel"] {
height: 42px;
padding: 4px 8px;
}
.annotation-operations-page[data-workspace-compact][data-workspace-stage="annotate"]
[data-testid="slice-disposition-panel"]
> p {
display: none;
}
.annotation-operations-page[data-workspace-compact][data-workspace-stage="annotate"]
[data-testid="slice-disposition-panel"]
button {
font-size: 11px;
padding: 3px 6px;
}
.annotation-operations-page[data-workspace-compact] dialog[open][aria-label="确认提交质检"],
.annotation-operations-page[data-workspace-compact] dialog[open][aria-label="请先处理未保存草稿"] {
display: flex;
flex-direction: column;
overflow: hidden;
}
.annotation-operations-page[data-workspace-compact] dialog[aria-label="确认提交质检"] > :nth-child(2),
.annotation-operations-page[data-workspace-compact] dialog[aria-label="请先处理未保存草稿"] > :nth-child(2) {
min-height: 0;
overflow: auto;
}
.annotation-operations-page[data-workspace-compact] [data-testid="slice-annotation-timeline"] > .top-9 {
top: 24px;
bottom: 4px;
}
.annotation-operations-page[data-workspace-compact] [data-testid="annotation-description-block"] {
top: 0;
height: 32px;
padding-block: 1px;
}
.annotation-operations-page[data-workspace-compact] [data-testid="annotation-description-block"] > .mt-1 {
display: none;
}
.capture-annotation-help,
.capture-description-help {
display: contents;
}
.capture-annotation-help > summary,
.capture-description-help > summary {
display: none;
}
.annotation-operations-page[data-workspace-compact] .capture-annotation-help,
.annotation-operations-page[data-workspace-compact] .capture-description-help {
display: block;
position: absolute;
right: 8px;
top: 6px;
font-size: 10px;
z-index: 35;
}
.annotation-operations-page[data-workspace-compact] .capture-annotation-help > summary,
.annotation-operations-page[data-workspace-compact] .capture-description-help > summary {
display: list-item;
cursor: pointer;
}
.annotation-operations-page[data-workspace-compact] .capture-annotation-help > p,
.annotation-operations-page[data-workspace-compact] .capture-description-help > p {
position: absolute;
right: 0;
top: 20px;
width: 300px;
max-height: 120px;
overflow: auto;
padding: 8px;
border: 1px solid var(--app-border);
border-radius: 6px;
background: var(--app-panel);
box-shadow: 0 4px 16px #0002;
}
.annotation-operations-page[data-workspace-compact] .annotation-task-heading .text-white {
color: var(--app-text);
}
.annotation-operations-page[data-workspace-compact] .capture-description-actions {
flex-wrap: nowrap;
gap: 3px;
}
.annotation-operations-page[data-workspace-compact] .capture-description-actions button {
padding: 4px 3px;
font-size: 10px;
white-space: nowrap;
}

View File

@ -0,0 +1,325 @@
// Real local UI/API acceptance: lost fixed editing geometry, remounted media,
// implicit saving or broken history must fail user-visible assertions here.
import assert from "node:assert/strict";
import { chromium } from "playwright";
const browser = await chromium.launch({
executablePath: "/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge",
headless: true,
args: ["--no-proxy-server"],
});
const context = await browser.newContext({
storageState: "local-data/verification/annotation-workspace-layout/auth.json",
viewport: { width: 1280, height: 640 },
});
const page = await context.newPage();
page.setDefaultTimeout(15000);
const task = process.env.ANNOTATION_TASK_ID || "annotation-task-workspace-layout-acceptance-annotate-primary";
assert.match(task, /^annotation-task-workspace-layout-acceptance-(annotate-primary|slice-primary|annotate-delayed)$/);
const button = (name) => page.getByRole("button", { name, exact: true });
const readItem = async () => {
const r = await context.request.get(
`http://127.0.0.1:5173/api/human-items/${task.replace("annotation-task-", "human-item-")}`,
);
assert.ok(r.ok());
return (await r.json()).item;
};
const reachable = async (locator, label) =>
assert.ok(
await locator.evaluate((e) => {
const r = e.getBoundingClientRect();
return (
r.x >= 0 &&
r.y >= 0 &&
r.right <= innerWidth &&
r.bottom <= innerHeight &&
e.contains(document.elementFromPoint(r.x + r.width / 2, r.y + r.height / 2))
);
}),
`${label} is visible and reachable without scrolling`,
);
const geometry = async () =>
page.evaluate(() => ({
videos: [...document.querySelectorAll("video")].map((v) => {
const r = v.getBoundingClientRect(),
s = Math.min(r.width / v.videoWidth, r.height / v.videoHeight);
return {
width: v.videoWidth * s,
height: v.videoHeight * s,
x: r.x,
y: r.y,
right: r.right,
bottom: r.bottom,
fit: getComputedStyle(v).objectFit,
};
}),
scrollers: [
document.documentElement,
...document.querySelectorAll("main, main > div,.annotation-operations-page,.capture-workbench-body"),
]
.filter((e) => e.scrollHeight > e.clientHeight + 1 && getComputedStyle(e).overflowY !== "visible")
.map((e) => e.className),
}));
let releaseStatus = () => {};
try {
if (process.env.ANNOTATION_VERIFY_SUBMITTED === "1") {
const item = await readItem();
assert.equal(item.currentStageId, "quality_review");
assert.ok(!item.pendingCombinedSubmissionId);
assert.ok(item.currentRevision > 0);
console.log(
"PASS completed handoff public readback",
JSON.stringify({
version: item.version,
currentStageId: item.currentStageId,
currentRevision: item.currentRevision,
status: item.status,
}),
);
} else {
await page.goto(
`http://127.0.0.1:5173/plugins/annotation-qa/workflows/all/work?projectId=project-workspace-layout-acceptance&taskId=${task}`,
);
await button("继续工作").click();
if (await button("进入专注视图").count()) await button("进入专注视图").click();
const workbench = page.getByTestId("capture-annotation-workbench");
await workbench.waitFor();
await page.waitForFunction(
() =>
document.querySelectorAll("video").length === 2 &&
[...document.querySelectorAll("video")].every((v) => v.readyState >= 2),
null,
{ timeout: 60000 },
);
await page.getByTestId("annotation-description-block").first().click();
const input = page.getByRole("textbox", { name: "动作描述", exact: true });
const original = await input.inputValue();
const value = `Task03 saved description ${Date.now()}`;
await input.fill(value);
const videos = await page.locator("video").elementHandles();
const editor = await input.elementHandle();
let previous = 0;
for (const [width, height] of [
[1280, 640],
[1366, 680],
[1440, 800],
[1920, 980],
[2560, 1320],
]) {
await page.setViewportSize({ width, height });
const g = await geometry();
console.log(JSON.stringify({ viewport: [width, height], ...g }));
for (const v of g.videos) {
assert.ok(v.width >= 400 && v.height >= 325, "each effective image meets 400×325 floor");
assert.equal(v.fit, "contain");
assert.ok(v.x >= 0 && v.y >= 0 && v.right <= width && v.bottom <= height);
}
assert.ok(g.videos[0].width >= previous);
previous = g.videos[0].width;
assert.deepEqual(g.scrollers, [], "no page/workbench scrolling");
await reachable(input, "description");
for (const name of [
"确认保存描述",
"调整结束点",
"删除此动作(保留空白)",
"取消编辑",
"完成任务并提交质检",
"撤销",
"重做",
"切回原布局",
"快捷键帮助",
"上一帧",
"下一帧",
])
await reachable(button(name), name);
const ed = await page.locator(".capture-description-actions").boundingBox();
const disposition = await page.getByTestId("slice-disposition-panel").boundingBox();
assert.ok(ed.y + ed.height <= disposition.y, "editor including save actions stays above disposition");
const r = await input.boundingBox();
assert.ok(r.x > g.videos[1].right, "editor remains right of both videos");
}
console.log("PASS five-size fixed annotation geometry");
await page.setViewportSize({ width: 1280, height: 640 });
await page.screenshot({ path: "local-data/verification/annotation-workspace-layout/task03-focused.png" });
const beforeConflict = await readItem();
const saveURL = `**/tasks/${task}/annotation-confirmations`;
await page.route(saveURL, async (route) => {
const payload = route.request().postDataJSON();
const response = await route.fetch({ postData: JSON.stringify({ ...payload, version: payload.version - 1 }) });
assert.equal(response.status(), 409, "real API rejects stale version");
await route.fulfill({ response });
});
await button("确认保存描述").click();
await page.getByTestId("annotation-description-editor").getByRole("alert").waitFor();
assert.equal(await input.inputValue(), value, "failed save retains text");
assert.equal((await readItem()).version, beforeConflict.version);
await reachable(button("确认保存描述"), "failed save retry");
await reachable(button("调整结束点"), "failed save boundary");
assert.deepEqual((await geometry()).scrollers, []);
await page.unroute(saveURL);
console.log("PASS real stale-version failure preserves draft and visible retry");
const before = await readItem();
const writes = [];
page.on("request", (r) => {
if (r.method() !== "GET" && /\/tasks\/|random-claims/.test(r.url())) writes.push(r.url());
});
for (const name of ["切回原布局", "进入专注视图"]) {
await button(name).click();
assert.equal(await input.inputValue(), value);
assert.ok(await editor.evaluate((e) => e.isConnected));
for (const v of videos) assert.ok(await v.evaluate((e) => e.isConnected));
}
assert.equal(writes.length, 0);
await input.press("Control+Enter");
await input.waitFor({ state: "detached" });
assert.equal((await readItem()).version, before.version + 1);
assert.ok((await readItem()).subject.payload.annotationWorkspace.segments.some((s) => s.description === value));
const mutation = () =>
page.waitForResponse((r) => r.url().endsWith("annotation-confirmations") && r.request().method() === "POST");
let response = mutation();
await button("撤销").click();
assert.ok((await response).ok());
assert.ok((await readItem()).subject.payload.annotationWorkspace.segments.some((s) => s.description === original));
await page.waitForTimeout(1100);
response = mutation();
await button("重做").click();
assert.ok((await response).ok());
assert.ok((await readItem()).subject.payload.annotationWorkspace.segments.some((s) => s.description === value));
assert.equal(writes.length, 3);
console.log("PASS exact public saved/undo/redo readback and stable media/editor");
const persistedBeforeCancel = await readItem();
await page.getByTestId("annotation-description-block").first().click();
await input.fill("应取消的未保存修改");
await button("取消编辑").click();
await input.waitFor({ state: "detached" });
assert.equal((await readItem()).version, persistedBeforeCancel.version);
await page.getByTestId("annotation-description-block").first().click();
assert.equal(await input.inputValue(), value, "cancel restores persisted text");
await button("取消编辑").click();
assert.equal(writes.length, 3, "cancel never saves");
console.log("PASS visible existing-edit cancel discards only the current buffer");
// Park a new draft in the second slice, then navigate and toggle with no implicit save.
await workbench.focus();
await page.keyboard.press("Control+ArrowRight");
await page.keyboard.press("n");
await button("确认结束点").waitFor();
for (let i = 0; i < 6; i++) await page.keyboard.press("ArrowRight");
await page.keyboard.press("n");
assert.ok(
await page.getByTestId("annotation-description-editor").evaluate((e) => e === document.activeElement),
"N ends at a frame and focuses the existing editor",
);
await page.keyboard.press("Enter");
assert.ok(await input.evaluate((e) => e === document.activeElement), "Enter enters text from the editor");
await input.fill("第二片未保存动作");
await reachable(button("取消新增"), "cancel");
await reachable(button("确认保存描述"), "save");
const start = await page.getByRole("spinbutton", { name: "动作开始时间(秒)" }).inputValue();
const end = await page.getByRole("spinbutton", { name: "动作结束时间(秒)" }).inputValue();
assert.ok(Number(end) > Number(start));
await workbench.focus();
await page.keyboard.press("Control+ArrowLeft");
await button("切回原布局").click();
await workbench.focus();
await page.keyboard.press("Control+ArrowRight");
await button("进入专注视图").click();
assert.equal(await input.inputValue(), "第二片未保存动作");
await button("完成任务并提交质检").click();
await page.getByRole("dialog", { name: "请先处理未保存草稿", exact: true }).waitFor();
await reachable(button("返回编辑"), "draft confirmation return");
await button("返回编辑").click();
assert.equal(writes.length, 3, "parked draft blocks stage writes");
await button("取消新增").click();
await workbench.focus();
await page.keyboard.press("Control+Enter");
const dialog = page.getByRole("dialog", { name: "确认提交质检", exact: true });
await dialog.waitFor();
await reachable(button("返回编辑"), "stage confirmation return");
await reachable(button("确认送检"), "stage confirmation");
assert.equal(writes.length, 3, "first confirmation does not submit");
await button("返回编辑").click();
console.log("PASS N/end/focus, per-slice draft, cancel and two-step submission guards");
if (process.env.ANNOTATION_SUBMIT === "1") {
assert.equal(
task,
"annotation-task-workspace-layout-acceptance-annotate-delayed",
"only consume the designated submission fixture",
);
const beforeSubmit = await readItem();
const statusGate = new Promise((r) => (releaseStatus = r));
const statusURL = `**/tasks/${task}/status`;
await page.route(statusURL, async (route) => {
await statusGate;
await route.continue();
});
await button("完成任务并提交质检").click();
await reachable(button("确认送检"), "actual send confirmation");
const submitted = page.waitForResponse(
(r) => r.url().endsWith("/combined-submissions") && r.request().method() === "POST",
);
await button("确认送检").click();
const submittedResponse = await submitted;
assert.ok(submittedResponse.ok());
const accepted = await submittedResponse.json();
console.log(
"Real submission accepted",
JSON.stringify({
beforeVersion: beforeSubmit.version,
acceptedVersion: accepted.item?.version,
status: accepted.status,
}),
);
assert.equal(accepted.status, "processing", "actual asynchronous preparation stays processing");
assert.equal(accepted.item.currentStageId, "annotation_combined");
assert.ok(accepted.item.pendingCombinedSubmissionId);
await page.locator(".workspace-status-details > summary").click();
await page.getByTestId("combined-submission-status").waitFor();
assert.match(await page.getByTestId("combined-submission-status").innerText(), /正在生成审核数据|提交处理中/);
assert.ok(
(await button("完成任务并提交质检").count()) === 0 || (await button("完成任务并提交质检").isDisabled()),
"processing cannot be submitted again",
);
assert.deepEqual((await geometry()).scrollers, []);
assert.equal(
writes.filter((u) => u.includes("random-claims")).length,
0,
"processing does not acquire another task",
);
await page.screenshot({ path: "local-data/verification/annotation-workspace-layout/task03-processing.png" });
releaseStatus();
await page.waitForFunction(() => document.body.innerText.includes("已提交质检"), null, { timeout: 120000 });
const completed = await readItem();
assert.equal(completed.currentStageId, "quality_review");
assert.ok(!completed.pendingCombinedSubmissionId);
assert.ok(completed.currentRevision > 0);
assert.equal(writes.filter((u) => u.endsWith("/combined-submissions")).length, 1);
assert.equal(
writes.filter((u) => u.includes("random-claims")).length,
0,
"stopped work stays stopped after real handoff",
);
console.log(
"PASS actual submission public readback",
JSON.stringify({
beforeVersion: beforeSubmit.version,
acceptedVersion: accepted.item.version,
completedVersion: completed.version,
currentStageId: completed.currentStageId,
currentRevision: completed.currentRevision,
}),
);
}
}
} catch (e) {
await page.screenshot({ path: "local-data/verification/annotation-workspace-layout/task03-error.png" });
console.log(await page.locator("body").innerText());
console.log(
await page
.locator(".capture-workbench, .annotation-task-workspace, .annotation-task-detail, .capture-workbench-host")
.evaluateAll((es) => es.map((e) => ({ class: e.className, rect: e.getBoundingClientRect().toJSON() }))),
);
throw e;
} finally {
releaseStatus();
await context.close();
await browser.close();
}

View File

@ -245,7 +245,9 @@ try {
// A fresh route entry preserves the original slice editor and its history.
page.on("dialog", (dialog) => dialog.accept());
await page.goto(baseURL + work.replace("annotate-primary", "slice-primary"), { waitUntil: "domcontentloaded" });
const sliceTask = process.env.ANNOTATION_SLICE_TASK_ID || "annotation-task-workspace-layout-acceptance-pool-01";
assert.match(sliceTask, /^annotation-task-workspace-layout-acceptance-pool-0[1-4]$/);
await page.goto(baseURL + work.replace(task, sliceTask), { waitUntil: "domcontentloaded" });
await page.getByRole("button", { name: "继续工作", exact: true }).click();
await workbench.waitFor();
await page.waitForFunction(() => [...document.querySelectorAll("video")].every((video) => video.readyState >= 2));