fix(grid): batch row delete updates
This commit is contained in:
1 parent
061240390e
commit
1e6ac0ccff
3 files changed
+139
-17
No files matched your search
@@ -4293,6 +4293,14 @@ const displayRowRefs = computed<DisplayRowRef[]>(() => {
|
|||||||
|
|
||||||
const displayRowCount = computed(() => displayRowRefs.value.length);
|
const displayRowCount = computed(() => displayRowRefs.value.length);
|
||||||
|
|
||||||
|
const displayRowIndexByIdLookup = computed(() => {
|
||||||
|
const lookup = new Map<number, number>();
|
||||||
|
displayRowRefs.value.forEach((ref, index) => {
|
||||||
|
lookup.set(ref.id, index);
|
||||||
|
});
|
||||||
|
return lookup;
|
||||||
|
});
|
||||||
|
|
||||||
function rowItemFromDisplayRef(ref: DisplayRowRef): RowItem {
|
function rowItemFromDisplayRef(ref: DisplayRowRef): RowItem {
|
||||||
if (ref.isNew) {
|
if (ref.isNew) {
|
||||||
return {
|
return {
|
||||||
@@ -4324,7 +4332,8 @@ function displayItemAt(rowIndex: number): RowItem | undefined {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function displayRowIndexById(rowId: number): number {
|
function displayRowIndexById(rowId: number): number {
|
||||||
return displayRowRefs.value.findIndex((ref) => ref.id === rowId);
|
// Multi-row actions call getRowItem for each selected row; keep that lookup O(1).
|
||||||
|
return displayRowIndexByIdLookup.value.get(rowId) ?? -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
const displayItems = computed<RowItem[]>(() => displayRowRefs.value.map(rowItemFromDisplayRef));
|
const displayItems = computed<RowItem[]>(() => displayRowRefs.value.map(rowItemFromDisplayRef));
|
||||||
|
|||||||
@@ -900,29 +900,57 @@ export function useDataGridEditor(options: UseDataGridEditorOptions) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function applyDeleteRow(rowId: number) {
|
function applyDeleteRows(rowIds: number[]) {
|
||||||
const item = getRowItem(rowId);
|
const items = rowIds.map((rowId) => getRowItem(rowId)).filter((item): item is RowItem => !!item);
|
||||||
if (!item) return;
|
if (items.length === 0) return;
|
||||||
if (item.isNew && item.newIndex !== undefined) {
|
|
||||||
if (isSavingNewRow(item)) return;
|
const newIndexes = new Set<number>();
|
||||||
pushUndoSnapshot();
|
const sourceIndexes = new Set<number>();
|
||||||
newRows.value.splice(item.newIndex, 1);
|
const deletedRowIds = new Set<number>();
|
||||||
|
|
||||||
|
for (const item of items) {
|
||||||
|
if (item.isNew && item.newIndex !== undefined) {
|
||||||
|
if (isSavingNewRow(item)) continue;
|
||||||
|
newIndexes.add(item.newIndex);
|
||||||
|
deletedRowIds.add(item.id);
|
||||||
|
} else if (item.sourceIndex !== undefined && canEditExistingRows.value) {
|
||||||
|
sourceIndexes.add(item.sourceIndex);
|
||||||
|
deletedRowIds.add(item.id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (newIndexes.size === 0 && sourceIndexes.size === 0) return;
|
||||||
|
|
||||||
|
// Batch row deletion into one reactive update so multi-row deletes do not
|
||||||
|
// rebuild the entire grid and undo history once per selected row.
|
||||||
|
pushUndoSnapshot();
|
||||||
|
if (newIndexes.size > 0) {
|
||||||
|
[...newIndexes]
|
||||||
|
.sort((a, b) => b - a)
|
||||||
|
.forEach((newIndex) => {
|
||||||
|
newRows.value.splice(newIndex, 1);
|
||||||
|
});
|
||||||
newRows.value = [...newRows.value];
|
newRows.value = [...newRows.value];
|
||||||
} else if (item.sourceIndex !== undefined) {
|
}
|
||||||
if (!canEditExistingRows.value) return;
|
if (sourceIndexes.size > 0) {
|
||||||
pushUndoSnapshot();
|
for (const sourceIndex of sourceIndexes) {
|
||||||
dirtyRows.value.delete(item.sourceIndex);
|
dirtyRows.value.delete(sourceIndex);
|
||||||
deletedRows.value.add(item.sourceIndex);
|
deletedRows.value.add(sourceIndex);
|
||||||
|
}
|
||||||
dirtyRows.value = new Map(dirtyRows.value);
|
dirtyRows.value = new Map(dirtyRows.value);
|
||||||
deletedRows.value = new Set(deletedRows.value);
|
deletedRows.value = new Set(deletedRows.value);
|
||||||
}
|
}
|
||||||
touchPendingChanges();
|
touchPendingChanges();
|
||||||
if (editingCell.value?.rowId === rowId) editingCell.value = null;
|
if (editingCell.value && deletedRowIds.has(editingCell.value.rowId)) editingCell.value = null;
|
||||||
if (useTransaction.value && !transactionActive.value) {
|
if (useTransaction.value && !transactionActive.value) {
|
||||||
enterTransaction();
|
enterTransaction();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function applyDeleteRow(rowId: number) {
|
||||||
|
applyDeleteRows([rowId]);
|
||||||
|
}
|
||||||
|
|
||||||
const showDeleteRowConfirm = ref(false);
|
const showDeleteRowConfirm = ref(false);
|
||||||
const pendingDeleteRowId = ref<number | null>(null);
|
const pendingDeleteRowId = ref<number | null>(null);
|
||||||
const pendingDeleteRowIds = ref<number[]>([]);
|
const pendingDeleteRowIds = ref<number[]>([]);
|
||||||
@@ -939,9 +967,7 @@ export function useDataGridEditor(options: UseDataGridEditorOptions) {
|
|||||||
|
|
||||||
function confirmDeleteRow() {
|
function confirmDeleteRow() {
|
||||||
if (pendingDeleteRowIds.value.length > 0) {
|
if (pendingDeleteRowIds.value.length > 0) {
|
||||||
for (const rowId of pendingDeleteRowIds.value) {
|
applyDeleteRows(pendingDeleteRowIds.value);
|
||||||
applyDeleteRow(rowId);
|
|
||||||
}
|
|
||||||
pendingDeleteRowIds.value = [];
|
pendingDeleteRowIds.value = [];
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -1404,6 +1430,7 @@ export function useDataGridEditor(options: UseDataGridEditorOptions) {
|
|||||||
addRow,
|
addRow,
|
||||||
cloneRow,
|
cloneRow,
|
||||||
cloneRows,
|
cloneRows,
|
||||||
|
applyDeleteRows,
|
||||||
applyDeleteRow,
|
applyDeleteRow,
|
||||||
showDeleteRowConfirm,
|
showDeleteRowConfirm,
|
||||||
pendingDeleteRowId,
|
pendingDeleteRowId,
|
||||||
|
|||||||
@@ -662,6 +662,92 @@ test("undo and redo cover row add and delete operations", () => {
|
|||||||
assert.deepEqual([...editor.deletedRows.value], [0]);
|
assert.deepEqual([...editor.deletedRows.value], [0]);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("batch row delete records a single undo snapshot", () => {
|
||||||
|
setActivePinia(createPinia());
|
||||||
|
installBrowserTestGlobals();
|
||||||
|
|
||||||
|
const result = computed(() => ({
|
||||||
|
columns: ["id", "name"],
|
||||||
|
rows: [
|
||||||
|
[1, "Ada"] as CellValue[],
|
||||||
|
[2, "Linus"] as CellValue[],
|
||||||
|
[3, "Grace"] as CellValue[],
|
||||||
|
],
|
||||||
|
}));
|
||||||
|
const rowStatusFilter = ref<"all" | "changed" | "edited" | "new" | "deleted">("all");
|
||||||
|
let editor: ReturnType<typeof useDataGridEditor>;
|
||||||
|
|
||||||
|
editor = useDataGridEditor({
|
||||||
|
result,
|
||||||
|
editable: computed(() => true),
|
||||||
|
databaseType: computed(() => "postgres"),
|
||||||
|
connectionId: computed(() => undefined),
|
||||||
|
database: computed(() => undefined),
|
||||||
|
tableMeta: computed(() => ({
|
||||||
|
tableName: "people",
|
||||||
|
columns: [column("id", true), column("name")],
|
||||||
|
primaryKeys: ["id"],
|
||||||
|
})),
|
||||||
|
onExecuteSql: computed(() => undefined),
|
||||||
|
customSaveHandler: computed(() => undefined),
|
||||||
|
sql: computed(() => "SELECT id, name FROM people"),
|
||||||
|
searchText: ref(""),
|
||||||
|
whereFilterInput: ref(""),
|
||||||
|
orderByInput: ref(""),
|
||||||
|
currentWhereInput: computed(() => undefined),
|
||||||
|
rowStatusFilter,
|
||||||
|
pageSize: ref(50),
|
||||||
|
currentPage: ref(1),
|
||||||
|
getRowItem: (rowId) => {
|
||||||
|
if (rowId >= 0 && result.value.rows[rowId]) {
|
||||||
|
return {
|
||||||
|
id: rowId,
|
||||||
|
sourceIndex: rowId,
|
||||||
|
data: result.value.rows[rowId],
|
||||||
|
isNew: false,
|
||||||
|
isDeleted: editor.deletedRows.value.has(rowId),
|
||||||
|
isDirtyCol: [false, editor.dirtyRows.value.get(rowId)?.has(1) ?? false],
|
||||||
|
status: editor.deletedRows.value.has(rowId) ? "deleted" : editor.dirtyRows.value.has(rowId) ? "edited" : "clean",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
if (rowId < 0) {
|
||||||
|
const newIndex = -rowId - 1;
|
||||||
|
const row = editor.newRows.value[newIndex];
|
||||||
|
if (!row) return undefined;
|
||||||
|
return {
|
||||||
|
id: rowId,
|
||||||
|
newIndex,
|
||||||
|
data: row,
|
||||||
|
isNew: true,
|
||||||
|
isDeleted: false,
|
||||||
|
isDirtyCol: [false, false],
|
||||||
|
status: "new",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
return undefined;
|
||||||
|
},
|
||||||
|
emit: () => {},
|
||||||
|
});
|
||||||
|
|
||||||
|
editor.applyDeleteRows([0, 1]);
|
||||||
|
assert.deepEqual([...editor.deletedRows.value], [0, 1]);
|
||||||
|
|
||||||
|
editor.undoPendingChange();
|
||||||
|
assert.deepEqual([...editor.deletedRows.value], []);
|
||||||
|
assert.equal(editor.canUndoPendingChange.value, false);
|
||||||
|
|
||||||
|
editor.redoPendingChange();
|
||||||
|
assert.deepEqual([...editor.deletedRows.value], [0, 1]);
|
||||||
|
|
||||||
|
editor.newRows.value = [
|
||||||
|
[4, "Katherine"],
|
||||||
|
[5, "Margaret"],
|
||||||
|
[6, "Donald"],
|
||||||
|
];
|
||||||
|
editor.applyDeleteRows([-1, -2]);
|
||||||
|
assert.deepEqual(editor.newRows.value, [[6, "Donald"]]);
|
||||||
|
});
|
||||||
|
|
||||||
test("undo and redo restore pending cell edits before save", () => {
|
test("undo and redo restore pending cell edits before save", () => {
|
||||||
setActivePinia(createPinia());
|
setActivePinia(createPinia());
|
||||||
installBrowserTestGlobals();
|
installBrowserTestGlobals();
|
||||||
|
|||||||
Reference in new issue
Block a user