Compare commits

...
Author SHA1 Message Date
suyx 1713607572 fix(POSTV1-09): 展示项目生成图片
Dada P0-A isolated Windows CI / validate-and-package (push) Waiting to run
2026-08-05 19:00:07 +08:00
suyx e4aec01ea6 fix(POSTV1-08): 修复文字拖动闪烁与自动保存
Dada P0-A isolated Windows CI / validate-and-package (push) Waiting to run
2026-08-05 18:47:11 +08:00
suyx 468bb5579d fix(POSTV1-07): 自动关闭编辑器操作提示
Dada P0-A isolated Windows CI / validate-and-package (push) Waiting to run
2026-08-05 18:01:03 +08:00
suyx 9d2aa879e9 fix(POSTV1-07): 固定画布布局与文字贴纸选择
Dada P0-A isolated Windows CI / validate-and-package (push) Waiting to run
2026-08-05 17:59:53 +08:00
9 changed files with 505 additions and 90 deletions
+7 -3
View File
@@ -1,9 +1,12 @@
.editor-page-shell { .editor-page-shell {
min-height: 100vh; height: 100vh;
height: 100dvh;
min-height: 0;
display: grid; display: grid;
grid-template-rows: 56px minmax(0, 1fr) 32px; grid-template-rows: 56px minmax(0, 1fr) 32px;
background: #e8e8e5; background: #e8e8e5;
color: #111111; color: #111111;
overflow: hidden;
} }
.editor-page-shell :focus-visible { .editor-page-shell :focus-visible {
@@ -124,6 +127,7 @@
display: grid; display: grid;
grid-template-columns: 280px minmax(0, 1fr) 320px; grid-template-columns: 280px minmax(0, 1fr) 320px;
min-height: 0; min-height: 0;
overflow: hidden;
} }
.editor-assets-panel, .editor-assets-panel,
@@ -542,13 +546,13 @@
} }
@media (max-width: 760px) { @media (max-width: 760px) {
.editor-page-shell { grid-template-rows: auto minmax(0, 1fr) auto; } .editor-page-shell { height: auto; min-height: 100dvh; grid-template-rows: auto minmax(0, 1fr) auto; overflow: visible; }
.editor-toolbar { display: flex; min-height: 56px; flex-wrap: wrap; gap: 8px; padding: 8px 10px; } .editor-toolbar { display: flex; min-height: 56px; flex-wrap: wrap; gap: 8px; padding: 8px 10px; }
.editor-title { min-width: 0; flex: 1 1 calc(100% - 56px); } .editor-title { min-width: 0; flex: 1 1 calc(100% - 56px); }
.editor-history-actions { order: 3; } .editor-history-actions { order: 3; }
.editor-save-status { order: 4; flex: 1 1 128px; } .editor-save-status { order: 4; flex: 1 1 128px; }
.editor-toolbar-controls > button { display: block; order: 5; } .editor-toolbar-controls > button { display: block; order: 5; }
.editor-layout { grid-template-columns: 1fr; } .editor-layout { grid-template-columns: 1fr; overflow: visible; }
.editor-assets-panel, .editor-inspector { border: 0; } .editor-assets-panel, .editor-inspector { border: 0; }
.editor-assets-panel { order: 2; } .editor-assets-panel { order: 2; }
.editor-inspector { order: 3; } .editor-inspector { order: 3; }
+128 -40
View File
@@ -86,6 +86,14 @@ interface EditorExportResult {
status: ExportFlowStatus; status: ExportFlowStatus;
} }
function withTextDraft(canvasState: CanvasState, textEdit: TextEditState | undefined) {
if (!textEdit) return canvasState;
return {
...canvasState,
elements: canvasState.elements.map((element) => element.element_id === textEdit.elementId ? textEdit.draft : element),
};
}
interface EditorProject { interface EditorProject {
canvas_state?: CanvasState; canvas_state?: CanvasState;
created_at: string; created_at: string;
@@ -155,11 +163,26 @@ export function EditorPage({ projectId }: { projectId: string }) {
const elementControllerRef = useRef<CanvasElementController | undefined>(undefined); const elementControllerRef = useRef<CanvasElementController | undefined>(undefined);
const dragRef = useRef<{ base: CanvasState; last: CanvasState; selectedIds: string[] } | undefined>(undefined); const dragRef = useRef<{ base: CanvasState; last: CanvasState; selectedIds: string[] } | undefined>(undefined);
const opacityGestureRef = useRef<{ base: CanvasState; last: CanvasState; selectedIds: string[] } | undefined>(undefined); const opacityGestureRef = useRef<{ base: CanvasState; last: CanvasState; selectedIds: string[] } | undefined>(undefined);
const textHistoryRef = useRef<{ base: CanvasState; elementId: string; last: CanvasState } | undefined>(undefined);
const clipboardRef = useRef<CanvasElement[]>([]); const clipboardRef = useRef<CanvasElement[]>([]);
const fontLoaderRef = useRef<ArchivedFontLoader | undefined>(undefined); const fontLoaderRef = useRef<ArchivedFontLoader | undefined>(undefined);
const conflictExportGuardRef = useRef(new ConflictExportGuard()); const conflictExportGuardRef = useRef(new ConflictExportGuard());
const candidateMenuRef = useRef<HTMLDivElement | null>(null); const candidateMenuRef = useRef<HTMLDivElement | null>(null);
const candidateTriggerRef = useRef<HTMLButtonElement | null>(null); const candidateTriggerRef = useRef<HTMLButtonElement | null>(null);
const noticeTimerRef = useRef<ReturnType<typeof setTimeout> | undefined>(undefined);
function showNotice(message: string) {
if (noticeTimerRef.current) clearTimeout(noticeTimerRef.current);
setNotice(message);
noticeTimerRef.current = setTimeout(() => {
setNotice("");
noticeTimerRef.current = undefined;
}, 3_000);
}
useEffect(() => () => {
if (noticeTimerRef.current) clearTimeout(noticeTimerRef.current);
}, []);
useEffect(() => { useEffect(() => {
let active = true; let active = true;
@@ -175,7 +198,7 @@ export function EditorPage({ projectId }: { projectId: string }) {
setDraftAdjustments(initial.background.adjustments); setDraftAdjustments(initial.background.adjustments);
historyRef.current = new CanvasEditHistory(initial); historyRef.current = new CanvasEditHistory(initial);
elementControllerRef.current = new CanvasElementController(initial); elementControllerRef.current = new CanvasElementController(initial);
}).catch(() => { if (active) setNotice("编辑器暂时无法读取项目"); }); }).catch(() => { if (active) showNotice("编辑器暂时无法读取项目"); });
return () => { active = false; }; return () => { active = false; };
}, [projectId]); }, [projectId]);
@@ -261,6 +284,10 @@ export function EditorPage({ projectId }: { projectId: string }) {
}); });
}, [canvasState, selectedIds.join("|")]); }, [canvasState, selectedIds.join("|")]);
useEffect(() => {
if (textEdit) commitTextDraftAutomatically(textEdit);
}, [textEdit?.draft]);
async function ensureFont(fontId: string, url: string, retry = false) { async function ensureFont(fontId: string, url: string, retry = false) {
const current = fontStatuses[fontId]; const current = fontStatuses[fontId];
if (current === "ready" || (current === "unavailable" && !retry)) return current; if (current === "ready" || (current === "unavailable" && !retry)) return current;
@@ -277,24 +304,34 @@ export function EditorPage({ projectId }: { projectId: string }) {
await Promise.all(available.map((template) => ensureFont(template.defaultFontId, template.fontUrl!, true))); await Promise.all(available.map((template) => ensureFont(template.defaultFontId, template.fontUrl!, true)));
} }
function commitCanvas(next: CanvasState) { function finalizeTextHistory() {
const pending = textHistoryRef.current;
if (!pending) return undefined;
textHistoryRef.current = undefined;
historyRef.current?.commit(pending.last);
return pending.last;
}
function commitCanvas(next: CanvasState, options: { preserveTextEdit?: boolean } = {}) {
if (!project || saveStatus === "conflicted") return; if (!project || saveStatus === "conflicted") return;
historyRef.current?.commit(next); const finalizedText = finalizeTextHistory();
if (!finalizedText || JSON.stringify(finalizedText) !== JSON.stringify(next)) historyRef.current?.commit(next);
elementControllerRef.current?.replaceState(next); elementControllerRef.current?.replaceState(next);
setSelectedIds(elementControllerRef.current?.selectedIds ?? []); setSelectedIds(elementControllerRef.current?.selectedIds ?? []);
setCanvasState(next); setCanvasState(next);
setDraftAdjustments(next.background.adjustments); setDraftAdjustments(next.background.adjustments);
queueRef.current?.commit({ canvas_state: next, name: project.name }); queueRef.current?.commit({ canvas_state: next, name: project.name });
setTextEdit(undefined); if (!options.preserveTextEdit) setTextEdit(undefined);
} }
function applyPreview() { function applyPreview() {
if (!canvasState) return; if (!canvasState) return;
commitCanvas(updateBackgroundAdjustments(canvasState, draftAdjustments)); commitCanvas(updateBackgroundAdjustments(canvasState, draftAdjustments));
setNotice("底图调整已提交"); showNotice("底图调整已提交");
} }
function undo() { function undo() {
finalizeTextHistory();
const previous = historyRef.current?.undo(); const previous = historyRef.current?.undo();
if (previous) { if (previous) {
elementControllerRef.current?.replaceState(previous); elementControllerRef.current?.replaceState(previous);
@@ -307,6 +344,7 @@ export function EditorPage({ projectId }: { projectId: string }) {
} }
function redo() { function redo() {
finalizeTextHistory();
const next = historyRef.current?.redo(); const next = historyRef.current?.redo();
if (next) { if (next) {
elementControllerRef.current?.replaceState(next); elementControllerRef.current?.replaceState(next);
@@ -334,9 +372,9 @@ export function EditorPage({ projectId }: { projectId: string }) {
const palette = await paletteForAsset(pendingBackground); const palette = await paletteForAsset(pendingBackground);
commitCanvas(switchBackground(canvasState, pendingBackground, palette)); commitCanvas(switchBackground(canvasState, pendingBackground, palette));
setPendingBackground(undefined); setPendingBackground(undefined);
setNotice("已更换底图,覆盖元素保留,底图处理已重置"); showNotice("已更换底图,覆盖元素保留,底图处理已重置");
} catch { } catch {
setNotice("新底图无法读取,未更换底图或刷新色卡"); showNotice("新底图无法读取,未更换底图或刷新色卡");
} }
} }
@@ -353,7 +391,7 @@ export function EditorPage({ projectId }: { projectId: string }) {
commitCanvas(next); commitCanvas(next);
setGuides([]); setGuides([]);
setCandidateMenu(undefined); setCandidateMenu(undefined);
setNotice(message); showNotice(message);
} }
function addSticker(sticker: StaticStickerCatalogItem) { function addSticker(sticker: StaticStickerCatalogItem) {
@@ -369,8 +407,8 @@ export function EditorPage({ projectId }: { projectId: string }) {
})); }));
commitElementOperation(controller, "贴纸已加入画布"); commitElementOperation(controller, "贴纸已加入画布");
} catch (error) { } catch (error) {
if (error instanceof Error && error.message === "canvas_element_limit_reached") setNotice("画布最多 50 个元素,请先删除现有元素。"); if (error instanceof Error && error.message === "canvas_element_limit_reached") showNotice("画布最多 50 个元素,请先删除现有元素。");
else setNotice("贴纸未能加入画布"); else showNotice("贴纸未能加入画布");
} }
} }
@@ -383,8 +421,8 @@ export function EditorPage({ projectId }: { projectId: string }) {
controller.add(createColorCardElement(definition, palette, newElementIdentity(), canvasState.elements.length)); controller.add(createColorCardElement(definition, palette, newElementIdentity(), canvasState.elements.length));
commitElementOperation(controller, "色卡已按原始底图加入画布"); commitElementOperation(controller, "色卡已按原始底图加入画布");
} catch (error) { } catch (error) {
if (error instanceof Error && error.message === "canvas_element_limit_reached") setNotice("画布最多 50 个元素,请先删除现有元素。"); if (error instanceof Error && error.message === "canvas_element_limit_reached") showNotice("画布最多 50 个元素,请先删除现有元素。");
else setNotice("无法从原始底图稳定提取五色,色卡未加入画布"); else showNotice("无法从原始底图稳定提取五色,色卡未加入画布");
} }
} }
@@ -394,7 +432,7 @@ export function EditorPage({ projectId }: { projectId: string }) {
if (templateId === "DYN012") { if (templateId === "DYN012") {
const font = fontOption("FONT081"); const font = fontOption("FONT081");
if (!font || await ensureFont(font.fontId, font.url) !== "ready") { if (!font || await ensureFont(font.fontId, font.url) !== "ready") {
setNotice("DYN012 的 FONT081 替代字体不可用,未使用系统字体替代。"); showNotice("DYN012 的 FONT081 替代字体不可用,未使用系统字体替代。");
return; return;
} }
} }
@@ -407,8 +445,8 @@ export function EditorPage({ projectId }: { projectId: string }) {
commitElementOperation(controller, "动态值已确认并加入画布"); commitElementOperation(controller, "动态值已确认并加入画布");
setLocationDialog(undefined); setLocationDialog(undefined);
} catch (error) { } catch (error) {
if (error instanceof Error && error.message === "canvas_element_limit_reached") setNotice("画布最多 50 个元素,请先删除现有元素。"); if (error instanceof Error && error.message === "canvas_element_limit_reached") showNotice("画布最多 50 个元素,请先删除现有元素。");
else setNotice("动态贴纸未能加入画布"); else showNotice("动态贴纸未能加入画布");
} }
} }
@@ -456,7 +494,7 @@ export function EditorPage({ projectId }: { projectId: string }) {
controller.replaceElement(overrideDynamicStickerValue(element, value)); controller.replaceElement(overrideDynamicStickerValue(element, value));
commitElementOperation(controller, "动态贴纸显示文字已更新"); commitElementOperation(controller, "动态贴纸显示文字已更新");
} catch { } catch {
setNotice("动态贴纸显示文字不能为空"); showNotice("动态贴纸显示文字不能为空");
} }
} }
@@ -480,7 +518,7 @@ export function EditorPage({ projectId }: { projectId: string }) {
if (!template.fontUrl || !canvasState) return; if (!template.fontUrl || !canvasState) return;
const status = await ensureFont(template.defaultFontId, template.fontUrl); const status = await ensureFont(template.defaultFontId, template.fontUrl);
if (status !== "ready") { if (status !== "ready") {
setNotice("素材暂不可用,未使用系统字体替代。"); showNotice("素材暂不可用,未使用系统字体替代。");
return; return;
} }
const controller = controllerForCurrent(); const controller = controllerForCurrent();
@@ -490,8 +528,8 @@ export function EditorPage({ projectId }: { projectId: string }) {
commitElementOperation(controller, "文字模板已加入画布"); commitElementOperation(controller, "文字模板已加入画布");
void recordRecentTextTemplate(template.templateId, template.resourceVersion); void recordRecentTextTemplate(template.templateId, template.resourceVersion);
} catch (error) { } catch (error) {
if (error instanceof Error && error.message === "canvas_element_limit_reached") setNotice("画布最多 50 个元素,请先删除现有元素。"); if (error instanceof Error && error.message === "canvas_element_limit_reached") showNotice("画布最多 50 个元素,请先删除现有元素。");
else setNotice("文字模板未能加入画布"); else showNotice("文字模板未能加入画布");
} }
} }
@@ -503,18 +541,49 @@ export function EditorPage({ projectId }: { projectId: string }) {
action(edit); action(edit);
return { ...current, draft: edit.value }; return { ...current, draft: edit.value };
} catch { } catch {
setNotice("文字参数不在允许范围内"); showNotice("文字参数不在允许范围内");
return current; return current;
} }
}); });
} }
function commitTextDraftAutomatically(editState: TextEditState) {
if (!canvasState || !project || saveStatus === "conflicted") return;
const index = canvasState.elements.findIndex((element) => element.element_id === editState.elementId);
if (index < 0 || JSON.stringify(canvasState.elements[index]) === JSON.stringify(editState.draft)) return;
try {
const complete = new TextEditSession(editState.draft, P0A_TEXT_TEMPLATES).complete();
const next = structuredClone(canvasState);
next.elements[index] = complete;
const history = textHistoryRef.current;
if (!history || history.elementId !== editState.elementId) {
if (history) finalizeTextHistory();
textHistoryRef.current = { base: canvasState, elementId: editState.elementId, last: next };
} else {
history.last = next;
}
elementControllerRef.current?.replaceState(next);
setCanvasState(next);
queueRef.current?.commit({ canvas_state: next, name: project.name });
if (complete.template_or_asset_id !== editState.originalTemplateId) {
void recordRecentTextTemplate(complete.template_or_asset_id, complete.resource_version);
}
setTextEdit((current) => current?.elementId === editState.elementId ? {
...current,
draft: complete,
originalTemplateId: complete.template_or_asset_id,
} : current);
} catch (error) {
if (!(error instanceof Error && error.message === "text_content_required")) showNotice("文字编辑未能自动保存");
}
}
async function changeTextTemplate(templateId: string) { async function changeTextTemplate(templateId: string) {
const template = P0A_TEXT_TEMPLATES.find((candidate) => candidate.templateId === templateId); const template = P0A_TEXT_TEMPLATES.find((candidate) => candidate.templateId === templateId);
if (!template?.fontUrl) return; if (!template?.fontUrl) return;
const status = await ensureFont(template.defaultFontId, template.fontUrl); const status = await ensureFont(template.defaultFontId, template.fontUrl);
if (status !== "ready") { if (status !== "ready") {
setNotice("素材暂不可用,未使用系统字体替代。"); showNotice("素材暂不可用,未使用系统字体替代。");
return; return;
} }
updateTextDraft((edit) => edit.switchTemplate(templateId)); updateTextDraft((edit) => edit.switchTemplate(templateId));
@@ -527,7 +596,7 @@ export function EditorPage({ projectId }: { projectId: string }) {
} }
const option = fontOption(fontId); const option = fontOption(fontId);
if (!option || await ensureFont(option.fontId, option.url) !== "ready") { if (!option || await ensureFont(option.fontId, option.url) !== "ready") {
setNotice("字体素材暂不可用,未使用系统字体替代。"); showNotice("字体素材暂不可用,未使用系统字体替代。");
return; return;
} }
updateTextDraft((edit) => edit.setStyle({ fontOverride: fontId })); updateTextDraft((edit) => edit.setStyle({ fontOverride: fontId }));
@@ -535,6 +604,11 @@ export function EditorPage({ projectId }: { projectId: string }) {
function completeTextEdit() { function completeTextEdit() {
if (!textEdit) return; if (!textEdit) return;
if (!pendingTextDraft()) {
finalizeTextHistory();
showNotice("文字修改已进入自动保存");
return;
}
try { try {
const edit = new TextEditSession(textEdit.draft, P0A_TEXT_TEMPLATES); const edit = new TextEditSession(textEdit.draft, P0A_TEXT_TEMPLATES);
const complete = edit.complete(); const complete = edit.complete();
@@ -546,17 +620,25 @@ export function EditorPage({ projectId }: { projectId: string }) {
void recordRecentTextTemplate(complete.template_or_asset_id, complete.resource_version); void recordRecentTextTemplate(complete.template_or_asset_id, complete.resource_version);
} }
} catch (error) { } catch (error) {
if (error instanceof Error && error.message === "text_content_required") setNotice("请输入文字内容或删除该元素。"); if (error instanceof Error && error.message === "text_content_required") showNotice("请输入文字内容或删除该元素。");
else setNotice("文字编辑未能完成"); else showNotice("文字编辑未能完成");
} }
} }
function cancelTextEdit() { function cancelTextEdit() {
const pendingHistory = textHistoryRef.current;
if (pendingHistory && project) {
textHistoryRef.current = undefined;
elementControllerRef.current?.replaceState(pendingHistory.base);
setCanvasState(pendingHistory.base);
queueRef.current?.commit({ canvas_state: pendingHistory.base, name: project.name });
}
if (canvasState && textEdit) { if (canvasState && textEdit) {
const current = canvasState.elements.find((element) => element.element_id === textEdit.elementId); const source = pendingHistory?.base ?? canvasState;
const current = source.elements.find((element) => element.element_id === textEdit.elementId);
if (current) setTextEdit({ draft: structuredClone(current), elementId: current.element_id, originalTemplateId: current.template_or_asset_id }); if (current) setTextEdit({ draft: structuredClone(current), elementId: current.element_id, originalTemplateId: current.template_or_asset_id });
} }
setNotice("已取消未提交的文字修改"); showNotice("已取消未提交的文字修改");
} }
function pendingTextDraft() { function pendingTextDraft() {
@@ -624,7 +706,7 @@ export function EditorPage({ projectId }: { projectId: string }) {
return; return;
} }
const ran = await conflictExportGuardRef.current.run(() => executeExport(options)); const ran = await conflictExportGuardRef.current.run(() => executeExport(options));
if (!ran) setNotice("版本冲突时仅允许导出本页版本一次"); if (!ran) showNotice("版本冲突时仅允许导出本页版本一次");
} }
async function retryExportDownload() { async function retryExportDownload() {
@@ -639,8 +721,8 @@ export function EditorPage({ projectId }: { projectId: string }) {
action(controller); action(controller);
commitElementOperation(controller, message); commitElementOperation(controller, message);
} catch (error) { } catch (error) {
if (error instanceof Error && error.message === "canvas_element_limit_reached") setNotice("画布最多 50 个元素,请先删除现有元素。"); if (error instanceof Error && error.message === "canvas_element_limit_reached") showNotice("画布最多 50 个元素,请先删除现有元素。");
else setNotice("对象操作未完成"); else showNotice("对象操作未完成");
} }
} }
@@ -668,7 +750,7 @@ export function EditorPage({ projectId }: { projectId: string }) {
opacityGestureRef.current = undefined; opacityGestureRef.current = undefined;
if (gesture.last === gesture.base) return; if (gesture.last === gesture.base) return;
commitCanvas(gesture.last); commitCanvas(gesture.last);
setNotice("贴纸透明度已提交"); showNotice("贴纸透明度已提交");
} }
function duplicateSelection() { function duplicateSelection() {
@@ -688,7 +770,7 @@ export function EditorPage({ projectId }: { projectId: string }) {
const controller = controllerForCurrent(); const controller = controllerForCurrent();
if (!controller || selectedIds.length === 0) return; if (!controller || selectedIds.length === 0) return;
clipboardRef.current = controller.copySelected(); clipboardRef.current = controller.copySelected();
setNotice("已复制到画布剪贴板"); showNotice("已复制到画布剪贴板");
} }
function pasteSelection() { function pasteSelection() {
@@ -698,18 +780,20 @@ export function EditorPage({ projectId }: { projectId: string }) {
controller.pasteElements(clipboardRef.current, () => newElementIdentity()); controller.pasteElements(clipboardRef.current, () => newElementIdentity());
commitElementOperation(controller, "已粘贴画布对象"); commitElementOperation(controller, "已粘贴画布对象");
} catch (error) { } catch (error) {
if (error instanceof Error && error.message === "canvas_element_limit_reached") setNotice("画布最多 50 个元素,请先删除现有元素。"); if (error instanceof Error && error.message === "canvas_element_limit_reached") showNotice("画布最多 50 个元素,请先删除现有元素。");
} }
} }
function selectAt(point: CanvasPoint, append: boolean) { function selectAt(point: CanvasPoint, append: boolean) {
finalizeTextHistory();
const controller = controllerForCurrent(); const controller = controllerForCurrent();
if (!controller || !canvasState) return false; if (!controller || !canvasState) return false;
const candidates = controller.candidatesAt(point); const candidates = controller.candidatesAt(point);
const selection = controller.selectAt(point, { append: append || multiMode }); const selection = controller.selectAt(point, { append: append || multiMode });
setSelectedIds(selection); setSelectedIds(selection);
setCandidateMenu(undefined); setCandidateMenu(undefined);
dragRef.current = { base: canvasState, last: canvasState, selectedIds: selection }; const dragBase = withTextDraft(canvasState, textEdit);
dragRef.current = { base: dragBase, last: dragBase, selectedIds: selection };
return candidates.length > 0; return candidates.length > 0;
} }
@@ -721,19 +805,25 @@ export function EditorPage({ projectId }: { projectId: string }) {
const preview = previewController.moveSelected(delta); const preview = previewController.moveSelected(delta);
drag.last = preview.state; drag.last = preview.state;
setCanvasState(preview.state); setCanvasState(preview.state);
setTextEdit((current) => {
if (!current || !drag.selectedIds.includes(current.elementId)) return current;
const movedDraft = preview.state.elements.find((element) => element.element_id === current.elementId);
return movedDraft ? { ...current, draft: movedDraft } : current;
});
setGuides(preview.guides); setGuides(preview.guides);
} }
function commitMove() { function commitMove() {
const drag = dragRef.current; const drag = dragRef.current;
if (!drag) return; if (!drag) return;
commitCanvas(drag.last); commitCanvas(drag.last, { preserveTextEdit: true });
setNotice("对象位置已提交"); showNotice("对象位置已提交");
setGuides([]); setGuides([]);
dragRef.current = undefined; dragRef.current = undefined;
} }
function marqueeSelect(rectangle: CanvasRect, append: boolean) { function marqueeSelect(rectangle: CanvasRect, append: boolean) {
finalizeTextHistory();
const controller = controllerForCurrent(); const controller = controllerForCurrent();
if (!controller) return; if (!controller) return;
setSelectedIds(controller.marqueeSelect(rectangle, append || multiMode)); setSelectedIds(controller.marqueeSelect(rectangle, append || multiMode));
@@ -782,6 +872,7 @@ export function EditorPage({ projectId }: { projectId: string }) {
} }
function clearSelection() { function clearSelection() {
finalizeTextHistory();
elementControllerRef.current?.clearSelection(); elementControllerRef.current?.clearSelection();
setSelectedIds([]); setSelectedIds([]);
setCandidateMenu(undefined); setCandidateMenu(undefined);
@@ -789,10 +880,7 @@ export function EditorPage({ projectId }: { projectId: string }) {
} }
if (!project || !canvasState) return <main className="editor-loading" aria-live="polite"></main>; if (!project || !canvasState) return <main className="editor-loading" aria-live="polite"></main>;
const renderedCanvasState = textEdit ? { const renderedCanvasState = withTextDraft(canvasState, textEdit);
...canvasState,
elements: canvasState.elements.map((element) => element.element_id === textEdit.elementId ? textEdit.draft : element),
} : canvasState;
const imageUrl = `/api/v1/private-assets/projects/${projectId}/images/${canvasState.background.asset_id ?? project.current_image_id ?? ""}`; const imageUrl = `/api/v1/private-assets/projects/${projectId}/images/${canvasState.background.asset_id ?? project.current_image_id ?? ""}`;
const canEdit = saveStatus !== "conflicted"; const canEdit = saveStatus !== "conflicted";
const selectedElements = renderedCanvasState.elements.filter((element) => selectedIds.includes(element.element_id)); const selectedElements = renderedCanvasState.elements.filter((element) => selectedIds.includes(element.element_id));
@@ -869,7 +957,6 @@ export function EditorPage({ projectId }: { projectId: string }) {
maxWidth: `min(720px, calc(${(canvasState.pixel_width / canvasState.pixel_height * 100).toFixed(4)}vh - ${(canvasState.pixel_width / canvasState.pixel_height * 168).toFixed(4)}px))`, maxWidth: `min(720px, calc(${(canvasState.pixel_width / canvasState.pixel_height * 100).toFixed(4)}vh - ${(canvasState.pixel_width / canvasState.pixel_height * 168).toFixed(4)}px))`,
}}> }}>
<EditorStage <EditorStage
assetId={canvasState.background.asset_id}
canvasState={renderedCanvasState} canvasState={renderedCanvasState}
fontStatuses={fontStatuses} fontStatuses={fontStatuses}
guides={guides} guides={guides}
@@ -877,6 +964,7 @@ export function EditorPage({ projectId }: { projectId: string }) {
onClearSelection={clearSelection} onClearSelection={clearSelection}
onCopy={copySelection} onCopy={copySelection}
onDelete={deleteSelection} onDelete={deleteSelection}
onDragStart={() => setCandidateMenu(undefined)}
onMarquee={marqueeSelect} onMarquee={marqueeSelect}
onMoveCommit={commitMove} onMoveCommit={commitMove}
onMovePreview={previewMove} onMovePreview={previewMove}
+84 -24
View File
@@ -12,14 +12,18 @@ import { drawColorCard } from "./palette-provider.js";
interface Gesture { interface Gesture {
append: boolean; append: boolean;
bounds: DOMRect;
hit: boolean; hit: boolean;
longPressOpened: boolean; longPressOpened: boolean;
moved: boolean;
pointerId: number; pointerId: number;
start: CanvasPoint; start: CanvasPoint;
startClient: CanvasPoint;
} }
const DRAG_THRESHOLD_PX = 4;
interface EditorStageProps { interface EditorStageProps {
assetId: string | null;
canvasState: CanvasState; canvasState: CanvasState;
guides: readonly string[]; guides: readonly string[];
fontStatuses: Readonly<Record<string, ArchivedFontStatus>>; fontStatuses: Readonly<Record<string, ArchivedFontStatus>>;
@@ -27,6 +31,7 @@ interface EditorStageProps {
onClearSelection: () => void; onClearSelection: () => void;
onCopy: () => void; onCopy: () => void;
onDelete: () => void; onDelete: () => void;
onDragStart: () => void;
onMarquee: (rectangle: CanvasRect, append: boolean) => void; onMarquee: (rectangle: CanvasRect, append: boolean) => void;
onMoveCommit: () => void; onMoveCommit: () => void;
onMovePreview: (delta: CanvasPoint) => void; onMovePreview: (delta: CanvasPoint) => void;
@@ -38,11 +43,10 @@ interface EditorStageProps {
selectedIds: readonly string[]; selectedIds: readonly string[];
} }
function pointFromEvent(event: PointerEvent<HTMLCanvasElement>): CanvasPoint { function pointFromClient(clientX: number, clientY: number, bounds: DOMRect): CanvasPoint {
const bounds = event.currentTarget.getBoundingClientRect();
return { return {
x: Math.max(0, Math.min(1, (event.clientX - bounds.left) / bounds.width)), x: Math.max(0, Math.min(1, (clientX - bounds.left) / bounds.width)),
y: Math.max(0, Math.min(1, (event.clientY - bounds.top) / bounds.height)), y: Math.max(0, Math.min(1, (clientY - bounds.top) / bounds.height)),
}; };
} }
@@ -240,6 +244,27 @@ function loadCanvasImage(url: string) {
}); });
} }
type CanvasImageLoader = (url: string) => Promise<HTMLImageElement | undefined>;
interface SceneResources {
background: HTMLImageElement | undefined;
resourceImages: Readonly<Record<string, HTMLImageElement>>;
}
function createCachedCanvasImageLoader(): CanvasImageLoader {
const cache = new Map<string, Promise<HTMLImageElement | undefined>>();
return (url) => {
const cached = cache.get(url);
if (cached) return cached;
const pending = loadCanvasImage(url).then((image) => {
if (!image) cache.delete(url);
return image;
});
cache.set(url, pending);
return pending;
};
}
function resourceUrlsForCanvas(canvasState: CanvasState) { function resourceUrlsForCanvas(canvasState: CanvasState) {
const imageReferences = new Map<string, string>(); const imageReferences = new Map<string, string>();
for (const element of canvasState.elements) { for (const element of canvasState.elements) {
@@ -252,11 +277,19 @@ function resourceUrlsForCanvas(canvasState: CanvasState) {
return imageReferences; return imageReferences;
} }
async function loadSceneResources(canvasState: CanvasState, projectId: string) { function sceneResourceKey(canvasState: CanvasState, projectId: string) {
const background = canvasState.background.asset_id const background = canvasState.background.asset_id
? loadCanvasImage(`/api/v1/private-assets/projects/${encodeURIComponent(projectId)}/images/${encodeURIComponent(canvasState.background.asset_id)}`) ? `/api/v1/private-assets/projects/${encodeURIComponent(projectId)}/images/${encodeURIComponent(canvasState.background.asset_id)}`
: null;
const resources = [...resourceUrlsForCanvas(canvasState)].toSorted(([left], [right]) => left.localeCompare(right));
return JSON.stringify({ background, projectId, resources });
}
async function loadSceneResources(canvasState: CanvasState, projectId: string, loadImage: CanvasImageLoader = loadCanvasImage): Promise<SceneResources> {
const background = canvasState.background.asset_id
? loadImage(`/api/v1/private-assets/projects/${encodeURIComponent(projectId)}/images/${encodeURIComponent(canvasState.background.asset_id)}`)
: Promise.resolve(undefined); : Promise.resolve(undefined);
const resources = Promise.all([...resourceUrlsForCanvas(canvasState)].map(async ([assetId, url]) => [assetId, await loadCanvasImage(url)] as const)); const resources = Promise.all([...resourceUrlsForCanvas(canvasState)].map(async ([assetId, url]) => [assetId, await loadImage(url)] as const));
const [image, loaded] = await Promise.all([background, resources]); const [image, loaded] = await Promise.all([background, resources]);
return { return {
background: image, background: image,
@@ -314,16 +347,29 @@ export function EditorStage(props: EditorStageProps) {
const canvasRef = useRef<HTMLCanvasElement>(null); const canvasRef = useRef<HTMLCanvasElement>(null);
const gestureRef = useRef<Gesture | undefined>(undefined); const gestureRef = useRef<Gesture | undefined>(undefined);
const longPressRef = useRef<ReturnType<typeof setTimeout> | undefined>(undefined); const longPressRef = useRef<ReturnType<typeof setTimeout> | undefined>(undefined);
const imageLoaderRef = useRef<CanvasImageLoader | undefined>(undefined);
const [sceneResources, setSceneResources] = useState<{ key: string; resources: SceneResources }>();
const [marquee, setMarquee] = useState<CanvasRect>(); const [marquee, setMarquee] = useState<CanvasRect>();
const resourceKey = sceneResourceKey(props.canvasState, props.projectId);
if (!imageLoaderRef.current) imageLoaderRef.current = createCachedCanvasImageLoader();
useEffect(() => { useEffect(() => {
let active = true; let active = true;
void loadSceneResources(props.canvasState, props.projectId, imageLoaderRef.current).then((resources) => {
if (active) setSceneResources({ key: resourceKey, resources });
});
return () => { active = false; };
}, [props.projectId, resourceKey]);
useEffect(() => {
const canvas = canvasRef.current; const canvas = canvasRef.current;
if (!canvas) return undefined; if (!canvas) return undefined;
canvas.width = props.canvasState.pixel_width; if (canvas.width !== props.canvasState.pixel_width) canvas.width = props.canvasState.pixel_width;
canvas.height = props.canvasState.pixel_height; if (canvas.height !== props.canvasState.pixel_height) canvas.height = props.canvasState.pixel_height;
const context = canvas.getContext("2d"); const context = canvas.getContext("2d");
if (!context) return undefined; if (!context) return undefined;
if (!sceneResources || sceneResources.key !== resourceKey) return undefined;
const render = (image: HTMLImageElement | undefined, resourceImages: Readonly<Record<string, HTMLImageElement>>) => { const render = (image: HTMLImageElement | undefined, resourceImages: Readonly<Record<string, HTMLImageElement>>) => {
renderEditorScene(context, props.canvasState, props.fontStatuses, image, resourceImages); renderEditorScene(context, props.canvasState, props.fontStatuses, image, resourceImages);
context.lineWidth = 4; context.lineWidth = 4;
@@ -345,21 +391,22 @@ export function EditorStage(props: EditorStageProps) {
if (marquee) context.strokeRect(marquee.x * canvas.width, marquee.y * canvas.height, marquee.width * canvas.width, marquee.height * canvas.height); if (marquee) context.strokeRect(marquee.x * canvas.width, marquee.y * canvas.height, marquee.width * canvas.width, marquee.height * canvas.height);
context.restore(); context.restore();
}; };
void loadSceneResources(props.canvasState, props.projectId).then(({ background, resourceImages }) => { render(sceneResources.resources.background, sceneResources.resources.resourceImages);
if (!active) return; return undefined;
render(background, resourceImages); }, [marquee, props.canvasState, props.fontStatuses, props.guides, props.selectedIds, resourceKey, sceneResources]);
});
return () => { active = false; };
}, [marquee, props.assetId, props.canvasState, props.fontStatuses, props.guides, props.projectId, props.selectedIds]);
useEffect(() => () => { if (longPressRef.current) clearTimeout(longPressRef.current); }, []); useEffect(() => () => { if (longPressRef.current) clearTimeout(longPressRef.current); }, []);
function handlePointerDown(event: PointerEvent<HTMLCanvasElement>) { function handlePointerDown(event: PointerEvent<HTMLCanvasElement>) {
if (event.button !== 0) return; if (event.button !== 0) return;
const start = pointFromEvent(event); const bounds = event.currentTarget.getBoundingClientRect();
const start = pointFromClient(event.clientX, event.clientY, bounds);
const append = event.shiftKey; const append = event.shiftKey;
const hit = props.onSelect(start, append); const hit = props.onSelect(start, append);
gestureRef.current = { append, hit, longPressOpened: false, pointerId: event.pointerId, start }; gestureRef.current = {
append, bounds, hit, longPressOpened: false, moved: false, pointerId: event.pointerId, start,
startClient: { x: event.clientX, y: event.clientY },
};
event.currentTarget.setPointerCapture(event.pointerId); event.currentTarget.setPointerCapture(event.pointerId);
longPressRef.current = setTimeout(() => { longPressRef.current = setTimeout(() => {
const gesture = gestureRef.current; const gesture = gestureRef.current;
@@ -375,9 +422,15 @@ export function EditorStage(props: EditorStageProps) {
props.onPointerMoved(); props.onPointerMoved();
return; return;
} }
const point = pointFromEvent(event); const clientDistance = Math.hypot(event.clientX - gesture.startClient.x, event.clientY - gesture.startClient.y);
if (!gesture.moved) {
if (clientDistance < DRAG_THRESHOLD_PX) return;
gesture.moved = true;
gesture.longPressOpened = false;
props.onDragStart();
}
const point = pointFromClient(event.clientX, event.clientY, gesture.bounds);
const delta = { x: point.x - gesture.start.x, y: point.y - gesture.start.y }; const delta = { x: point.x - gesture.start.x, y: point.y - gesture.start.y };
if (Math.abs(delta.x) + Math.abs(delta.y) < 0.003) return;
if (longPressRef.current) clearTimeout(longPressRef.current); if (longPressRef.current) clearTimeout(longPressRef.current);
props.onPointerMoved(); props.onPointerMoved();
if (gesture.hit && !gesture.longPressOpened) props.onMovePreview(delta); if (gesture.hit && !gesture.longPressOpened) props.onMovePreview(delta);
@@ -388,11 +441,18 @@ export function EditorStage(props: EditorStageProps) {
const gesture = gestureRef.current; const gesture = gestureRef.current;
if (!gesture || gesture.pointerId !== event.pointerId) return; if (!gesture || gesture.pointerId !== event.pointerId) return;
if (longPressRef.current) clearTimeout(longPressRef.current); if (longPressRef.current) clearTimeout(longPressRef.current);
const point = pointFromEvent(event); const clientDistance = Math.hypot(event.clientX - gesture.startClient.x, event.clientY - gesture.startClient.y);
const delta = { x: point.x - gesture.start.x, y: point.y - gesture.start.y }; const moved = gesture.moved || clientDistance >= DRAG_THRESHOLD_PX;
const moved = Math.abs(delta.x) + Math.abs(delta.y) >= 0.003; if (moved && !gesture.moved && !gesture.longPressOpened) {
const point = pointFromClient(event.clientX, event.clientY, gesture.bounds);
const delta = { x: point.x - gesture.start.x, y: point.y - gesture.start.y };
if (gesture.hit) props.onMovePreview(delta);
}
if (gesture.hit && moved && !gesture.longPressOpened) props.onMoveCommit(); if (gesture.hit && moved && !gesture.longPressOpened) props.onMoveCommit();
else if (!gesture.hit && moved) props.onMarquee({ height: delta.y, width: delta.x, x: gesture.start.x, y: gesture.start.y }, gesture.append); else if (!gesture.hit && moved) {
const point = pointFromClient(event.clientX, event.clientY, gesture.bounds);
props.onMarquee({ height: point.y - gesture.start.y, width: point.x - gesture.start.x, x: gesture.start.x, y: gesture.start.y }, gesture.append);
}
setMarquee(undefined); setMarquee(undefined);
gestureRef.current = undefined; gestureRef.current = undefined;
event.currentTarget.releasePointerCapture(event.pointerId); event.currentTarget.releasePointerCapture(event.pointerId);
+25 -8
View File
@@ -592,15 +592,26 @@
height: 18px; height: 18px;
} }
.project-placeholder { .project-placeholder,
.project-preview {
display: grid; display: grid;
height: 154px; height: 154px;
grid-template-columns: repeat(4, 1fr);
overflow: hidden; overflow: hidden;
border-bottom: 1px solid #a5a59f; border-bottom: 1px solid #a5a59f;
background: #d8d8d3; background: #d8d8d3;
} }
.project-placeholder {
grid-template-columns: repeat(4, 1fr);
}
.project-preview img {
display: block;
width: 100%;
height: 100%;
object-fit: cover;
}
.project-placeholder span { .project-placeholder span {
display: grid; display: grid;
place-items: end center; place-items: end center;
@@ -935,9 +946,9 @@
font-size: 19px; font-size: 19px;
} }
.project-current > .project-placeholder { .project-current > .project-placeholder,
height: auto; .project-current > .project-preview {
min-height: 480px; height: 480px;
border: 1px solid #73736d; border: 1px solid #73736d;
} }
@@ -945,6 +956,10 @@
font-size: 80px; font-size: 80px;
} }
.project-current > .project-preview img {
object-fit: contain;
}
.project-actions { .project-actions {
display: grid; display: grid;
grid-template-columns: repeat(3, minmax(0, 1fr)); grid-template-columns: repeat(3, minmax(0, 1fr));
@@ -1013,7 +1028,8 @@
padding: 6px; padding: 6px;
} }
.project-history li .project-placeholder { .project-history li .project-placeholder,
.project-history li .project-preview {
height: 88px; height: 88px;
border: 0; border: 0;
} }
@@ -1439,8 +1455,9 @@
flex-direction: column; flex-direction: column;
} }
.project-current > .project-placeholder { .project-current > .project-placeholder,
min-height: 360px; .project-current > .project-preview {
height: 360px;
} }
.local-only-footer { .local-only-footer {
+49 -3
View File
@@ -231,6 +231,33 @@ function ProjectPlaceholder({ ratio, status }: { ratio: Ratio; status: ProjectSt
); );
} }
function ProjectPreview({ alt, imageId, loading = "lazy", projectId, ratio, status }: {
alt: string;
imageId: string | null;
loading?: "eager" | "lazy";
projectId: string;
ratio: Ratio;
status: ProjectStatus;
}) {
const [loadFailed, setLoadFailed] = useState(false);
useEffect(() => setLoadFailed(false), [imageId, projectId]);
if (!imageId || loadFailed) return <ProjectPlaceholder ratio={ratio} status={status} />;
return (
<div className="project-preview" data-ratio={ratio} data-status={status}>
<img
alt={alt}
decoding="async"
loading={loading}
onError={() => setLoadFailed(true)}
src={`/api/v1/private-assets/projects/${encodeURIComponent(projectId)}/images/${encodeURIComponent(imageId)}`}
/>
</div>
);
}
export function WorkspacePage() { export function WorkspacePage() {
const promptId = useId(); const promptId = useId();
const [session, setSession] = useState<SessionPayload>(); const [session, setSession] = useState<SessionPayload>();
@@ -568,7 +595,13 @@ function ProjectCard({ activeLimitReached, busy, onPurge, onRestore, onSelect, o
/> />
</label> </label>
) : null} ) : null}
<ProjectPlaceholder ratio={project.ratio} status={project.status} /> <ProjectPreview
alt={`${project.name}预览图`}
imageId={project.current_image_id}
projectId={project.project_id}
ratio={project.ratio}
status={project.status}
/>
<div className="project-card-body"> <div className="project-card-body">
<div><h3 title={project.name}>{project.name}</h3><span>{project.status === "failed_empty" ? "生成失败" : project.status === "trashed" ? "回收站" : "项目"}</span></div> <div><h3 title={project.name}>{project.name}</h3><span>{project.status === "failed_empty" ? "生成失败" : project.status === "trashed" ? "回收站" : "项目"}</span></div>
<p>{project.successful_image_count} · {project.ratio}</p> <p>{project.successful_image_count} · {project.ratio}</p>
@@ -953,7 +986,14 @@ export function ProjectDetailPage({ projectId }: { projectId: string }) {
<div className="project-detail-grid"> <div className="project-detail-grid">
<section className="project-current" aria-labelledby="current-image-title"> <section className="project-current" aria-labelledby="current-image-title">
<header><h2 id="current-image-title"></h2><span>{project.pixel_width ?? 1080} × {project.pixel_height ?? 1440}</span></header> <header><h2 id="current-image-title"></h2><span>{project.pixel_width ?? 1080} × {project.pixel_height ?? 1440}</span></header>
<ProjectPlaceholder ratio={project.ratio} status={project.status} /> <ProjectPreview
alt={`${project.name}当前底图`}
imageId={project.current_image_id}
loading="eager"
projectId={project.project_id}
ratio={project.ratio}
status={project.status}
/>
<div className="project-actions"> <div className="project-actions">
<button disabled={conflicted || atHistoryLimit} onClick={() => window.location.assign(`/app?continue=${project.project_id}`)} type="button"></button> <button disabled={conflicted || atHistoryLimit} onClick={() => window.location.assign(`/app?continue=${project.project_id}`)} type="button"></button>
{conflicted || !project.current_image_id ? <button disabled type="button"></button> : <a href={`/app/projects/${project.project_id}/editor`}></a>} {conflicted || !project.current_image_id ? <button disabled type="button"></button> : <a href={`/app/projects/${project.project_id}/editor`}></a>}
@@ -970,7 +1010,13 @@ export function ProjectDetailPage({ projectId }: { projectId: string }) {
<ol> <ol>
{project.images.toReversed().map((image, index) => ( {project.images.toReversed().map((image, index) => (
<li key={image.image_id} data-current={image.image_id === project.current_image_id}> <li key={image.image_id} data-current={image.image_id === project.current_image_id}>
<ProjectPlaceholder ratio={project.ratio} status="active" /> <ProjectPreview
alt={`生成结果 ${project.images.length - index}`}
imageId={image.image_id}
projectId={project.project_id}
ratio={project.ratio}
status="active"
/>
<div><strong> {project.images.length - index}</strong><time dateTime={image.created_at}>{formatUpdatedAt(image.created_at)}</time><a href={`/api/v1/private-assets/projects/${project.project_id}/images/${image.image_id}`}></a></div> <div><strong> {project.images.length - index}</strong><time dateTime={image.created_at}>{formatUpdatedAt(image.created_at)}</time><a href={`/api/v1/private-assets/projects/${project.project_id}/images/${image.image_id}`}></a></div>
</li> </li>
))} ))}
+32 -1
View File
@@ -33,6 +33,10 @@ function routeSession(page: Page) {
})); }));
} }
function generatedImageSvg(label: string) {
return `<svg xmlns="http://www.w3.org/2000/svg" width="300" height="400"><rect width="300" height="400" fill="#d9f24f"/><text x="150" y="210" text-anchor="middle">${label}</text></svg>`;
}
async function captureEvidence(page: Page, caseId: string, name: string) { async function captureEvidence(page: Page, caseId: string, name: string) {
const root = process.env.DADA_EVIDENCE_DIR_PROJECTS; const root = process.env.DADA_EVIDENCE_DIR_PROJECTS;
if (!root) return; if (!root) return;
@@ -75,6 +79,12 @@ test("TDD-WP2-PROJ-005 limits failed-empty selection on the project list", async
], ],
}), contentType: "application/json", status: 200, }), contentType: "application/json", status: 200,
})); }));
await page.route(`**/api/v1/private-assets/projects/${successId}/images/*`, (route) => route.fulfill({
body: generatedImageSvg("城市工作室"),
contentType: "image/svg+xml",
headers: { "Content-Disposition": "attachment; filename=\"dada-original.png\"" },
status: 200,
}));
let batchPayload: unknown; let batchPayload: unknown;
await page.route("**/api/v1/projects/failed-empty/trash", async (route) => { await page.route("**/api/v1/projects/failed-empty/trash", async (route) => {
batchPayload = route.request().postDataJSON(); batchPayload = route.request().postDataJSON();
@@ -86,6 +96,12 @@ test("TDD-WP2-PROJ-005 limits failed-empty selection on the project list", async
await expect(page.getByRole("heading", { name: "项目" })).toBeVisible(); await expect(page.getByRole("heading", { name: "项目" })).toBeVisible();
await expect(page.getByText("2 / 20 active")).toBeVisible(); await expect(page.getByText("2 / 20 active")).toBeVisible();
const projectPreview = page.getByRole("img", { name: "城市工作室预览图" });
await expect(projectPreview).toHaveAttribute(
"src",
`/api/v1/private-assets/projects/${successId}/images/00000000-0000-4000-8000-000000000213`,
);
await expect(projectPreview).toHaveCSS("object-fit", "cover");
await expect(page.getByLabel("选择失败草稿:失败草稿")).toBeVisible(); await expect(page.getByLabel("选择失败草稿:失败草稿")).toBeVisible();
await expect(page.getByLabel("选择失败草稿:城市工作室")).toHaveCount(0); await expect(page.getByLabel("选择失败草稿:城市工作室")).toHaveCount(0);
await page.getByLabel("选择失败草稿:失败草稿").check(); await page.getByLabel("选择失败草稿:失败草稿").check();
@@ -99,9 +115,10 @@ test("TDD-WP2-PROJ-005 limits failed-empty selection on the project list", async
test("TDD-WP2-PROJ-001 keeps ratio fixed and blocks an eleventh image in project detail", async ({ page }) => { test("TDD-WP2-PROJ-001 keeps ratio fixed and blocks an eleventh image in project detail", async ({ page }) => {
await routeSession(page); await routeSession(page);
const projectId = "00000000-0000-4000-8000-000000000221"; const projectId = "00000000-0000-4000-8000-000000000221";
const currentImageId = "00000000-0000-4000-8000-000000000222";
await page.route(`**/api/v1/projects/${projectId}`, (route) => route.fulfill({ await page.route(`**/api/v1/projects/${projectId}`, (route) => route.fulfill({
body: JSON.stringify({ body: JSON.stringify({
created_at: "2026-07-28T08:00:00.000Z", current_image_id: "00000000-0000-4000-8000-000000000222", created_at: "2026-07-28T08:00:00.000Z", current_image_id: currentImageId,
draft_prompt: "城市工作室", generations: [], images: Array.from({ length: 10 }, (_, index) => ({ draft_prompt: "城市工作室", generations: [], images: Array.from({ length: 10 }, (_, index) => ({
created_at: `2026-07-28T08:${String(index).padStart(2, "0")}:00.000Z`, created_at: `2026-07-28T08:${String(index).padStart(2, "0")}:00.000Z`,
generation_id: `00000000-0000-4000-8000-${String(223 + index).padStart(12, "0")}`, generation_id: `00000000-0000-4000-8000-${String(223 + index).padStart(12, "0")}`,
@@ -111,11 +128,25 @@ test("TDD-WP2-PROJ-001 keeps ratio fixed and blocks an eleventh image in project
status: "active", successful_image_count: 10, updated_at: "2026-07-28T08:10:00.000Z", status: "active", successful_image_count: 10, updated_at: "2026-07-28T08:10:00.000Z",
}), contentType: "application/json", status: 200, }), contentType: "application/json", status: 200,
})); }));
await page.route(`**/api/v1/private-assets/projects/${projectId}/images/*`, (route) => route.fulfill({
body: generatedImageSvg("生成结果"),
contentType: "image/svg+xml",
headers: { "Content-Disposition": "attachment; filename=\"dada-original.png\"" },
status: 200,
}));
await page.goto(`${webUrl}/app/projects/${projectId}`); await page.goto(`${webUrl}/app/projects/${projectId}`);
await expect(page.getByRole("heading", { name: "城市工作室" })).toBeVisible(); await expect(page.getByRole("heading", { name: "城市工作室" })).toBeVisible();
await expect(page.getByText("固定比例 3:4")).toBeVisible(); await expect(page.getByText("固定比例 3:4")).toBeVisible();
await expect(page.getByText("10 / 10 张成功图")).toBeVisible(); await expect(page.getByText("10 / 10 张成功图")).toBeVisible();
const currentImage = page.getByRole("img", { name: "城市工作室当前底图" });
await expect(currentImage).toHaveAttribute(
"src",
`/api/v1/private-assets/projects/${projectId}/images/${currentImageId}`,
);
await expect(currentImage).toHaveAttribute("loading", "eager");
await expect(currentImage).toHaveCSS("object-fit", "contain");
await expect(page.getByRole("img", { name: "生成结果 10" })).toBeVisible();
await expect(page.getByRole("button", { name: "继续生成" })).toBeDisabled(); await expect(page.getByRole("button", { name: "继续生成" })).toBeDisabled();
await expect(page.getByText("请先删除一张非当前底图的历史图")).toBeVisible(); await expect(page.getByText("请先删除一张非当前底图的历史图")).toBeVisible();
await expect(page.getByRole("radio")).toHaveCount(0); await expect(page.getByRole("radio")).toHaveCount(0);
+88
View File
@@ -5,6 +5,8 @@ import { homedir } from "node:os";
import { join, resolve } from "node:path"; import { join, resolve } from "node:path";
import type { CanvasState } from "@dada/shared-contracts"; import type { CanvasState } from "@dada/shared-contracts";
import { P0A_TEXT_TEMPLATES, createTextTemplateElement } from "../../apps/web/src/text-assets.js";
let vite: ViteDevServer; let vite: ViteDevServer;
let webUrl: string; let webUrl: string;
@@ -196,3 +198,89 @@ test("TDD-WP4-STK-001 transforms, cycles, selects and reopens ordinary stickers"
writeEvidence("TDD-WP4-STK-001-transform-sticker", "pixel-diff.json", { canvas_and_saved_state_match: true, export_source_canvas_state_stable: true }); writeEvidence("TDD-WP4-STK-001-transform-sticker", "pixel-diff.json", { canvas_and_saved_state_match: true, export_source_canvas_state_stable: true });
if (process.env.DADA_EVIDENCE_DIR_EDITOR_ELEMENTS) await page.screenshot({ fullPage: true, path: resolve(process.env.DADA_EVIDENCE_DIR_EDITOR_ELEMENTS, "TDD-WP4-STK-001-transform-sticker", "transformed-sticker.png") }); if (process.env.DADA_EVIDENCE_DIR_EDITOR_ELEMENTS) await page.screenshot({ fullPage: true, path: resolve(process.env.DADA_EVIDENCE_DIR_EDITOR_ELEMENTS, "TDD-WP4-STK-001-transform-sticker", "transformed-sticker.png") });
}); });
test("POSTV1-08 keeps the canvas frame stable and previews drag before pointer release", async ({ page }) => {
await page.addInitScript(() => {
const counters = { height: 0, width: 0 };
Object.defineProperty(window, "__dadaCanvasDimensionWrites", { value: counters });
for (const key of ["height", "width"] as const) {
const descriptor = Object.getOwnPropertyDescriptor(HTMLCanvasElement.prototype, key);
if (!descriptor?.get || !descriptor.set) throw new Error(`Canvas ${key} descriptor unavailable.`);
Object.defineProperty(HTMLCanvasElement.prototype, key, {
configurable: descriptor.configurable,
enumerable: descriptor.enumerable,
get: descriptor.get,
set(value: number) {
if (this.classList.contains("editor-canvas")) counters[key] += 1;
descriptor.set!.call(this, value);
},
});
}
});
const projectId = uuid(530);
const text = createTextTemplateElement(P0A_TEXT_TEMPLATES[0]!, {
createdAt: "2026-08-03T08:00:00.000Z",
elementId: uuid(630),
}, 0, { position: { x: 0.5, y: 0.5 } });
const backend = { canvas: canvas([text]), saves: 0, version: 6 };
await routeEditor(page, projectId, backend);
await page.goto(`${webUrl}/app/projects/${projectId}/editor`);
const stage = page.getByLabel("编辑画布");
const bounds = await stage.boundingBox();
if (!bounds) throw new Error("Canvas bounds unavailable.");
const center = { x: bounds.x + bounds.width * 0.5, y: bounds.y + bounds.height * 0.5 };
await page.mouse.click(center.x, center.y);
await expect(page.getByLabel("文字内容")).toBeVisible();
await page.getByLabel("文字内容").fill("拖动中的文字");
await page.getByRole("spinbutton", { name: "有效字号", exact: true }).fill("64");
await page.getByLabel("文字填充色").fill("#FA5751");
await expect.poll(() => backend.saves, { timeout: 4_000 }).toBe(1);
expect(backend.canvas.elements[0]).toMatchObject({
content: "拖动中的文字",
scale: { x: 64 / 48, y: 64 / 48 },
style_parameters: { fill_color: "#FA5751" },
});
const savesBeforeDrag = backend.saves;
const before = await page.evaluate(() => {
return structuredClone((window as typeof window & { __dadaCanvasDimensionWrites: { height: number; width: number } }).__dadaCanvasDimensionWrites);
});
await page.mouse.move(center.x, center.y);
await page.mouse.down();
await page.waitForTimeout(650);
await expect(page.getByRole("menu")).toBeVisible();
await page.mouse.move(bounds.x + bounds.width * 0.68, center.y);
await expect(page.getByRole("menu")).toBeHidden();
await expect(page.getByLabel("文字内容")).toBeVisible();
const preview = await stage.evaluate((canvas: HTMLCanvasElement) => {
const context = canvas.getContext("2d");
if (!context) throw new Error("Canvas context unavailable.");
const pixels = context.getImageData(0, 0, canvas.width, canvas.height).data;
let count = 0;
let totalX = 0;
for (let y = 0; y < canvas.height; y += 1) {
for (let x = 0; x < canvas.width; x += 1) {
const offset = (y * canvas.width + x) * 4;
if ((pixels[offset] ?? 255) < 20 && (pixels[offset + 1] ?? 0) >= 75 && (pixels[offset + 1] ?? 255) <= 120 && (pixels[offset + 2] ?? 0) >= 180) {
count += 1;
totalX += x;
}
}
}
return { blue_pixel_count: count, blue_x: count > 0 ? totalX / count / canvas.width : 0 };
});
const during = await page.evaluate(() => {
return structuredClone((window as typeof window & { __dadaCanvasDimensionWrites: { height: number; width: number } }).__dadaCanvasDimensionWrites);
});
expect(during).toEqual(before);
expect(preview.blue_pixel_count).toBeGreaterThan(100);
expect(preview.blue_x).toBeGreaterThan(0.60);
await page.mouse.up();
await expect.poll(() => backend.saves, { timeout: 4_000 }).toBeGreaterThan(savesBeforeDrag);
expect(backend.canvas.elements[0]?.position.x).toBeCloseTo(0.68, 2);
expect(backend.canvas.elements[0]?.content).toBe("拖动中的文字");
await expect(page.getByLabel("文字内容")).toBeVisible();
});
+78
View File
@@ -212,3 +212,81 @@ test("TDD-WP4-TXT-002 waits for the archived font and commits exact style ranges
writeEvidence("TDD-WP4-TXT-002-font-metrics-ranges", "pixel-diff.json", { background_alpha_separate: true, clipped_visible_text: false, effective_font_size: 96 }); writeEvidence("TDD-WP4-TXT-002-font-metrics-ranges", "pixel-diff.json", { background_alpha_separate: true, clipped_visible_text: false, effective_font_size: 96 });
if (process.env.DADA_EVIDENCE_DIR_TEXT_EDITOR) await page.screenshot({ fullPage: true, path: resolve(process.env.DADA_EVIDENCE_DIR_TEXT_EDITOR, "TDD-WP4-TXT-002-font-metrics-ranges", "font-styles.png") }); if (process.env.DADA_EVIDENCE_DIR_TEXT_EDITOR) await page.screenshot({ fullPage: true, path: resolve(process.env.DADA_EVIDENCE_DIR_TEXT_EDITOR, "TDD-WP4-TXT-002-font-metrics-ranges", "font-styles.png") });
}); });
test("POSTV1-07 keeps the canvas anchored when the text template panel opens", async ({ page }) => {
const projectId = uuid(760);
const backend: Backend = { canvas: emptyCanvas(), recent: [], saves: 0, version: 5 };
await routeEditor(page, projectId, backend);
await page.goto(`${webUrl}/app/projects/${projectId}/editor`);
const stage = page.getByLabel("编辑画布");
const before = await stage.boundingBox();
if (!before) throw new Error("Canvas geometry is unavailable before opening text templates.");
await page.getByRole("button", { name: "文字模板", exact: true }).click();
await expect(page.locator(".editor-template-grid button")).toHaveCount(32);
const after = await stage.boundingBox();
if (!after) throw new Error("Canvas geometry is unavailable after opening text templates.");
const assetsPanelScroll = await page.getByLabel("素材与底图来源").evaluate((panel) => ({
clientHeight: panel.clientHeight,
overflowY: getComputedStyle(panel).overflowY,
scrollHeight: panel.scrollHeight,
}));
expect(Math.abs(after.x - before.x)).toBeLessThanOrEqual(1);
expect(Math.abs(after.y - before.y)).toBeLessThanOrEqual(1);
expect(Math.abs(after.width - before.width)).toBeLessThanOrEqual(1);
expect(Math.abs(after.height - before.height)).toBeLessThanOrEqual(1);
expect(assetsPanelScroll.overflowY).toBe("auto");
expect(assetsPanelScroll.scrollHeight).toBeGreaterThan(assetsPanelScroll.clientHeight);
});
test("POSTV1-07 keeps text selection stable and dismisses move feedback", async ({ page }) => {
const projectId = uuid(770);
const backend: Backend = { canvas: emptyCanvas(), recent: [], saves: 0, version: 6 };
await routeEditor(page, projectId, backend);
await page.goto(`${webUrl}/app/projects/${projectId}/editor`);
await page.getByRole("button", { name: "文字模板", exact: true }).click();
await page.getByRole("button", { name: /H003 生活分享家/ }).click();
await expect.poll(() => backend.canvas.elements.length).toBe(1);
await expect.poll(() => backend.saves, { timeout: 5_000 }).toBeGreaterThan(0);
await page.reload();
const stage = page.getByLabel("编辑画布");
const bounds = await stage.boundingBox();
const element = backend.canvas.elements[0];
if (!bounds || !element) throw new Error("Text selection geometry is unavailable.");
const positionBefore = structuredClone(element.position);
const savesBefore = backend.saves;
const clientX = bounds.x + bounds.width * element.position.x;
const clientY = bounds.y + bounds.height * element.position.y;
await page.mouse.move(clientX, clientY);
await page.mouse.down();
await expect(page.getByLabel("字体覆盖")).toBeVisible();
const selectedBounds = await stage.boundingBox();
const inspectorScroll = await page.getByLabel("对象参数").evaluate((panel) => ({
clientHeight: panel.clientHeight,
overflowY: getComputedStyle(panel).overflowY,
scrollHeight: panel.scrollHeight,
}));
if (!selectedBounds) throw new Error("Canvas geometry is unavailable after selecting text.");
expect(Math.abs(selectedBounds.y - bounds.y)).toBeLessThanOrEqual(1);
expect(inspectorScroll.overflowY).toBe("auto");
expect(inspectorScroll.scrollHeight).toBeGreaterThan(inspectorScroll.clientHeight);
await page.mouse.move(clientX + 1, clientY);
await page.mouse.up();
await expect(page.getByLabel("字体覆盖")).toBeVisible();
await page.waitForTimeout(800);
expect(backend.canvas.elements[0]?.position).toEqual(positionBefore);
expect(backend.saves).toBe(savesBefore);
await page.mouse.move(clientX, clientY);
await page.mouse.down();
await page.mouse.move(clientX + 12, clientY);
await page.mouse.up();
await expect(page.getByText("对象位置已提交", { exact: true })).toBeVisible();
await expect.poll(() => backend.saves, { timeout: 5_000 }).toBeGreaterThan(savesBefore);
await expect(page.getByText("对象位置已提交", { exact: true })).toBeHidden({ timeout: 5_000 });
});
+14 -11
View File
@@ -78,7 +78,7 @@ async function routeEditor(page: Page, projectId: string, backend: Backend, opti
await page.route("**/api/v1/assets/public/p0a-complex-v1/*", (route) => route.fulfill({ body: readFileSync(windowsFont), contentType: "font/ttf" })); await page.route("**/api/v1/assets/public/p0a-complex-v1/*", (route) => route.fulfill({ body: readFileSync(windowsFont), contentType: "font/ttf" }));
} }
test("TDD-WP4-EXP-001 cancel keeps a pending text edit outside history and export", async ({ page }) => { test("TDD-WP4-EXP-001 cancel keeps automatically saved text outside the export", async ({ page }) => {
const projectId = "00000000-0000-4000-8000-000000000920"; const projectId = "00000000-0000-4000-8000-000000000920";
const assetId = "00000000-0000-4000-8000-000000000921"; const assetId = "00000000-0000-4000-8000-000000000921";
const backend: Backend = { canvas: canvasForRatio("3:4", assetId), latestBodies: [], saves: 0, version: 2 }; const backend: Backend = { canvas: canvasForRatio("3:4", assetId), latestBodies: [], saves: 0, version: 2 };
@@ -87,27 +87,29 @@ test("TDD-WP4-EXP-001 cancel keeps a pending text edit outside history and expor
await page.getByRole("button", { name: "文字模板", exact: true }).click(); await page.getByRole("button", { name: "文字模板", exact: true }).click();
await page.getByRole("button", { name: /FLOWER001 春日计划/ }).click(); await page.getByRole("button", { name: /FLOWER001 春日计划/ }).click();
await expect.poll(() => backend.saves, { timeout: 5_000 }).toBe(1); await expect.poll(() => backend.saves, { timeout: 5_000 }).toBe(1);
await page.getByLabel("文字内容").fill("尚未提交的导出文字"); await page.getByLabel("文字内容").fill("自动保存的导出文字");
await expect.poll(() => backend.saves, { timeout: 5_000 }).toBe(2);
const downloads: string[] = []; const downloads: string[] = [];
page.on("download", (download) => downloads.push(download.suggestedFilename())); page.on("download", (download) => downloads.push(download.suggestedFilename()));
await page.getByRole("button", { name: "导出", exact: true }).click(); await page.getByRole("button", { name: "导出", exact: true }).click();
const dialog = page.getByRole("dialog", { name: "导出成品" }); const dialog = page.getByRole("dialog", { name: "导出成品" });
await expect(dialog).toContainText("导出前需要提交当前修改"); await expect(dialog).not.toContainText("导出前需要提交当前修改");
await expect(dialog.getByText("将应用当前修改并导出", { exact: true })).toBeVisible(); await expect(dialog.getByRole("checkbox", { name: "将应用当前修改并导出" })).toHaveCount(0);
await dialog.getByRole("button", { name: "取消" }).click(); await dialog.getByRole("button", { name: "取消" }).click();
await expect(dialog).toHaveCount(0); await expect(dialog).toHaveCount(0);
await expect(page.getByLabel("文字内容")).toHaveValue("尚未提交的导出文字"); await expect(page.getByLabel("文字内容")).toHaveValue("自动保存的导出文字");
expect(backend.saves).toBe(1); expect(backend.saves).toBe(2);
expect(backend.canvas.elements[0]?.content).toBe("自动保存的导出文字");
expect(backend.latestBodies).toHaveLength(0); expect(backend.latestBodies).toHaveLength(0);
expect(downloads).toHaveLength(0); expect(downloads).toHaveLength(0);
const beforeUndo = { download_count: 0, latest_count: 0, save_count_after_cancel: backend.saves, state_version: backend.version }; const beforeUndo = { download_count: 0, latest_count: 0, save_count_after_cancel: backend.saves, state_version: backend.version };
await page.getByRole("button", { name: "撤销" }).click(); await page.getByRole("button", { name: "撤销" }).click();
await expect(page.getByLabel("文字内容")).toHaveCount(0); await expect(page.getByLabel("文字内容")).toHaveValue("春日计划");
evidence("TDD-WP4-EXP-001-cancel-pending-edit", "network-timeline.json", { ...beforeUndo, compose_calls: 0, export_save_calls: 0 }); evidence("TDD-WP4-EXP-001-cancel-pending-edit", "network-timeline.json", { ...beforeUndo, compose_calls: 0, export_save_calls: 0 });
evidence("TDD-WP4-EXP-001-cancel-pending-edit", "db-diff.json", { committed_text_after_cancel: "春日计划", first_undo_removed_initial_element: true, latest_exports_changed: false }); evidence("TDD-WP4-EXP-001-cancel-pending-edit", "db-diff.json", { committed_text_after_cancel: "自动保存的导出文字", first_undo_restored_initial_text: true, latest_exports_changed: false });
}); });
test("TDD-WP4-EXP-001 confirm commits once, downloads, and saves the same bytes", async ({ page }) => { test("TDD-WP4-EXP-001 exports automatically saved text and saves the same bytes", async ({ page }) => {
const projectId = "00000000-0000-4000-8000-000000000930"; const projectId = "00000000-0000-4000-8000-000000000930";
const assetId = "00000000-0000-4000-8000-000000000931"; const assetId = "00000000-0000-4000-8000-000000000931";
const backend: Backend = { canvas: canvasForRatio("3:4", assetId), latestBodies: [], saves: 0, version: 4 }; const backend: Backend = { canvas: canvasForRatio("3:4", assetId), latestBodies: [], saves: 0, version: 4 };
@@ -117,6 +119,7 @@ test("TDD-WP4-EXP-001 confirm commits once, downloads, and saves the same bytes"
await page.getByRole("button", { name: /FLOWER001 春日计划/ }).click(); await page.getByRole("button", { name: /FLOWER001 春日计划/ }).click();
await expect.poll(() => backend.saves, { timeout: 5_000 }).toBe(1); await expect.poll(() => backend.saves, { timeout: 5_000 }).toBe(1);
await page.getByLabel("文字内容").fill("确认后进入导出"); await page.getByLabel("文字内容").fill("确认后进入导出");
await expect.poll(() => backend.saves, { timeout: 5_000 }).toBe(2);
await page.getByRole("button", { name: "导出", exact: true }).click(); await page.getByRole("button", { name: "导出", exact: true }).click();
const dialog = page.getByRole("dialog", { name: "导出成品" }); const dialog = page.getByRole("dialog", { name: "导出成品" });
if (process.env.DADA_EVIDENCE_DIR_EXPORT) { if (process.env.DADA_EVIDENCE_DIR_EXPORT) {
@@ -124,14 +127,14 @@ test("TDD-WP4-EXP-001 confirm commits once, downloads, and saves the same bytes"
mkdirSync(dirname(screenshot), { recursive: true }); mkdirSync(dirname(screenshot), { recursive: true });
await page.screenshot({ fullPage: true, path: screenshot }); await page.screenshot({ fullPage: true, path: screenshot });
} }
await dialog.getByRole("checkbox", { name: "将应用当前修改并导出" }).check(); await expect(dialog.getByRole("checkbox", { name: "将应用当前修改并导出" })).toHaveCount(0);
const downloadPromise = page.waitForEvent("download"); const downloadPromise = page.waitForEvent("download");
await dialog.getByRole("button", { name: "导出并下载" }).click(); await dialog.getByRole("button", { name: "导出并下载" }).click();
const download = await downloadPromise; const download = await downloadPromise;
const downloadPath = await download.path(); const downloadPath = await download.path();
if (!downloadPath) throw new Error("Browser download did not expose a local path."); if (!downloadPath) throw new Error("Browser download did not expose a local path.");
await expect(dialog.getByRole("status")).toHaveText("已下载并保存为最新成品"); await expect(dialog.getByRole("status")).toHaveText("已下载并保存为最新成品");
await expect.poll(() => backend.saves).toBe(2); expect(backend.saves).toBe(2);
expect(backend.canvas.elements[0]?.content).toBe("确认后进入导出"); expect(backend.canvas.elements[0]?.content).toBe("确认后进入导出");
expect(backend.latestBodies).toHaveLength(1); expect(backend.latestBodies).toHaveLength(1);
const downloaded = readFileSync(downloadPath); const downloaded = readFileSync(downloadPath);