fix(canvas): 画布 - 防止旧内容覆盖并支持版本历史恢复
This commit is contained in:
1 parent
b6bae4f957
commit
35ebed3097
69 files changed
+3575
-294
No files matched your search
@@ -100,6 +100,9 @@ import { deriveStoryboardPipelineProgress } from "@/lib/canvas/canvas-storyboard
|
||||
import { CanvasOperationChangeToast, CanvasMergeStatusToast, CanvasUploadStatusToast } from "./canvas-project-feedback";
|
||||
import { backendProviderConfig, getGenerationCount } from "@/lib/canvas/canvas-project-generation";
|
||||
import { cancelGenerationTask } from "@/services/api/task-center";
|
||||
import { CanvasSyncStatus } from "./canvas-sync-status";
|
||||
import { CanvasVersionHistory, useCanvasVersionHistory } from "./canvas-version-history";
|
||||
import { CanvasVersionPreview } from "./canvas-version-preview";
|
||||
import { CanvasTopBar } from "./canvas-project-top-bar";
|
||||
import { LibTVImportDialog } from "./components/libtv-import-dialog";
|
||||
import { TapNowImportDialog } from "./components/tapnow-import-dialog";
|
||||
@@ -333,17 +336,9 @@ function InfiniteCanvasPage() {
|
||||
const [titleDraft, setTitleDraft] = useState("");
|
||||
const [shortcutRequestNonce, setShortcutRequestNonce] = useState(0);
|
||||
const [cinematicAgentEntry, setCinematicAgentEntry] = useState(false);
|
||||
const { assistantOpen, closeAgent, openAgent } = useCanvasAssistantVisibility();
|
||||
const { assistantOpen, closeAgent, openAgent: openAssistant } = useCanvasAssistantVisibility();
|
||||
const agentMentionReferences = useMemo(() => buildCanvasAgentMentionReferences(nodes), [nodes]);
|
||||
|
||||
const sendSelectionToAgent = useCallback((nodeId?: string) => {
|
||||
const ids = nodeId ? [nodeId] : Array.from(selectedNodeIdsRef.current);
|
||||
const references = ids.map((id) => agentMentionReferences.find((reference) => reference.nodeId === id)).filter((reference): reference is CanvasResourceReference => Boolean(reference));
|
||||
if (!references.length) return;
|
||||
setAgentPrefillPrompt(`${references.map(canvasResourceMentionToken).join(" ")} `);
|
||||
openAgent();
|
||||
setContextMenu(null);
|
||||
}, [agentMentionReferences, openAgent]);
|
||||
const { tasks: activeTasks } = useCanvasActiveTasks(projectId, projectLoaded);
|
||||
const { focusMode, enterFocusMode, exitFocusMode, toggleFocusMode } = useFocusMode();
|
||||
const [focusDockRevealed, setFocusDockRevealed] = useState(false);
|
||||
@@ -427,7 +422,7 @@ function InfiniteCanvasPage() {
|
||||
[cleanupAssetImages, getHistoryCleanupContext],
|
||||
);
|
||||
|
||||
const { loadError, retryLoad, addedSkills, agentCreatedNodes, clearCanvasFiles, createAndOpenProject, currentProject, deleteCurrentProject, renameCurrentProject, saveCanvasProject, forceSaveCanvasProject, updateProject } = useCanvasProjectLifecycle({
|
||||
const { loadError, retryLoad, addedSkills, agentCreatedNodes, clearCanvasFiles, createAndOpenProject, currentProject, deleteCurrentProject, renameCurrentProject, reloadLatestCanvasProject, restoreCanvasProjectVersion, saveCanvasProject, forceSaveCanvasProject, updateProject } = useCanvasProjectLifecycle({
|
||||
projectId,
|
||||
projectLoaded,
|
||||
nodes,
|
||||
@@ -440,6 +435,8 @@ function InfiniteCanvasPage() {
|
||||
viewport,
|
||||
nodesRef,
|
||||
connectionsRef,
|
||||
chatSessionsRef,
|
||||
activeChatIdRef,
|
||||
viewportRef,
|
||||
historyPausedRef,
|
||||
setNodes,
|
||||
@@ -456,13 +453,24 @@ function InfiniteCanvasPage() {
|
||||
cleanupCanvasFiles,
|
||||
});
|
||||
|
||||
// 强制覆盖会改写云端版本并重绑媒体素材关联,必须让用户显式确认 destructive 语义。
|
||||
const versions = useCanvasVersionHistory(projectId, restoreCanvasProjectVersion);
|
||||
const openVersions = () => { closeAgent(); setVersionCompareRootId(null); versions.show(); };
|
||||
const openAgent = useCallback(() => { versions.close(); openAssistant(); }, [versions.close, openAssistant]);
|
||||
|
||||
const sendSelectionToAgent = useCallback((nodeId?: string) => {
|
||||
const ids = nodeId ? [nodeId] : Array.from(selectedNodeIdsRef.current);
|
||||
const references = ids.map((id) => agentMentionReferences.find((reference) => reference.nodeId === id)).filter((reference): reference is CanvasResourceReference => Boolean(reference));
|
||||
if (!references.length) return;
|
||||
setAgentPrefillPrompt(`${references.map(canvasResourceMentionToken).join(" ")} `);
|
||||
openAgent();
|
||||
setContextMenu(null);
|
||||
}, [agentMentionReferences, openAgent]);
|
||||
// 修复素材关联仍遵守当前画布版本,不能替用户确认覆盖云端的新内容。
|
||||
const confirmForceSaveCanvas = useCallback(() => {
|
||||
modal.confirm({
|
||||
title: "用本地内容强制覆盖云端?",
|
||||
content: "将把当前本地画布保存并覆盖云端版本,同时自动修复画布媒体与素材库的绑定(缺少素材记录时会按节点新建)。云端尚未同步到本地的改动会被覆盖。",
|
||||
okText: "强制覆盖保存",
|
||||
okButtonProps: { danger: true },
|
||||
title: "修复素材关联并保存?",
|
||||
content: "核对画布媒体与素材库的关联,补齐缺失素材后保存。若云端已有新版本,会保留本地草稿并提示加载最新版。",
|
||||
okText: "修复并保存",
|
||||
cancelText: "取消",
|
||||
onOk: () => forceSaveCanvasProject(),
|
||||
});
|
||||
@@ -478,7 +486,7 @@ function InfiniteCanvasPage() {
|
||||
connectionsRef.current = nextConnections;
|
||||
setNodes(nextNodes);
|
||||
setConnections(nextConnections);
|
||||
const saved = await saveCanvasProject();
|
||||
const saved = await saveCanvasProject({ requireRemote: false });
|
||||
if (!saved) {
|
||||
nodesRef.current = previousNodes;
|
||||
connectionsRef.current = previousConnections;
|
||||
@@ -499,7 +507,7 @@ function InfiniteCanvasPage() {
|
||||
connectionsRef.current = nextConnections;
|
||||
setNodes(nextNodes);
|
||||
setConnections(nextConnections);
|
||||
const saved = await saveCanvasProject();
|
||||
const saved = await saveCanvasProject({ requireRemote: false });
|
||||
if (!saved) {
|
||||
nodesRef.current = previousNodes;
|
||||
connectionsRef.current = previousConnections;
|
||||
@@ -1628,6 +1636,7 @@ function InfiniteCanvasPage() {
|
||||
}, [clearCanvasFiles, deselectCanvas, message, nodesRef, projectId, setEmotionNodeId]);
|
||||
|
||||
useCanvasKeyboard({
|
||||
enabled: projectLoaded && !versions.preview,
|
||||
nodesRef,
|
||||
selectedNodeIdsRef,
|
||||
selectedConnectionId,
|
||||
@@ -2341,13 +2350,17 @@ function InfiniteCanvasPage() {
|
||||
跳转到画布主内容
|
||||
</a>
|
||||
<main id="canvas-main" tabIndex={-1} className="flex h-full min-h-0 overflow-hidden outline-none" style={{ background: resolvedCanvasAppearance.background, color: theme.node.text }}>
|
||||
{!focusMode && shortDramaEnabled && currentProject?.projectId ? (
|
||||
{!focusMode && !versions.preview && shortDramaEnabled && currentProject?.projectId ? (
|
||||
<CanvasProjectSidebar projectId={currentProject.projectId} detail={linkedProjectQuery.data} onAddChapter={handleProjectChapterInsert} onLocateStyle={locateProjectStyleNode} onOpenAssets={() => openProjectAssets()} />
|
||||
) : null}
|
||||
<CanvasOverlayLayerProvider>
|
||||
<section className="relative min-w-0 flex-1 flex flex-col min-h-0 overflow-hidden">
|
||||
<div className="canvas-editor-shell relative flex min-w-0 flex-1">
|
||||
<section data-canvas-editor inert={Boolean(versions.preview)} style={{ visibility: versions.preview ? "hidden" : undefined, opacity: versions.preview ? 0 : undefined }} className="relative min-w-0 flex-1 flex flex-col min-h-0 overflow-hidden">
|
||||
{!focusMode ? (
|
||||
<CanvasTopBar
|
||||
syncStatus={<CanvasSyncStatus projectId={projectId} onLoadLatest={reloadLatestCanvasProject} onOpenVersions={openVersions} />}
|
||||
versionsOpen={versions.open}
|
||||
onToggleVersions={() => { closeAgent(); setVersionCompareRootId(null); versions.toggle(); }}
|
||||
title={currentProject?.title || "未命名画布"}
|
||||
titleDraft={titleDraft}
|
||||
isTitleEditing={titleEditing}
|
||||
@@ -2418,6 +2431,7 @@ function InfiniteCanvasPage() {
|
||||
<div className="relative flex min-h-0 min-w-0 flex-1">
|
||||
<div className="relative min-w-0 flex-1 overflow-hidden">
|
||||
<InfiniteCanvas
|
||||
interactive={!versions.preview}
|
||||
containerRef={containerRef}
|
||||
viewport={viewport}
|
||||
appearance={canvasAppearance}
|
||||
@@ -2537,6 +2551,9 @@ function InfiniteCanvasPage() {
|
||||
|
||||
{focusMode ? (
|
||||
<CanvasFocusModeBar
|
||||
syncStatus={<CanvasSyncStatus projectId={projectId} onLoadLatest={reloadLatestCanvasProject} onOpenVersions={openVersions} />}
|
||||
versionsOpen={versions.open}
|
||||
onToggleVersions={() => { closeAgent(); versions.toggle(); }}
|
||||
dockRevealed={focusDockRevealed}
|
||||
zoomPercent={viewport.k}
|
||||
onToggleDock={() => setFocusDockRevealed((value) => !value)}
|
||||
@@ -2593,10 +2610,12 @@ function InfiniteCanvasPage() {
|
||||
) : null}
|
||||
</div>
|
||||
|
||||
<div className={versions.open ? "hidden" : "contents"}>
|
||||
<CanvasCloudAgentPanel canvasId={projectId} domainProjectId={currentProject?.projectId} nodeCount={nodes.length} references={agentMentionReferences} prefillPrompt={agentPrefillPrompt} open={assistantOpen} onOpen={openAgent} onCollapse={closeAgent} onFocusNode={(nodeId) => {
|
||||
if (!nodesRef.current.some((node) => node.id === nodeId)) { message.info("该节点已删除或尚未同步到画布"); return; }
|
||||
focusCanvasNode(nodeId);
|
||||
}} />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{angleNode?.metadata?.content ? (
|
||||
@@ -3104,7 +3123,10 @@ function InfiniteCanvasPage() {
|
||||
onInsertFolder={projectAssetScope === "canvas" ? handleProjectFolderInsert : undefined}
|
||||
/>
|
||||
</section>
|
||||
{versions.preview ? <CanvasVersionPreview key={versions.preview.key} preview={versions.preview} onReturn={versions.returnToCurrent} onShowVersions={versions.show} /> : null}
|
||||
</div>
|
||||
</CanvasOverlayLayerProvider>
|
||||
<CanvasVersionHistory history={versions} />
|
||||
</main>
|
||||
</>
|
||||
);
|
||||
|
||||
Reference in new issue
Block a user