diff --git a/workbench/client/src/App.tsx b/workbench/client/src/App.tsx index b829204..e3b19c5 100644 --- a/workbench/client/src/App.tsx +++ b/workbench/client/src/App.tsx @@ -104,6 +104,10 @@ function App() { const [state, setState] = useState(); const [selected, setSelected] = useState(null); const [staged, setStaged] = useState([]); + const stagedRef = useRef([]); + const overrideUndoRef = useRef([]); + const overrideRedoRef = useRef([]); + stagedRef.current = staged; const [layers, setLayers] = useState(defaultLayers); const [scene, setScene] = useState(false); const [status, setStatus] = useState('正在加载工作台...'); @@ -216,6 +220,11 @@ function App() { const laneSelectionFeatures = useMemo(() => { if (!element || element.kind !== 'lane-maneuver' || !state) return []; const ids = new Set(element.featureIds); + const previewFeatures = preview?.turnArrows?.features.filter((feature) => { + const nativeId = feature.properties?.native_id; + return typeof nativeId === 'string' && ids.has(nativeId); + }); + if (previewFeatures?.length) return previewFeatures; const existing = state.layers.turnArrows?.features.filter((feature) => { const nativeId = feature.properties?.native_id; @@ -238,7 +247,7 @@ function App() { const distance = placementDistanceMeters ?? 6; if (!line || line.length < 2 || !maneuver) return []; return previewArrowFeatures(element.laneId, maneuver, line, distance); - }, [element, staged, state]); + }, [element, preview, staged, state]); const laneSelectionAxisAzimuth = useMemo(() => { if (!element || element.kind !== 'lane-maneuver' || !state) return null; const road = state.compiled.model.roads.find((item) => item.id === element.roadId); @@ -442,6 +451,14 @@ function App() { const undoEdit = () => { // 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 && overrideUndoRef.current.length) { + const previous = overrideUndoRef.current.pop() || []; + overrideRedoRef.current.push([...stagedRef.current]); + setStaged(previous); + previewOverrides([...state!.overrides.overrides, ...previous]); + touch(); + return; + } const reversed = session?.undo({ operationId: `operation:undo:${Date.now()}`, createdAt: new Date().toISOString(), @@ -451,6 +468,14 @@ function App() { previewSession(); }; const redoEdit = () => { + if (!session?.canRedo && overrideRedoRef.current.length) { + const next = overrideRedoRef.current.pop() || []; + overrideUndoRef.current.push([...stagedRef.current]); + setStaged(next); + previewOverrides([...state!.overrides.overrides, ...next]); + touch(); + return; + } if (!session?.redo()) return; touch(); previewSession(); @@ -462,6 +487,9 @@ function App() { overridePreviewRef.current = null; session.discard(); setStaged([]); + stagedRef.current = []; + overrideUndoRef.current = []; + overrideRedoRef.current = []; gesture.current = null; touch(); setPreview(null); @@ -547,13 +575,19 @@ function App() { const stage = (change: Override) => setStaged((current) => { const next = [...current.filter((item) => item.id !== change.id), change]; - if (change.kind === 'lane-maneuver' && state) previewOverrides([...state.overrides.overrides, ...next]); + if (change.kind === 'lane-maneuver') { + overrideUndoRef.current.push([...current.filter((item) => item.kind === 'lane-maneuver')]); + overrideRedoRef.current = []; + if (state) previewOverrides([...state.overrides.overrides, ...next]); + } return next; }); const save = async () => { if (!state || !staged.length) return true; overridePreviewRef.current?.abort(); overridePreviewRef.current = null; + overrideUndoRef.current = []; + overrideRedoRef.current = []; try { const overrides = [ ...state.overrides.overrides.filter((item) => !staged.some((change) => change.id === item.id)), @@ -659,10 +693,10 @@ function App() { - -