fix: 非连续删除 undo 恢复到错误位置 — OpRecord 新增 indices 精确记录原始位置

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
2026-05-26 21:57:21 +08:00
parent 26ab52483a
commit 2775a3a588
4 changed files with 58 additions and 9 deletions
+18 -4
View File
@@ -17,6 +17,8 @@ export interface OpRecord {
count: number;
oldPaths: string[];
newPaths: string[];
/** DELETE 操作专用:被删除的各路径的原始 index(升序) */
indices?: number[];
}
const DEFAULT_MAX_SIZE = 50;
@@ -54,8 +56,14 @@ export class UndoRedoManager {
target.splice(target.length - rec.count, rec.count);
break;
case OperationType.DELETE:
for (let i = 0; i < rec.count; i++) {
target.splice(rec.index + i, 0, rec.oldPaths[i]);
if (rec.indices) {
for (let i = 0; i < rec.indices.length; i++) {
target.splice(rec.indices[i], 0, rec.oldPaths[i]);
}
} else {
for (let i = 0; i < rec.count; i++) {
target.splice(rec.index + i, 0, rec.oldPaths[i]);
}
}
break;
case OperationType.EDIT:
@@ -95,8 +103,14 @@ export class UndoRedoManager {
target.push(...rec.newPaths);
break;
case OperationType.DELETE:
for (let i = rec.count - 1; i >= 0; i--) {
target.splice(rec.index + i, 1);
if (rec.indices) {
for (let i = rec.indices.length - 1; i >= 0; i--) {
target.splice(rec.indices[i], 1);
}
} else {
for (let i = rec.count - 1; i >= 0; i--) {
target.splice(rec.index + i, 1);
}
}
break;
case OperationType.EDIT:
+6 -5
View File
@@ -105,17 +105,18 @@ export const useAppStore = create<AppState>((set, get) => ({
if (indices.length === 0) return;
const state = get();
const list = target === TargetType.SYSTEM ? state.sysPaths : state.userPaths;
const sorted = [...indices].sort((a, b) => b - a);
const oldPaths = sorted.map((i) => list[i]);
const sortedDesc = [...indices].sort((a, b) => b - a);
const sortedAsc = [...indices].sort((a, b) => a - b);
const oldPaths = sortedAsc.map((i) => list[i]);
// 单条撤销记录覆盖全部删除
state.undoRedo.push({
type: OperationType.DELETE, target,
index: sorted[sorted.length - 1], count: sorted.length,
index: sortedAsc[0], count: sortedAsc.length,
oldPaths, newPaths: [],
indices: sortedAsc,
});
const toRemove = new Set(sorted);
const toRemove = new Set(sortedDesc);
const newList = list.filter((_, i) => !toRemove.has(i));
if (target === TargetType.SYSTEM) set({ sysPaths: newList, selectedIndices: [] });
else set({ userPaths: newList, selectedIndices: [] });