tt/ttstd-infinite-canvas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(assets): 复用生成素材身份并保留空缓存同步前的编辑 (#690)

Browse Source 
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Catlaxy AI
2026-10-06 09:24:06 +08:00
committed by GitHub
parent 67e2e1ebbf
commit 544daa4b9f
11 changed files with 798 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
web/src/lib/canvas/agent-canvas-patch.ts
View File

@@ -26,14 +26,14 @@ function equal(a: unknown, b: unknown): boolean {
// Three-way merge: untouched local fields (e.g. a drag or prompt edit) survive.
// A concurrently changed field or a deleted node is a conflict, never an overwrite.
function mergeValue(current: unknown, before: unknown, after: unknown): unknown {
export function mergeThreeWayValue(current: unknown, before: unknown, after: unknown): unknown {
if (equal(before, after) || equal(current, after)) return current;
if (equal(current, before)) return after;
if (record(current) && record(before) && record(after)) {
const next = { ...current };
for (const key of new Set([...Object.keys(before), ...Object.keys(after)])) {
if (["__proto__", "constructor", "prototype"].includes(key)) throw new Error("无效的画布增量字段");
const value = mergeValue(current[key], before[key], after[key]);
const value = mergeThreeWayValue(current[key], before[key], after[key]);
if (value === undefined) delete next[key];
else next[key] = value;
}
@@ -48,7 +48,7 @@ function mergeItems<T extends { id: string }>(items: T[], changes: Change<T>[]):
for (const { before, after } of changes) {
const id = after?.id || before?.id;
if (!id || (before && after && before.id !== after.id)) throw new Error("无效的画布增量节点");
const merged = mergeValue(next.get(id) ?? null, before, after) as T | null;
const merged = mergeThreeWayValue(next.get(id) ?? null, before, after) as T | null;
if (merged === null) next.delete(id);
else next.set(id, merged);
}
@@ -105,7 +105,7 @@ export function mergeAgentCanvasEditor(previous: CanvasProject, incoming: Canvas
const editor = editorState as CanvasProject & Record<string, unknown>;
for (const key of new Set([...Object.keys(before), ...Object.keys(after), ...Object.keys(editor)])) {
if (["id", "revision", "updatedAt", "remoteContentHash", "viewport", "nodes", "connections"].includes(key)) continue;
const value = mergeValue(editor[key], before[key], after[key]);
const value = mergeThreeWayValue(editor[key], before[key], after[key]);
if (value === undefined) delete merged[key];
else merged[key] = value;
}