fix(canvas): 画布同步 - 版本冲突先核对并合并,本地保存与云端状态分开展示

本地持久化记录保存时间和日志令牌,同步面板区分本地与云端,不再用提示打断编辑。冲突时先尝试合并,无法合并才保留草稿并暂停自动提交;未登录时生成结果留在本地,登录后再继续上传。
This commit is contained in:
ddcat666 committed 2026-10-09 17:17:38 +08:00
1 parent 4175d82dc9
commit 080989ad5f
17 files changed
+539 -236

No files matched your search

@@ -52,8 +52,7 @@ export async function continueCreationConversationOnCanvas(source: SourceConvers
await flushCanvasStorePersistence();
assertScope();
try {
if (!hasRemoteUserDataSyncSession()) throw new Error("尚未建立云端同步会话");
await saveRemoteUserDataNow();
if (hasRemoteUserDataSyncSession()) await saveRemoteUserDataNow();
} catch (cause) { syncError = cause; }
} else {
const session: CanvasAssistantSession = { id: sessionId, title: source.title, createdAt: source.messages[0].createdAt, updatedAt: source.updatedAt, messages };