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。

feat(objects): customize compact browser card width (#12721)

二丫讲梵b1bdf20af4d8
diff --git a/apps/desktop/src/components/objects/DatabaseBrowser.vue b/apps/desktop/src/components/objects/DatabaseBrowser.vue
index 0734b2524f..54187d3ee6 100644
--- a/apps/desktop/src/components/objects/DatabaseBrowser.vue
+++ b/apps/desktop/src/components/objects/DatabaseBrowser.vue
@@ -1,4 +1,5 @@
<script setup lang="ts">
+import { OBJECT_BROWSER_COMPACT_WIDTHS, normalizeObjectBrowserCompactWidth, type ObjectBrowserCompactWidth } from "@/lib/table/objectBrowserCompactWidth";
import { computed, nextTick, onActivated, onBeforeUnmount, ref, watch } from "vue";
import { ArrowDown, ArrowUp, Check, Copy, Database, GripVertical, Grid3X3, LayoutGrid, List, Loader2, RefreshCw, Search, Settings2, TerminalSquare, X } from "@lucide/vue";
import { useI18n } from "vue-i18n";
@@ -117,11 +118,17 @@ const viewMode = computed(() => settingsStore.editorSettings.objectBrowserViewMo
const isListView = computed(() => viewMode.value === "list");
const isGridView = computed(() => viewMode.value === "grid");
const isCompactView = computed(() => viewMode.value === "compact");
+const compactCardWidth = computed(() => normalizeObjectBrowserCompactWidth(settingsStore.editorSettings.objectBrowserCompactWidth));
+
+function setCompactCardWidth(width: ObjectBrowserCompactWidth) {
+ settingsStore.updateEditorSettings({ objectBrowserCompactWidth: width });
+}
+
// Measured condensation for the header row: tier 1 moves the sort/view
// controls into the overflow menu, tier 2 drops the connection chip (the tab
// title already carries it). See useToolbarOverflow for the tier contract.
const toolbarRef = ref<HTMLElement | null>(null);
-const { tier: toolbarTier } = useToolbarOverflow(toolbarRef, [() => props.connection.id]);
+const { tier: toolbarTier } = useToolbarOverflow(toolbarRef, [() => props.connection.id, () => settingsStore.editorSettings.objectBrowserViewMode]);
const showToolbarOverflow = computed(() => toolbarTier.value >= 1);
const showConnectionChip = computed(() => toolbarTier.value < 2);
const showInlineSortAndView = computed(() => toolbarTier.value < 1);
@@ -554,6 +561,17 @@ defineExpose({ focusSearch, refresh });
<button type="button" class="flex h-6 w-6 items-center justify-center rounded-sm text-muted-foreground transition-colors hover:text-foreground" :class="{ 'bg-background text-foreground shadow-sm': isCompactView }" :title="t('objects.viewCompact')" @click="setViewMode('compact')">
<Grid3X3 class="h-3.5 w-3.5" />
</button>
+ <select
+ v-if="isCompactView"
+ data-compact-width-select
+ class="ml-1 h-6 shrink-0 cursor-pointer rounded-sm border-l bg-transparent px-1 text-xs text-muted-foreground outline-none hover:text-foreground focus:text-foreground focus-visible:ring-1 focus-visible:ring-ring"
+ :value="compactCardWidth"
+ :aria-label="t('objects.compactCardWidth')"
+ :title="t('objects.compactCardWidth')"
+ @change="setCompactCardWidth(normalizeObjectBrowserCompactWidth(Number(($event.target as HTMLSelectElement).value)))"
+ >
+ <option v-for="width in OBJECT_BROWSER_COMPACT_WIDTHS" :key="width" :value="width" class="bg-background text-foreground">{{ width }}px</option>
+ </select>
</div>
<Button variant="ghost" size="icon" class="h-7 w-7" :title="t('contextMenu.refreshTab')" :disabled="loading" @click="refresh">
<RefreshCw class="h-3.5 w-3.5" :class="{ 'animate-spin': loading }" />
@@ -589,6 +607,15 @@ defineExpose({ focusSearch, refresh });
<Grid3X3 class="h-3.5 w-3.5" />
{{ t("objects.viewCompact") }}
</DropdownMenuItem>
+ <DropdownMenuSub v-if="isCompactView">
+ <DropdownMenuSubTrigger>{{ t("objects.compactCardWidth") }}</DropdownMenuSubTrigger>
+ <DropdownMenuSubContent>
+ <DropdownMenuItem v-for="width in OBJECT_BROWSER_COMPACT_WIDTHS" :key="width" @select="setCompactCardWidth(width)">
+ <Check v-if="compactCardWidth === width" class="h-3.5 w-3.5" />
+ {{ width }}px
+ </DropdownMenuItem>
+ </DropdownMenuSubContent>
+ </DropdownMenuSub>
</ToolbarOverflowMenu>
</div>
@@ -655,7 +682,14 @@ defineExpose({ focusSearch, refresh });
</div>
</div>
</div>
- <div v-else ref="gridScrollerRef" class="grid min-h-0 flex-1 content-start overflow-auto" :class="isCompactView ? 'grid-cols-[repeat(auto-fill,minmax(128px,1fr))] gap-1 p-1' : 'grid-cols-[repeat(auto-fill,minmax(160px,1fr))] gap-3 p-3'" @scroll.passive="onGridScroll">
+ <div
+ v-else
+ ref="gridScrollerRef"
+ class="grid min-h-0 flex-1 content-start overflow-auto"
+ :class="isCompactView ? 'gap-1 p-1' : 'grid-cols-[repeat(auto-fill,minmax(160px,1fr))] gap-3 p-3'"
+ :style="isCompactView ? { gridTemplateColumns: `repeat(auto-fill, minmax(min(${compactCardWidth}px, 100%), 1fr))` } : undefined"
+ @scroll.passive="onGridScroll"
+ >
<div
v-for="row in visibleRows"
:key="row.name"
diff --git a/apps/desktop/src/components/objects/ObjectBrowser.vue b/apps/desktop/src/components/objects/ObjectBrowser.vue
index df28b816c4..7b1bf20807 100644
--- a/apps/desktop/src/components/objects/ObjectBrowser.vue
+++ b/apps/desktop/src/components/objects/ObjectBrowser.vue
@@ -1,4 +1,5 @@
<script setup lang="ts">
+import { OBJECT_BROWSER_COMPACT_WIDTHS, normalizeObjectBrowserCompactWidth, type ObjectBrowserCompactWidth } from "@/lib/table/objectBrowserCompactWidth";
import { applyDdlStoragePreference } from "@/lib/sql/ddlStorage";
import DatabaseActionsMenu from "@/components/objects/DatabaseActionsMenu.vue";
import FirebirdObjectManager from "@/components/objects/FirebirdObjectManager.vue";
@@ -542,7 +543,7 @@ const singleKindFilter = computed<ObjectFilter | null>(() => (objectFilters.valu
// filter there and drops the database chip. See useToolbarOverflow for the
// tier contract.
const toolbarRef = ref<HTMLElement | null>(null);
-const { tier: toolbarTier } = useToolbarOverflow(toolbarRef, [() => props.database, () => selectedSchema.value, () => needsSchema.value, () => showObjectFilter.value, () => singleKindFilter.value]);
+const { tier: toolbarTier } = useToolbarOverflow(toolbarRef, [() => props.database, () => selectedSchema.value, () => needsSchema.value, () => showObjectFilter.value, () => singleKindFilter.value, () => settingsStore.editorSettings.objectBrowserViewMode]);
const showToolbarOverflow = computed(() => toolbarTier.value >= 1);
const showInlineSortAndView = computed(() => toolbarTier.value < 1);
const showInlineCheckboxToggle = computed(() => toolbarTier.value < 1);
@@ -556,6 +557,11 @@ const viewMode = computed<ObjectBrowserViewMode>(() => settingsStore.editorSetti
const isListView = computed(() => viewMode.value === "list");
const isGridView = computed(() => viewMode.value === "grid");
const isCompactView = computed(() => viewMode.value === "compact");
+const compactCardWidth = computed(() => normalizeObjectBrowserCompactWidth(settingsStore.editorSettings.objectBrowserCompactWidth));
+
+function setCompactCardWidth(width: ObjectBrowserCompactWidth) {
+ settingsStore.updateEditorSettings({ objectBrowserCompactWidth: width });
+}
type ObjectBrowserScroller =
| HTMLElement
@@ -777,7 +783,6 @@ const selectableRows = computed(() => rows.value);
// The previous flat `v-for` rendered every card (plus its CustomContextMenu)
// at once, which stalls the UI on schemas with thousands of objects.
const OBJECT_GRID_MIN_CARD_WIDTH = 160; // former `minmax(160px, 1fr)` floor
-const OBJECT_COMPACT_MIN_CARD_WIDTH = 128;
const OBJECT_GRID_GAP = 12; // 0.75rem, former grid gap (both axes)
const OBJECT_COMPACT_GAP = 4;
// Card height is dataset-stable: if any object has timestamps/comments, every card
@@ -804,7 +809,7 @@ const gridColumns = ref(1);
let gridResizeObserver: ResizeObserver | null = null;
function recomputeGridColumns(width: number) {
- const minWidth = isCompactView.value ? OBJECT_COMPACT_MIN_CARD_WIDTH : OBJECT_GRID_MIN_CARD_WIDTH;
+ const minWidth = isCompactView.value ? compactCardWidth.value : OBJECT_GRID_MIN_CARD_WIDTH;
const gap = isCompactView.value ? OBJECT_COMPACT_GAP : OBJECT_GRID_GAP;
gridColumns.value = Math.max(1, Math.floor((width + gap) / (minWidth + gap)));
}
@@ -832,7 +837,7 @@ watch(
},
{ flush: "post" },
);
-watch(viewMode, () =>
+watch([viewMode, compactCardWidth], () =>
nextTick(() => {
const el = gridContainerRef.value;
if (el) recomputeGridColumns(el.clientWidth - parseFloat(getComputedStyle(el).paddingLeft) - parseFloat(getComputedStyle(el).paddingRight));
@@ -4724,6 +4729,17 @@ function getObjectBrowserMenuItems(item: ObjectBrowserRow): ContextMenuItem[] {
<button type="button" class="flex h-6 w-6 items-center justify-center rounded-sm text-muted-foreground transition-colors hover:text-foreground" :class="{ 'bg-background text-foreground shadow-sm': isCompactView }" :title="t('objects.viewCompact')" @click="setViewMode('compact')">
<Grid3X3 class="h-3.5 w-3.5" />
</button>
+ <select
+ v-if="isCompactView"
+ data-compact-width-select
+ class="ml-1 h-6 shrink-0 cursor-pointer rounded-sm border-l bg-transparent px-1 text-xs text-muted-foreground outline-none hover:text-foreground focus:text-foreground focus-visible:ring-1 focus-visible:ring-ring"
+ :value="compactCardWidth"
+ :aria-label="t('objects.compactCardWidth')"
+ :title="t('objects.compactCardWidth')"
+ @change="setCompactCardWidth(normalizeObjectBrowserCompactWidth(Number(($event.target as HTMLSelectElement).value)))"
+ >
+ <option v-for="width in OBJECT_BROWSER_COMPACT_WIDTHS" :key="width" :value="width" class="bg-background text-foreground">{{ width }}px</option>
+ </select>
</div>
<Button v-if="showInlineCheckboxToggle && supportsBatchTableActions" variant="ghost" size="icon" class="h-7 w-7" :class="{ 'text-primary': settingsStore.editorSettings.objectBrowserShowCheckbox }" :title="t('objects.toggleCheckbox')" @click="toggleCheckboxColumn">
<CheckSquare v-if="settingsStore.editorSettings.objectBrowserShowCheckbox" class="h-3.5 w-3.5" />
@@ -4770,6 +4786,15 @@ function getObjectBrowserMenuItems(item: ObjectBrowserRow): ContextMenuItem[] {
<Grid3X3 class="h-3.5 w-3.5" />
{{ t("objects.viewCompact") }}
</DropdownMenuItem>
+ <DropdownMenuSub v-if="isCompactView">
+ <DropdownMenuSubTrigger>{{ t("objects.compactCardWidth") }}</DropdownMenuSubTrigger>
+ <DropdownMenuSubContent>
+ <DropdownMenuItem v-for="width in OBJECT_BROWSER_COMPACT_WIDTHS" :key="width" @select="setCompactCardWidth(width)">
+ <Check v-if="compactCardWidth === width" class="h-3.5 w-3.5" />
+ {{ width }}px
+ </DropdownMenuItem>
+ </DropdownMenuSubContent>
+ </DropdownMenuSub>
<DropdownMenuCheckboxItem v-if="supportsBatchTableActions" :model-value="settingsStore.editorSettings.objectBrowserShowCheckbox" @select.prevent @update:model-value="toggleCheckboxColumn()">{{ t("objects.toggleCheckbox") }}</DropdownMenuCheckboxItem>
<DropdownMenuItem @select="toggleSidePanel">
<PanelRight class="h-3.5 w-3.5" />
diff --git a/apps/desktop/src/components/objects/__tests__/DatabaseBrowser.scroll.component.spec.ts b/apps/desktop/src/components/objects/__tests__/DatabaseBrowser.scroll.component.spec.ts
index 65d6075eb3..899da0065c 100644
--- a/apps/desktop/src/components/objects/__tests__/DatabaseBrowser.scroll.component.spec.ts
+++ b/apps/desktop/src/components/objects/__tests__/DatabaseBrowser.scroll.component.spec.ts
@@ -1,6 +1,6 @@
// @vitest-environment happy-dom
-import { createApp, defineComponent, h, nextTick, ref, type App } from "vue";
+import { createApp, defineComponent, h, nextTick, reactive, ref, type App } from "vue";
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
import DatabaseBrowser from "../DatabaseBrowser.vue";
import { provideTabUiState, TAB_UI_STATE_TRACK_DEBOUNCE_MS } from "@/lib/tabs/tabUiState";
@@ -20,7 +20,8 @@ const mocks = vi.hoisted(() => ({
listDatabases: vi.fn(),
listDatabaseMetadata: vi.fn(),
editorSettings: {
- objectBrowserViewMode: "list" as "list" | "grid",
+ objectBrowserViewMode: "list" as "list" | "grid" | "compact",
+ objectBrowserCompactWidth: 160,
},
}));
@@ -45,9 +46,9 @@ vi.mock("@/stores/queryStore", () => ({
vi.mock("@/stores/settingsStore", () => ({
useSettingsStore: () => ({
- editorSettings: mocks.editorSettings,
+ editorSettings: reactive(mocks.editorSettings),
updateEditorSettings: (patch: Partial<typeof mocks.editorSettings>) => {
- Object.assign(mocks.editorSettings, patch);
+ Object.assign(reactive(mocks.editorSettings), patch);
},
}),
}));
@@ -95,6 +96,7 @@ describe("DatabaseBrowser scroll position preservation (#12432)", () => {
mocks.listDatabases.mockResolvedValue(testDatabases);
mocks.listDatabaseMetadata.mockResolvedValue([]);
mocks.editorSettings.objectBrowserViewMode = "list";
+ mocks.editorSettings.objectBrowserCompactWidth = 160;
});
afterEach(() => {
@@ -106,6 +108,24 @@ describe("DatabaseBrowser scroll position preservation (#12432)", () => {
vi.clearAllMocks();
});
+ it("updates compact width immediately without losing cards", async () => {
+ mocks.editorSettings.objectBrowserViewMode = "compact";
+ host = document.createElement("div");
+ document.body.appendChild(host);
+ app = createApp(DatabaseBrowser, { connection: testConnection });
+ app.mount(host);
+ await vi.waitFor(() => expect(host!.querySelectorAll(".grid.content-start .h-7")).toHaveLength(testDatabases.length));
+ const scroller = host.querySelector<HTMLElement>(".grid.content-start")!;
+ expect(scroller.style.gridTemplateColumns).toBe("repeat(auto-fill, minmax(min(160px, 100%), 1fr))");
+ const select = host.querySelector<HTMLSelectElement>("[data-compact-width-select]")!;
+ select.value = "200";
+ select.dispatchEvent(new Event("change", { bubbles: true }));
+ await nextTick();
+ expect(scroller.style.gridTemplateColumns).toBe("repeat(auto-fill, minmax(min(200px, 100%), 1fr))");
+ expect(mocks.editorSettings.objectBrowserCompactWidth).toBe(200);
+ expect(scroller.querySelectorAll(".h-7")).toHaveLength(testDatabases.length);
+ });
+
it("restores scrollTop from tab UI state when mounting in list view", async () => {
let capturedState: Record<string, any> = {};
const Parent = defineComponent({
diff --git a/apps/desktop/src/components/objects/__tests__/ObjectBrowser.locateSidebar.component.spec.ts b/apps/desktop/src/components/objects/__tests__/ObjectBrowser.locateSidebar.component.spec.ts
index e3ab27321a..ee3846adb0 100644
--- a/apps/desktop/src/components/objects/__tests__/ObjectBrowser.locateSidebar.component.spec.ts
+++ b/apps/desktop/src/components/objects/__tests__/ObjectBrowser.locateSidebar.component.spec.ts
@@ -1,6 +1,6 @@
// @vitest-environment happy-dom
-import { createApp, defineComponent, h, nextTick, ref, type App } from "vue";
+import { createApp, defineComponent, h, nextTick, reactive, ref, type App } from "vue";
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
import ObjectBrowser from "@/components/objects/ObjectBrowser.vue";
import { invalidateObjectBrowserRowsCache } from "@/lib/table/objectBrowserRowsCache";
@@ -33,16 +33,18 @@ vi.mock("@/stores/connectionStore", () => ({
}));
vi.mock("@/stores/queryStore", () => ({ useQueryStore: () => ({}) }));
vi.mock("@/stores/settingsStore", () => ({
- useSettingsStore: () => ({
- editorSettings: {
+ useSettingsStore: () => {
+ const editorSettings = reactive({
+ objectBrowserCompactWidth: 160,
shortcuts: { refreshData: "F5" },
objectBrowserViewMode: mocks.viewMode,
objectBrowserShowCheckbox: false,
sidebarActivation: "double",
sidebarMenuLayout: mocks.menuLayout,
sidebarMenuPinnedActions: { table: mocks.pinnedActions },
- },
- }),
+ });
+ return { editorSettings, updateEditorSettings: (patch: Partial<typeof editorSettings>) => Object.assign(editorSettings, patch) };
+ },
}));
vi.mock("vue-i18n", () => ({ useI18n: () => ({ t: (key: string) => (key === "sidebar.locateActiveTab" ? "Locate in sidebar" : key), locale: ref("en-US") }) }));
vi.mock("@/i18n", () => ({ default: { install: () => undefined } }));
@@ -156,6 +158,32 @@ function menuButton(label: string): HTMLButtonElement {
return buttons[0]!;
}
+it("reflows compact rows immediately when changing width and keeps names and row height", async () => {
+ mocks.viewMode = "compact";
+ const widthSpy = vi.spyOn(HTMLElement.prototype, "clientWidth", "get").mockImplementation(function (this: HTMLElement) {
+ return this.classList.contains("object-browser-grid-wrapper") ? 1016 : 0;
+ });
+ try {
+ const host = await mountBrowser();
+ const rows = () => [...host.querySelectorAll<HTMLElement>(".object-browser-grid-row")];
+ const names = () => [...host.querySelectorAll<HTMLElement>("[data-object-compact-card]")].map((card) => card.title);
+ expect(rows()).toHaveLength(1);
+ expect(rows()[0]!.style.gridTemplateColumns).toBe("repeat(6, minmax(0, 1fr))");
+ const before = names();
+ const select = host.querySelector<HTMLSelectElement>("[data-compact-width-select]")!;
+ expect(select.value).toBe("160");
+ select.value = "240";
+ select.dispatchEvent(new Event("change", { bubbles: true }));
+ await vi.waitFor(() => expect(rows()).toHaveLength(2));
+ expect(rows()[0]!.style.gridTemplateColumns).toBe("repeat(4, minmax(0, 1fr))");
+ expect(rows()[0]!.style.height).toBe("28px");
+ expect(names()).toEqual(before);
+ expect(select.value).toBe("240");
+ } finally {
+ widthSpy.mockRestore();
+ }
+});
+
describe.each(["list", "grid", "compact"] as const)("ObjectBrowser locate in sidebar (%s)", (viewMode) => {
beforeEach(() => {
mocks.viewMode = viewMode;
diff --git a/apps/desktop/src/i18n/locales/en.ts b/apps/desktop/src/i18n/locales/en.ts
index 732cc4d7a2..8c16e98cc2 100644
--- a/apps/desktop/src/i18n/locales/en.ts
+++ b/apps/desktop/src/i18n/locales/en.ts
@@ -5890,6 +5890,7 @@ export default {
viewList: "List view",
viewGrid: "Grid view",
viewCompact: "Compact grid view",
+ compactCardWidth: "Compact card minimum width",
configureColumns: "Configure columns",
sortAsc: "Ascending",
sortDesc: "Descending",
diff --git a/apps/desktop/src/i18n/locales/es.ts b/apps/desktop/src/i18n/locales/es.ts
index f97ec47c75..be9791fb2f 100644
--- a/apps/desktop/src/i18n/locales/es.ts
+++ b/apps/desktop/src/i18n/locales/es.ts
@@ -5201,6 +5201,7 @@ export default withEnglishFallback({
invalid: "inválido",
refreshDiscardConfirm: "Actualizar descartará los cambios sin guardar en el código fuente, ¿deseas continuar?",
viewCompact: "Vista de cuadrícula compacta",
+ compactCardWidth: "Ancho mínimo de tarjeta compacta",
configureColumns: "Configurar columnas de visualización",
},
structureEditor: {
diff --git a/apps/desktop/src/i18n/locales/it.ts b/apps/desktop/src/i18n/locales/it.ts
index b2251222ab..205c7ec596 100644
--- a/apps/desktop/src/i18n/locales/it.ts
+++ b/apps/desktop/src/i18n/locales/it.ts
@@ -5021,6 +5021,7 @@ export default withEnglishFallback({
invalid: "non valido",
refreshDiscardConfirm: "L'aggiornamento eliminerà le modifiche non salvate al codice sorgente. Continuare?",
viewCompact: "Vista compatta a griglia",
+ compactCardWidth: "Larghezza minima scheda compatta",
configureColumns: "Configura colonne visualizzate",
},
structureEditor: {
diff --git a/apps/desktop/src/i18n/locales/ja.ts b/apps/desktop/src/i18n/locales/ja.ts
index 164e8ac0ac..5cbccc55d9 100644
--- a/apps/desktop/src/i18n/locales/ja.ts
+++ b/apps/desktop/src/i18n/locales/ja.ts
@@ -5083,6 +5083,7 @@ export default withEnglishFallback({
invalid: "無効",
refreshDiscardConfirm: "更新すると、保存されていないソースコードの変更が破棄されます。続行しますか?",
viewCompact: "コンパクトグリッドビュー",
+ compactCardWidth: "コンパクトカードの最小幅",
configureColumns: "表示列を設定",
},
structureEditor: {
diff --git a/apps/desktop/src/i18n/locales/ko.ts b/apps/desktop/src/i18n/locales/ko.ts
index 92ad7e307a..bb222ea2ce 100644
--- a/apps/desktop/src/i18n/locales/ko.ts
+++ b/apps/desktop/src/i18n/locales/ko.ts
@@ -5062,6 +5062,7 @@ export default withEnglishFallback({
sortBy: "정렬 기준",
refreshDiscardConfirm: "새로 고침하면 저장되지 않은 소스 코드 변경 사항이 삭제됩니다. 계속하시겠습니까?",
viewCompact: "컴팩트 3x3 그리드 뷰",
+ compactCardWidth: "컴팩트 카드 최소 너비",
configureColumns: "표시 열 구성",
},
structureEditor: {
diff --git a/apps/desktop/src/i18n/locales/pt-BR.ts b/apps/desktop/src/i18n/locales/pt-BR.ts
index d4fd7661c9..935480cfff 100644
--- a/apps/desktop/src/i18n/locales/pt-BR.ts
+++ b/apps/desktop/src/i18n/locales/pt-BR.ts
@@ -5021,6 +5021,7 @@ export default withEnglishFallback({
invalid: "Inválido",
refreshDiscardConfirm: "Atualizar descartará as modificações não salvas no código-fonte. Deseja continuar?",
viewCompact: "Visualização compacta em grade",
+ compactCardWidth: "Largura mínima do cartão compacto",
configureColumns: "Configurar colunas de exibição",
},
structureEditor: {
diff --git a/apps/desktop/src/i18n/locales/ru.ts b/apps/desktop/src/i18n/locales/ru.ts
index 5af3dbbcaf..6508451a02 100644
--- a/apps/desktop/src/i18n/locales/ru.ts
+++ b/apps/desktop/src/i18n/locales/ru.ts
@@ -5542,6 +5542,7 @@ export default withEnglishFallback({
sortDesc: "По убыванию",
sortBy: "Сортировать по",
viewCompact: "Компактный вид сетки",
+ compactCardWidth: "Минимальная ширина компактной карточки",
configureColumns: "Настроить отображаемые столбцы",
},
structureEditor: {
diff --git a/apps/desktop/src/i18n/locales/th.ts b/apps/desktop/src/i18n/locales/th.ts
index 177f763ae7..659c6a7752 100644
--- a/apps/desktop/src/i18n/locales/th.ts
+++ b/apps/desktop/src/i18n/locales/th.ts
@@ -5875,6 +5875,7 @@ export default withEnglishFallback({
sortDesc: "เรียงจากมากไปน้อย",
sortBy: "เรียงตาม",
viewCompact: "มุมมองกริดแบบกะทัดรัด",
+ compactCardWidth: "ความกว้างขั้นต่ำของการ์ดแบบกะทัดรัด",
configureColumns: "กำหนดค่าคอลัมน์ที่แสดง",
},
structureEditor: {
diff --git a/apps/desktop/src/i18n/locales/zh-CN.ts b/apps/desktop/src/i18n/locales/zh-CN.ts
index e6ee1010f2..ba49a7ae35 100644
--- a/apps/desktop/src/i18n/locales/zh-CN.ts
+++ b/apps/desktop/src/i18n/locales/zh-CN.ts
@@ -5878,6 +5878,7 @@ export default withEnglishFallback({
viewList: "列表视图",
viewGrid: "平铺视图",
viewCompact: "紧凑九宫格视图",
+ compactCardWidth: "紧凑卡片最小宽度",
configureColumns: "配置显示列",
sortAsc: "升序",
sortDesc: "降序",
diff --git a/apps/desktop/src/i18n/locales/zh-TW.ts b/apps/desktop/src/i18n/locales/zh-TW.ts
index cdaa7a6f75..745f2a1b31 100644
--- a/apps/desktop/src/i18n/locales/zh-TW.ts
+++ b/apps/desktop/src/i18n/locales/zh-TW.ts
@@ -4766,6 +4766,7 @@ export default withEnglishFallback({
invalid: "無效",
refreshDiscardConfirm: "重新整理將捨棄未儲存的原始碼修改,是否繼續?",
viewCompact: "緊湊九宮格檢視",
+ compactCardWidth: "緊湊卡片最小寬度",
configureColumns: "設定顯示欄",
},
structureEditor: {
diff --git a/apps/desktop/src/lib/table/objectBrowserCompactWidth.ts b/apps/desktop/src/lib/table/objectBrowserCompactWidth.ts
new file mode 100644
index 0000000000..f6ddb261fd
--- /dev/null
+++ b/apps/desktop/src/lib/table/objectBrowserCompactWidth.ts
@@ -0,0 +1,7 @@
+export const OBJECT_BROWSER_COMPACT_WIDTHS = [160, 200, 240] as const;
+export type ObjectBrowserCompactWidth = (typeof OBJECT_BROWSER_COMPACT_WIDTHS)[number];
+export const DEFAULT_OBJECT_BROWSER_COMPACT_WIDTH: ObjectBrowserCompactWidth = 160;
+
+export function normalizeObjectBrowserCompactWidth(value: unknown): ObjectBrowserCompactWidth {
+ return OBJECT_BROWSER_COMPACT_WIDTHS.includes(value as ObjectBrowserCompactWidth) ? (value as ObjectBrowserCompactWidth) : DEFAULT_OBJECT_BROWSER_COMPACT_WIDTH;
+}
diff --git a/apps/desktop/src/stores/settingsStore.ts b/apps/desktop/src/stores/settingsStore.ts
index bd609d87e5..d92b1380d0 100644
--- a/apps/desktop/src/stores/settingsStore.ts
+++ b/apps/desktop/src/stores/settingsStore.ts
@@ -1,3 +1,4 @@
+import { DEFAULT_OBJECT_BROWSER_COMPACT_WIDTH, normalizeObjectBrowserCompactWidth, type ObjectBrowserCompactWidth } from "@/lib/table/objectBrowserCompactWidth";
import { normalizeModelTemplates, type ModelTemplate } from "@/lib/model/modelTemplates";
import { normalizePluginGraphicsEngineIds } from "@/lib/plugins/pluginGraphicsEngine";
import { normalizePluginShortcutSettings, type PluginShortcutSettings } from "@/lib/plugins/pluginShortcuts";
@@ -1214,6 +1215,7 @@ export interface EditorSettings {
toolbarItems: ToolbarItems;
objectBrowserShowCheckbox: boolean;
objectBrowserViewMode: "list" | "grid" | "compact";
+ objectBrowserCompactWidth: ObjectBrowserCompactWidth;
objectBrowserAutoOpenDetailPanel: boolean;
sqlVariableSubstitutionEnabled: boolean;
sqlVariableSyntaxOverrides: SqlVariableSyntaxOverrides;
@@ -1555,6 +1557,7 @@ export const DEFAULT_EDITOR_SETTINGS: EditorSettings = {
toolbarItems: { ...DEFAULT_TOOLBAR_ITEMS },
objectBrowserShowCheckbox: false,
objectBrowserViewMode: "list",
+ objectBrowserCompactWidth: DEFAULT_OBJECT_BROWSER_COMPACT_WIDTH,
objectBrowserAutoOpenDetailPanel: true,
sqlVariableSubstitutionEnabled: true,
sqlVariableSyntaxOverrides: {},
@@ -2270,6 +2273,7 @@ export function normalizeEditorSettings(settings: Partial<EditorSettings>, exist
pluginGraphicsEngineIds: normalizePluginGraphicsEngineIds(settings.pluginGraphicsEngineIds),
toolbarItems: normalizeToolbarItems(settings.toolbarItems),
objectBrowserShowCheckbox: typeof settings.objectBrowserShowCheckbox === "boolean" ? settings.objectBrowserShowCheckbox : DEFAULT_EDITOR_SETTINGS.objectBrowserShowCheckbox,
+ objectBrowserCompactWidth: normalizeObjectBrowserCompactWidth(settings.objectBrowserCompactWidth),
objectBrowserViewMode: settings.objectBrowserViewMode === "grid" || settings.objectBrowserViewMode === "compact" ? settings.objectBrowserViewMode : DEFAULT_EDITOR_SETTINGS.objectBrowserViewMode,
objectBrowserAutoOpenDetailPanel: typeof settings.objectBrowserAutoOpenDetailPanel === "boolean" ? settings.objectBrowserAutoOpenDetailPanel : DEFAULT_EDITOR_SETTINGS.objectBrowserAutoOpenDetailPanel,
sqlVariableSubstitutionEnabled: typeof settings.sqlVariableSubstitutionEnabled === "boolean" ? settings.sqlVariableSubstitutionEnabled : DEFAULT_EDITOR_SETTINGS.sqlVariableSubstitutionEnabled,
@@ -3134,6 +3138,7 @@ export const useSettingsStore = defineStore("settings", () => {
if (partial.pluginGraphicsEngineIds !== undefined) editorSettings.value.pluginGraphicsEngineIds = normalizePluginGraphicsEngineIds(partial.pluginGraphicsEngineIds);
if (partial.toolbarItems !== undefined) editorSettings.value.toolbarItems = normalizeToolbarItems(partial.toolbarItems);
if (partial.objectBrowserShowCheckbox !== undefined) editorSettings.value.objectBrowserShowCheckbox = partial.objectBrowserShowCheckbox === true;
+ if (partial.objectBrowserCompactWidth !== undefined) editorSettings.value.objectBrowserCompactWidth = normalizeObjectBrowserCompactWidth(partial.objectBrowserCompactWidth);
if (partial.objectBrowserViewMode !== undefined) editorSettings.value.objectBrowserViewMode = partial.objectBrowserViewMode === "grid" || partial.objectBrowserViewMode === "compact" ? partial.objectBrowserViewMode : "list";
if (partial.objectBrowserAutoOpenDetailPanel !== undefined) editorSettings.value.objectBrowserAutoOpenDetailPanel = partial.objectBrowserAutoOpenDetailPanel === true;
if (partial.sqlVariableSubstitutionEnabled !== undefined) editorSettings.value.sqlVariableSubstitutionEnabled = partial.sqlVariableSubstitutionEnabled === true;
diff --git a/packages/app-tests/settingsStore.test.ts b/packages/app-tests/settingsStore.test.ts
index d2c20a2ef4..86cc9f0728 100644
--- a/packages/app-tests/settingsStore.test.ts
+++ b/packages/app-tests/settingsStore.test.ts
@@ -142,6 +142,36 @@ test("table DDL wrapping defaults on and normalizes saved booleans independently
assert.equal(settings.wordWrap, true);
});
+test("compact browser width defaults safely and preserves supported saved widths", () => {
+ assert.equal(DEFAULT_EDITOR_SETTINGS.objectBrowserCompactWidth, 160);
+ for (const width of [160, 200, 240] as const) {
+ assert.equal(normalizeEditorSettings({ objectBrowserCompactWidth: width }).objectBrowserCompactWidth, width);
+ }
+ for (const value of [undefined, null, "200", 0, -1, 180, Infinity, NaN]) {
+ assert.equal(normalizeEditorSettings({ objectBrowserCompactWidth: value as any }).objectBrowserCompactWidth, 160);
+ }
+});
+
+test("compact browser width persists and reloads through editor settings", async () => {
+ await withMockLocalStorage({}, async () => {
+ setActivePinia(createPinia());
+ const store = useSettingsStore();
+ await store.initEditorSettings();
+ store.updateEditorSettings({ objectBrowserCompactWidth: 240 });
+ assert.equal(store.editorSettings.objectBrowserCompactWidth, 240);
+ await vi.waitFor(() => {
+ assert.equal(saveEditorSettingsMock.mock.calls.at(-1)?.[0]?.objectBrowserCompactWidth, 240);
+ assert.equal(JSON.parse(localStorage.getItem("dbx-app-state:editor_settings") || "{}").objectBrowserCompactWidth, 240);
+ });
+ setActivePinia(createPinia());
+ const restored = useSettingsStore();
+ await restored.initEditorSettings();
+ assert.equal(restored.editorSettings.objectBrowserCompactWidth, 240);
+ restored.updateEditorSettings({ objectBrowserCompactWidth: -1 as any });
+ assert.equal(restored.editorSettings.objectBrowserCompactWidth, 160);
+ });
+});
+
test("data grid column width mode defaults to content and normalizes saved values", () => {
assert.equal(DEFAULT_EDITOR_SETTINGS.dataGridColumnWidthMode, "content");
assert.equal(normalizeEditorSettings({}).dataGridColumnWidthMode, "content");