Skip to content

armgit / dbx

Public Imported from GitHub
0

25 MB lightweight cross-platform database client for 100+ databases, including MySQL, PostgreSQL, SQLite, Redis, MongoDB, DuckDB, SQL Server, and Dameng. Built-in AI, MCP Server, CLI, desktop and Docker. | 轻量级跨平台数据库管理工具,支持 MySQL、PostgreSQL、SQLite、Redis、MongoDB、达梦等 100+ 数据库,提供桌面端、Docker、CLI、内置 AI 助手和 MCP。

fix(document): keep the grid scroll position after saving edits (#12810)

Loc Nguyen9c5bc4990220
diff --git a/apps/desktop/src/components/document/DocumentBrowser.vue b/apps/desktop/src/components/document/DocumentBrowser.vue
index 8ea29eccf1..c422b73420 100644
--- a/apps/desktop/src/components/document/DocumentBrowser.vue
+++ b/apps/desktop/src/components/document/DocumentBrowser.vue
@@ -1552,7 +1552,7 @@ async function gridSave(changes: DocumentGridChanges) {
}
await api.documentSaveMeilisearchBatch(props.connectionId, props.collection, updates, deleteIds, inserts);
- await reloadDocumentsAfterMutationOrRefresh();
+ await reloadDocumentsAfterGridSave();
return;
}
@@ -1624,7 +1624,7 @@ async function gridSave(changes: DocumentGridChanges) {
page.value = 0;
resetDynamoDbPagination();
}
- await reloadDocumentsAfterMutationOrRefresh();
+ await reloadDocumentsAfterGridSave();
}
function buildPathIdentityInsertDocument(row: MongoInputValue[], columns: string[], kind: Exclude<DocumentStoreKind, "mongodb">): JsonRecord {
@@ -2058,6 +2058,13 @@ async function refreshDocuments() {
await reloadDocumentsAfterMutationOrRefresh();
}
+async function reloadDocumentsAfterGridSave() {
+ // Reload like the grid's own Refresh so the viewport and selection survive
+ // instead of the new page being treated as a fresh result (#12649).
+ dataGridRef.value?.prepareFullReload?.();
+ await reloadDocumentsAfterMutationOrRefresh();
+}
+
async function reloadDocumentsAfterMutationOrRefresh() {
if (!settingsStore.editorSettings.infiniteScroll) {
await load();
diff --git a/apps/desktop/src/components/document/__tests__/DocumentBrowserInfiniteScroll.spec.ts b/apps/desktop/src/components/document/__tests__/DocumentBrowserInfiniteScroll.spec.ts
index be9d2e8618..556b818b4c 100644
--- a/apps/desktop/src/components/document/__tests__/DocumentBrowserInfiniteScroll.spec.ts
+++ b/apps/desktop/src/components/document/__tests__/DocumentBrowserInfiniteScroll.spec.ts
@@ -20,6 +20,7 @@ const dataGrid = vi.hoisted(() => ({
reload: undefined as (() => Promise<void>) | undefined,
save: undefined as ((changes: { dirtyRows: Map<number, Map<number, unknown>>; deletedRows: Set<number>; newRows: unknown[][]; newRowMeta: unknown[]; columns: string[]; rows: unknown[][] }) => Promise<void>) | undefined,
resetInfiniteScrollState: undefined as ReturnType<typeof vi.fn> | undefined,
+ prepareFullReload: undefined as ReturnType<typeof vi.fn> | undefined,
previousResult: undefined as { rows: readonly unknown[]; appended_from_row_count?: number } | undefined,
rows: [] as unknown[],
columns: [] as string[],
@@ -96,6 +97,8 @@ vi.mock("@/components/grid/DataGrid.vue", () => {
dataGrid.save = (props.customSaveHandler as { save?: typeof dataGrid.save } | undefined)?.save;
const resetInfiniteScrollState = vi.fn();
dataGrid.resetInfiniteScrollState = resetInfiniteScrollState;
+ const prepareFullReload = vi.fn();
+ dataGrid.prepareFullReload = prepareFullReload;
expose({
visibleColumnCount: 2,
displayableColumnCount: 2,
@@ -115,6 +118,7 @@ vi.mock("@/components/grid/DataGrid.vue", () => {
multiRowTranspose: false,
setMultiRowTranspose: vi.fn(),
resetInfiniteScrollState,
+ prepareFullReload,
});
return () => {
const result = props.result as { rows: unknown[]; columns?: string[]; appended_from_row_count?: number };
@@ -227,6 +231,7 @@ beforeEach(async () => {
dataGrid.reload = undefined;
dataGrid.save = undefined;
dataGrid.resetInfiniteScrollState = undefined;
+ dataGrid.prepareFullReload = undefined;
dataGrid.previousResult = undefined;
dataGrid.rows = [];
dataGrid.columns = [];
@@ -368,6 +373,42 @@ describe("DocumentBrowser infinite scroll (issue #6455)", () => {
expect(dataGrid.resetInfiniteScrollState).toHaveBeenCalledTimes(1);
});
+ it("prepares the grid's in-place reload before reloading after a save", async () => {
+ settings.editorSettings.infiniteScroll = false;
+ backend.documentFindDocuments.mockResolvedValueOnce(documentResult(1, 2, 4)).mockResolvedValueOnce(documentResult(1, 2, 4, { saved: true }));
+
+ await mountBrowser();
+ backend.documentFindDocuments.mockClear();
+ dataGrid.prepareFullReload!.mockImplementation(() => {
+ expect(backend.documentFindDocuments).not.toHaveBeenCalled();
+ });
+
+ await dataGrid.save!({
+ dirtyRows: new Map([[0, new Map([[1, "row_1_updated"]])]]),
+ deletedRows: new Set(),
+ newRows: [],
+ newRowMeta: [],
+ columns: [...dataGrid.columns],
+ rows: dataGrid.rows as unknown[][],
+ });
+ await flushUi();
+
+ // Without it the reloaded page reads as a new result and the grid jumps to the top (#12649).
+ expect(dataGrid.prepareFullReload).toHaveBeenCalledTimes(1);
+ expect(backend.documentFindDocuments).toHaveBeenCalledTimes(1);
+ });
+
+ it("leaves reload preparation to the grid for its own refresh", async () => {
+ settings.editorSettings.infiniteScroll = false;
+ backend.documentFindDocuments.mockResolvedValueOnce(documentResult(1, 2, 4)).mockResolvedValueOnce(documentResult(1, 2, 4));
+
+ await mountBrowser();
+ await dataGrid.reload!();
+ await flushUi();
+
+ expect(dataGrid.prepareFullReload).not.toHaveBeenCalled();
+ });
+
it("keeps the configured page size when the final capped segment has a smaller limit", async () => {
settings.editorSettings.tableOpenPageSize = 3;
backend.documentFindDocuments
diff --git a/apps/desktop/src/components/grid/DataGrid.vue b/apps/desktop/src/components/grid/DataGrid.vue
index 7f438ae6ad..61bc47548f 100644
--- a/apps/desktop/src/components/grid/DataGrid.vue
+++ b/apps/desktop/src/components/grid/DataGrid.vue
@@ -13722,6 +13722,7 @@ defineExpose({
onToolbarRefresh,
onToolbarCommit,
onToolbarRollback,
+ prepareFullReload,
resetInfiniteScrollState,
showDdl: showTableInfo,
toggleDdl: toggleTableInfo,