From 5ffd0bad6c7cca5f49a42d8b533719c0a91337ab Mon Sep 17 00:00:00 2001 From: t8y2 <1156263951@qq.com> Date: Thu, 18 Jun 2026 14:44:42 +0800 Subject: [PATCH] fix(settings): persist sidebar page size --- .../editor/EditorSettingsDialog.vue | 11 ++++---- apps/desktop/src/lib/http.ts | 24 +++++++++++++++--- apps/desktop/src/lib/tauri.ts | 1 + apps/desktop/src/stores/settingsStore.ts | 4 ++- crates/dbx-core/src/storage.rs | 25 +++++++++++++++++-- 5 files changed, 54 insertions(+), 11 deletions(-) diff --git a/apps/desktop/src/components/editor/EditorSettingsDialog.vue b/apps/desktop/src/components/editor/EditorSettingsDialog.vue index 49a1029314..bc3e61eabe 100644 --- a/apps/desktop/src/components/editor/EditorSettingsDialog.vue +++ b/apps/desktop/src/components/editor/EditorSettingsDialog.vue @@ -24,6 +24,7 @@ import { FONT_FAMILIES, DEFAULT_EDITOR_SETTINGS, DEFAULT_DESKTOP_SETTINGS, + DEFAULT_SIDEBAR_TABLE_PAGE_SIZE, type AiProvider, type AiApiStyle, type AiAuthMethod, @@ -101,7 +102,7 @@ const editAppLayout = ref(settingsStore.editorSettings.appLayout); const editShowTrayIcon = ref(settingsStore.desktopSettings.show_tray_icon); const editIconTheme = ref(settingsStore.desktopSettings.icon_theme); const editDebugLoggingEnabled = ref(settingsStore.desktopSettings.debug_logging_enabled); -const editSidebarTablePageSize = ref(settingsStore.desktopSettings.sidebar_table_page_size ?? 500); +const editSidebarTablePageSize = ref(settingsStore.desktopSettings.sidebar_table_page_size ?? DEFAULT_SIDEBAR_TABLE_PAGE_SIZE); const debugLogCopied = ref(false); const debugLogDownloaded = ref(false); const editShowColumnCommentsInHeader = ref(settingsStore.editorSettings.showColumnCommentsInHeader); @@ -347,7 +348,7 @@ watch( editShowTrayIcon.value = settingsStore.desktopSettings.show_tray_icon; editIconTheme.value = settingsStore.desktopSettings.icon_theme; editDebugLoggingEnabled.value = settingsStore.desktopSettings.debug_logging_enabled; - editSidebarTablePageSize.value = settingsStore.desktopSettings.sidebar_table_page_size ?? 500; + editSidebarTablePageSize.value = settingsStore.desktopSettings.sidebar_table_page_size ?? DEFAULT_SIDEBAR_TABLE_PAGE_SIZE; editShowColumnCommentsInHeader.value = settingsStore.editorSettings.showColumnCommentsInHeader; editShowColumnTypesInHeader.value = settingsStore.editorSettings.showColumnTypesInHeader; editCompactColumnHeaderActions.value = settingsStore.editorSettings.compactColumnHeaderActions; @@ -404,7 +405,7 @@ function hasChanges(): boolean { editShowTrayIcon.value !== settingsStore.desktopSettings.show_tray_icon || editIconTheme.value !== settingsStore.desktopSettings.icon_theme || editDebugLoggingEnabled.value !== settingsStore.desktopSettings.debug_logging_enabled || - editSidebarTablePageSize.value !== (settingsStore.desktopSettings.sidebar_table_page_size ?? 500) || + editSidebarTablePageSize.value !== (settingsStore.desktopSettings.sidebar_table_page_size ?? DEFAULT_SIDEBAR_TABLE_PAGE_SIZE) || editShowColumnCommentsInHeader.value !== settingsStore.editorSettings.showColumnCommentsInHeader || editShowColumnTypesInHeader.value !== settingsStore.editorSettings.showColumnTypesInHeader || editCompactColumnHeaderActions.value !== settingsStore.editorSettings.compactColumnHeaderActions || @@ -497,7 +498,7 @@ function resetDefaults() { editShowTrayIcon.value = DEFAULT_DESKTOP_SETTINGS.show_tray_icon; editIconTheme.value = DEFAULT_DESKTOP_SETTINGS.icon_theme; editDebugLoggingEnabled.value = DEFAULT_DESKTOP_SETTINGS.debug_logging_enabled; - editSidebarTablePageSize.value = 500; + editSidebarTablePageSize.value = DEFAULT_SIDEBAR_TABLE_PAGE_SIZE; editShowColumnCommentsInHeader.value = DEFAULT_EDITOR_SETTINGS.showColumnCommentsInHeader; editShowColumnTypesInHeader.value = DEFAULT_EDITOR_SETTINGS.showColumnTypesInHeader; editCompactColumnHeaderActions.value = DEFAULT_EDITOR_SETTINGS.compactColumnHeaderActions; @@ -997,7 +998,7 @@ watch( editShowTrayIcon.value = settingsStore.desktopSettings.show_tray_icon; editIconTheme.value = settingsStore.desktopSettings.icon_theme; editDebugLoggingEnabled.value = settingsStore.desktopSettings.debug_logging_enabled; - editSidebarTablePageSize.value = settingsStore.desktopSettings.sidebar_table_page_size ?? 500; + editSidebarTablePageSize.value = settingsStore.desktopSettings.sidebar_table_page_size ?? DEFAULT_SIDEBAR_TABLE_PAGE_SIZE; webdavPassword.value = ""; await refreshWebDavPasswordStatus(); syncAiEditState(); diff --git a/apps/desktop/src/lib/http.ts b/apps/desktop/src/lib/http.ts index faef801b2a..4ec72f00c3 100644 --- a/apps/desktop/src/lib/http.ts +++ b/apps/desktop/src/lib/http.ts @@ -91,11 +91,24 @@ import type { DatabaseNameSqlOptions, DropTableChildObjectSqlOptions, DropObject import type { BuildDatabaseSqlExportOptions, BuildExportInsertStatementsOptions } from "@/lib/databaseExport"; import type { DataCompareFromTablesOptions, DataCompareFromTablesPreparation, DataCompareSyncPlan, DataCompareSyncPlanOptions, DataComparePreparation, DataComparePreparationOptions } from "@/lib/dataCompare"; import type { DataGridSavePreparation } from "./tauri"; +import { safeLocalStorageGet, safeLocalStorageSet } from "@/lib/safeStorage"; // --------------------------------------------------------------------------- // Helpers // --------------------------------------------------------------------------- +const DESKTOP_SETTINGS_STORAGE_KEY = "dbx-desktop-settings"; +const DEFAULT_DESKTOP_SETTINGS: DesktopSettings = { + show_tray_icon: true, + icon_theme: "default", + debug_logging_enabled: false, + saved_sql_sync_dir: null, + driver_store_dir: null, + plugin_store_dir: null, + agent_store_dir: null, + sidebar_table_page_size: 1000, +}; + async function post(url: string, body: unknown): Promise { const res = await fetch(url, { method: "POST", @@ -877,11 +890,16 @@ export async function loadAiConfig(): Promise { } export async function loadDesktopSettings(): Promise { - return { show_tray_icon: true, icon_theme: "default", debug_logging_enabled: false, saved_sql_sync_dir: null, driver_store_dir: null, plugin_store_dir: null, agent_store_dir: null }; + try { + const raw = safeLocalStorageGet(DESKTOP_SETTINGS_STORAGE_KEY); + return raw ? { ...DEFAULT_DESKTOP_SETTINGS, ...(JSON.parse(raw) as Partial) } : { ...DEFAULT_DESKTOP_SETTINGS }; + } catch { + return { ...DEFAULT_DESKTOP_SETTINGS }; + } } -export async function saveDesktopSettings(_settings: DesktopSettings): Promise { - return; +export async function saveDesktopSettings(settings: DesktopSettings): Promise { + safeLocalStorageSet(DESKTOP_SETTINGS_STORAGE_KEY, JSON.stringify({ ...DEFAULT_DESKTOP_SETTINGS, ...settings })); } export interface DriverStoreMigrationResult { diff --git a/apps/desktop/src/lib/tauri.ts b/apps/desktop/src/lib/tauri.ts index 6f6fab1ac1..96aab80845 100644 --- a/apps/desktop/src/lib/tauri.ts +++ b/apps/desktop/src/lib/tauri.ts @@ -130,6 +130,7 @@ export interface DesktopSettings { driver_store_dir?: string | null; plugin_store_dir?: string | null; agent_store_dir?: string | null; + sidebar_table_page_size?: number | null; } export interface SavedSqlSyncEntry { diff --git a/apps/desktop/src/stores/settingsStore.ts b/apps/desktop/src/stores/settingsStore.ts index 67b942217d..89b7e267b1 100644 --- a/apps/desktop/src/stores/settingsStore.ts +++ b/apps/desktop/src/stores/settingsStore.ts @@ -51,6 +51,8 @@ export type DesktopIconTheme = "default" | "black"; export type InterfaceLayout = "separated" | "classic"; +export const DEFAULT_SIDEBAR_TABLE_PAGE_SIZE = 1000; + export const DEFAULT_DESKTOP_SETTINGS: DesktopSettings = { show_tray_icon: true, icon_theme: "default", @@ -59,7 +61,7 @@ export const DEFAULT_DESKTOP_SETTINGS: DesktopSettings = { driver_store_dir: null, plugin_store_dir: null, agent_store_dir: null, - sidebar_table_page_size: 500, + sidebar_table_page_size: DEFAULT_SIDEBAR_TABLE_PAGE_SIZE, }; function normalizeDesktopSettings(settings: Partial | null | undefined): DesktopSettings { diff --git a/crates/dbx-core/src/storage.rs b/crates/dbx-core/src/storage.rs index e79e864110..5987f22fb0 100644 --- a/crates/dbx-core/src/storage.rs +++ b/crates/dbx-core/src/storage.rs @@ -51,7 +51,7 @@ pub struct DesktopSettings { } fn default_sidebar_table_page_size() -> usize { - 500 + 1000 } impl Default for DesktopSettings { @@ -64,7 +64,7 @@ impl Default for DesktopSettings { driver_store_dir: None, plugin_store_dir: None, agent_store_dir: None, - sidebar_table_page_size: 500, + sidebar_table_page_size: default_sidebar_table_page_size(), } } } @@ -593,6 +593,10 @@ impl Storage { settings.remove("agent_store_dir"); } } + settings.insert( + "sidebar_table_page_size".to_string(), + serde_json::Value::Number(serde_json::Number::from(desktop_settings.sidebar_table_page_size)), + ); self.save_app_settings_json(&settings).await } @@ -2127,6 +2131,23 @@ mod tests { assert_eq!(settings.get("show_tray_icon").and_then(|value| value.as_bool()), Some(true)); assert_eq!(settings.get("icon_theme").and_then(|value| value.as_str()), Some("black")); assert_eq!(settings.get("debug_logging_enabled").and_then(|value| value.as_bool()), Some(false)); + assert_eq!( + settings.get("sidebar_table_page_size").and_then(|value| value.as_u64()), + Some(DesktopSettings::default().sidebar_table_page_size as u64) + ); + } + + #[tokio::test] + async fn desktop_settings_persist_sidebar_table_page_size() { + let path = temp_db_path("desktop-settings-sidebar-page-size"); + let storage = Storage::open(&path).await.unwrap(); + + storage + .save_desktop_settings(&DesktopSettings { sidebar_table_page_size: 1234, ..DesktopSettings::default() }) + .await + .unwrap(); + + assert_eq!(storage.load_desktop_settings().await.unwrap().sidebar_table_page_size, 1234); } #[tokio::test]