From bb6c51c4890bb69648b2fdc82fd86f0c87ca2a5d Mon Sep 17 00:00:00 2001 From: que01 Date: Wed, 2 Sep 2026 16:41:12 +0800 Subject: [PATCH] fix(workbench): preserve cross-domain undo order --- workbench/client/src/App.tsx | 35 +++++++++++++++++-- .../client/src/hooks/useTrafficSignalDraft.ts | 11 ++++-- 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/workbench/client/src/App.tsx b/workbench/client/src/App.tsx index a3e6da9..875450a 100644 --- a/workbench/client/src/App.tsx +++ b/workbench/client/src/App.tsx @@ -80,6 +80,15 @@ function App() { const [status, setStatus] = useState('正在加载工作台...'); const [filter, setFilter] = useState<'all' | 'candidates' | 'other'>('all'); const [marking, setMarking] = useState | null>(null); + const editOrderRef = useRef>([]); + const redoOrderRef = useRef>([]); + const recordSignalEdit = useMemo( + () => () => { + editOrderRef.current.push('signal'); + redoOrderRef.current = []; + }, + [], + ); const [editMode, setEditMode] = useState(() => { if (typeof window === 'undefined') return false; try { @@ -90,7 +99,7 @@ function App() { }); const overrideDraft = useOverrideDraft({ state, setState, setStatus }); const { staged, stage, save, clear: clearStaged } = overrideDraft; - const signalDraft = useTrafficSignalDraft({ state, setState }); + const signalDraft = useTrafficSignalDraft({ state, setState, onEdit: recordSignalEdit }); const { dirty: signalDirty, setDirty: setSignalDirty, @@ -393,6 +402,8 @@ function App() { if (!draft || !session) return; requester?.flush(draft); session.commit(draft.constraints ?? [], constraintIds, gestureIdentity()); + editOrderRef.current.push('session'); + redoOrderRef.current = []; gesture.current = null; touch(); }; @@ -471,9 +482,14 @@ function App() { ); }; const undoEdit = () => { + const domain = editOrderRef.current.at(-1); + if (domain === 'signal') { + editOrderRef.current.pop(); + redoOrderRef.current.push('signal'); + } // A saved gesture cannot be un-applied — persisted history is append-only — so // it is reversed by an inverse operation, which needs its own identity. - if (!session?.canUndo && signalUndoRef.current.length) { + if (domain === 'signal' && signalUndoRef.current.length) { const previous = signalUndoRef.current.pop()!; signalRedoRef.current.push(state?.trafficSignals.assemblies.features || []); setState((current) => @@ -491,6 +507,10 @@ function App() { setSignalDirty(true); return; } + if (domain === 'session') { + editOrderRef.current.pop(); + redoOrderRef.current.push('session'); + } const reversed = session?.undo({ operationId: `operation:undo:${Date.now()}`, createdAt: new Date().toISOString(), @@ -500,7 +520,10 @@ function App() { previewSession(); }; const redoEdit = () => { - if (!session?.canRedo && signalRedoRef.current.length) { + const domain = redoOrderRef.current.at(-1); + if (domain === 'signal' && signalRedoRef.current.length) { + redoOrderRef.current.pop(); + editOrderRef.current.push('signal'); const next = signalRedoRef.current.pop()!; signalUndoRef.current.push(state?.trafficSignals.assemblies.features || []); setState((current) => @@ -518,6 +541,10 @@ function App() { setSignalDirty(true); return; } + if (domain === 'session') { + redoOrderRef.current.pop(); + editOrderRef.current.push('session'); + } if (!session?.redo()) return; touch(); previewSession(); @@ -541,6 +568,8 @@ function App() { signalDraftRef.current = null; signalUndoRef.current = []; signalRedoRef.current = []; + editOrderRef.current = []; + redoOrderRef.current = []; setSignalDirty(false); clearStaged(); gesture.current = null; diff --git a/workbench/client/src/hooks/useTrafficSignalDraft.ts b/workbench/client/src/hooks/useTrafficSignalDraft.ts index dd8cfbc..8dbc377 100644 --- a/workbench/client/src/hooks/useTrafficSignalDraft.ts +++ b/workbench/client/src/hooks/useTrafficSignalDraft.ts @@ -32,9 +32,11 @@ const rotateFeatures = (features: GeoFeature[], uid: string, mastHeading: number export function useTrafficSignalDraft({ state, setState, + onEdit, }: { state?: WorkbenchState; setState: Dispatch>; + onEdit?: () => void; }) { const [dirty, setDirty] = useState(false); const draftRef = useRef(null); @@ -47,6 +49,7 @@ export function useTrafficSignalDraft({ const update = useCallback( async (features: GeoFeature[]) => { if (state) undoRef.current.push(state.trafficSignals.assemblies.features); + onEdit?.(); redoRef.current = []; draftRef.current = features; setDirty(true); @@ -62,7 +65,7 @@ export function useTrafficSignalDraft({ : current, ); }, - [setState, state], + [onEdit, setState, state], ); const move = useCallback( @@ -71,6 +74,7 @@ export function useTrafficSignalDraft({ if (!current) return current; if (!moveActiveRef.current) { undoRef.current.push(current.trafficSignals.assemblies.features); + onEdit?.(); redoRef.current = []; moveActiveRef.current = true; } @@ -95,7 +99,7 @@ export function useTrafficSignalDraft({ }); setDirty(true); }, - [setState], + [onEdit, setState], ); const finishMove = useCallback( @@ -120,6 +124,7 @@ export function useTrafficSignalDraft({ if (!current) return current; if (!rotateActiveRef.current) { undoRef.current.push(current.trafficSignals.assemblies.features); + onEdit?.(); redoRef.current = []; rotateActiveRef.current = true; } @@ -136,7 +141,7 @@ export function useTrafficSignalDraft({ }); setDirty(true); }, - [setState], + [onEdit, setState], ); const finishRotate = useCallback(