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(grid): add global first-column freezing

二丫讲梵4b60c0440e84
diff --git a/apps/desktop/src/components/document/DocumentBrowser.vue b/apps/desktop/src/components/document/DocumentBrowser.vue
index 76de629564..8ea29eccf1 100644
--- a/apps/desktop/src/components/document/DocumentBrowser.vue
+++ b/apps/desktop/src/components/document/DocumentBrowser.vue
@@ -12,6 +12,7 @@ import DangerConfirmDialog from "@/components/editor/DangerConfirmDialog.vue";
import ErrorBanner from "@/components/ui/ErrorBanner.vue";
import DataGrid from "@/components/grid/DataGrid.vue";
import DataGridColumnLayoutPopover from "@/components/grid/DataGridColumnLayoutPopover.vue";
+import DataGridFreezeFirstColumnControl from "@/components/grid/DataGridFreezeFirstColumnControl.vue";
import DataGridCopyFormatControl from "@/components/grid/DataGridCopyFormatControl.vue";
import DataGridEmptyColumnsControl from "@/components/grid/DataGridEmptyColumnsControl.vue";
import DataGridFontFamilyControl from "@/components/grid/DataGridFontFamilyControl.vue";
@@ -2939,6 +2940,7 @@ defineExpose({ focusSearch });
<Switch size="sm" :model-value="!!dataGridRef?.nullColumnsHidden" :disabled="!dataGridRef?.canToggleAllNullColumns" :aria-label="t('grid.hideNullColumns')" @update:model-value="dataGridRef?.toggleAllNullColumns()" />
</div>
<DataGridEmptyColumnsControl :count="dataGridRef?.allEmptyColumnCount" :column-count="dataGridRef?.displayableColumnCount" />
+ <DataGridFreezeFirstColumnControl />
<DataGridCopyFormatControl
:current-label="dataGridRef?.defaultCopyPreferenceLabel ?? '-'"
:current-value="dataGridRef?.defaultCopyPreference ?? ''"
diff --git a/apps/desktop/src/components/editor/CloudSyncSelectionDialog.vue b/apps/desktop/src/components/editor/CloudSyncSelectionDialog.vue
index 7c3c7b81b3..fa14e21757 100644
--- a/apps/desktop/src/components/editor/CloudSyncSelectionDialog.vue
+++ b/apps/desktop/src/components/editor/CloudSyncSelectionDialog.vue
@@ -108,6 +108,7 @@ const editorSettingCategoryOverrides: Partial<Record<string, BackupSettingsCateg
dataGridMultiRowTranspose: "data",
dataGridHideNullColumns: "data",
dataGridHideEmptyColumns: "data",
+ dataGridFreezeFirstColumn: "data",
dataGridBooleanDisplayMode: "data",
numericColumnRightAlign: "data",
structureEditorDensity: "data",
diff --git a/apps/desktop/src/components/grid/DataGrid.vue b/apps/desktop/src/components/grid/DataGrid.vue
index cb8efa58c3..a1999c33e9 100644
--- a/apps/desktop/src/components/grid/DataGrid.vue
+++ b/apps/desktop/src/components/grid/DataGrid.vue
@@ -2376,6 +2376,7 @@ const {
// Existing tab snapshots may still carry this field; new changes persist in the internal layout store.
initialHiddenColumnKeys: computed(() => props.result.local_hidden_column_keys),
hideNullColumns,
+ freezeFirstColumn: () => settingsStore.editorSettings.dataGridFreezeFirstColumn,
onHideNullColumnsChange: (value) => settingsStore.updateEditorSettings({ dataGridHideNullColumns: value }),
onRefreshMetrics: scheduleColumnLayoutRefresh,
});
@@ -13620,8 +13621,8 @@ const gridContextMenuItems = computed<ContextMenuItem[]>(() => {
freezeToColumn: t("grid.freezeToColumn"),
freezeSelectedColumns: t("grid.freezeSelectedColumns", { count: selectedColumnCount }),
freezeCurrentColumn: t("grid.freezeCurrentColumn"),
- unfreezeCurrentColumn: t("grid.unfreezeCurrentColumn"),
- unfreezeColumns: t("grid.unfreezeColumns", { count: frozenColumnCount.value }),
+ unfreezeCurrentColumn: t("grid.unfreezeCurrentColumn") + (settingsStore.editorSettings.dataGridFreezeFirstColumn ? ` (${t("grid.globalFirstColumnRemainsFrozen")})` : ""),
+ unfreezeColumns: t("grid.unfreezeColumns", { count: frozenColumnCount.value }) + (settingsStore.editorSettings.dataGridFreezeFirstColumn ? ` (${t("grid.globalFirstColumnRemainsFrozen")})` : ""),
hideColumn: t("grid.hideColumn"),
hideSelectedColumns: t("grid.hideSelectedColumns", { count: selectedColumnCount }),
hideIdenticalColumns: identicalColumnCount > 0 ? t("grid.hideIdenticalColumnsCount", { count: identicalColumnCount }) : t("grid.hideIdenticalColumns"),
diff --git a/apps/desktop/src/components/grid/DataGridFreezeFirstColumnControl.vue b/apps/desktop/src/components/grid/DataGridFreezeFirstColumnControl.vue
new file mode 100644
index 0000000000..ed8893bac7
--- /dev/null
+++ b/apps/desktop/src/components/grid/DataGridFreezeFirstColumnControl.vue
@@ -0,0 +1,19 @@
+<script setup lang="ts">
+import { Pin } from "@lucide/vue";
+import { useI18n } from "vue-i18n";
+import { Switch } from "@/components/ui/switch";
+import { useSettingsStore } from "@/stores/settingsStore";
+
+const { t } = useI18n();
+const settingsStore = useSettingsStore();
+</script>
+
+<template>
+ <div class="flex items-center justify-between gap-3 px-3 py-1.5 text-xs" :title="t('grid.freezeFirstColumnGloballyHint')">
+ <span class="min-w-0 flex items-center gap-2 font-medium">
+ <Pin class="h-3.5 w-3.5 shrink-0 text-muted-foreground" />
+ {{ t("grid.freezeFirstColumnGlobally") }}
+ </span>
+ <Switch size="sm" :model-value="settingsStore.editorSettings.dataGridFreezeFirstColumn" :aria-label="t('grid.freezeFirstColumnGlobally')" @update:model-value="settingsStore.updateEditorSettings({ dataGridFreezeFirstColumn: $event })" />
+ </div>
+</template>
diff --git a/apps/desktop/src/components/layout/ContentArea.vue b/apps/desktop/src/components/layout/ContentArea.vue
index 0d80795a6b..4ac52267a2 100644
--- a/apps/desktop/src/components/layout/ContentArea.vue
+++ b/apps/desktop/src/components/layout/ContentArea.vue
@@ -77,6 +77,7 @@ import QueryResultToolbarActions from "@/components/layout/QueryResultToolbarAct
import ResultSetNavigator from "@/components/layout/ResultSetNavigator.vue";
import QueryResultViewSwitcher from "@/components/layout/QueryResultViewSwitcher.vue";
import ProductionWatermark from "@/components/common/ProductionWatermark.vue";
+import DataGridFreezeFirstColumnControl from "@/components/grid/DataGridFreezeFirstColumnControl.vue";
import DataGridCopyFormatControl from "@/components/grid/DataGridCopyFormatControl.vue";
import DataGridFontFamilyControl from "@/components/grid/DataGridFontFamilyControl.vue";
import DataGridColumnWidthModeControl from "@/components/grid/DataGridColumnWidthModeControl.vue";
@@ -2476,6 +2477,7 @@ defineExpose({
<Switch size="sm" :model-value="!!dataGridRef?.nullColumnsHidden" :disabled="!dataGridRef?.canToggleAllNullColumns" :aria-label="t('grid.hideNullColumns')" @update:model-value="dataGridRef?.toggleAllNullColumns()" />
</div>
<DataGridEmptyColumnsControl :count="dataGridRef?.allEmptyColumnCount" :column-count="dataGridRef?.displayableColumnCount" />
+ <DataGridFreezeFirstColumnControl />
<DataGridCopyFormatControl
:current-label="dataGridRef?.defaultCopyPreferenceLabel ?? '-'"
:current-value="dataGridRef?.defaultCopyPreference ?? ''"
@@ -3178,6 +3180,7 @@ defineExpose({
<Switch size="sm" :model-value="!!dataGridRef?.nullColumnsHidden" :disabled="!dataGridRef?.canToggleAllNullColumns" :aria-label="t('grid.hideNullColumns')" @update:model-value="dataGridRef?.toggleAllNullColumns()" />
</div>
<DataGridEmptyColumnsControl :count="dataGridRef?.allEmptyColumnCount" :column-count="dataGridRef?.displayableColumnCount" />
+ <DataGridFreezeFirstColumnControl />
<DataGridCopyFormatControl
:current-label="dataGridRef?.defaultCopyPreferenceLabel ?? '-'"
:current-value="dataGridRef?.defaultCopyPreference ?? ''"
diff --git a/apps/desktop/src/composables/useDataGridColumnLayout.ts b/apps/desktop/src/composables/useDataGridColumnLayout.ts
index a10f834c2b..3b79d0418a 100644
--- a/apps/desktop/src/composables/useDataGridColumnLayout.ts
+++ b/apps/desktop/src/composables/useDataGridColumnLayout.ts
@@ -118,6 +118,7 @@ export function useDataGridColumnLayoutState(options: {
tableScopeKey: MaybeRefOrGetter<string>;
initialHiddenColumnKeys?: MaybeRefOrGetter<readonly string[] | undefined>;
hideNullColumns?: MaybeRefOrGetter<boolean>;
+ freezeFirstColumn?: MaybeRefOrGetter<boolean>;
onHideNullColumnsChange?: (value: boolean) => void;
onRefreshMetrics?: () => void;
}) {
@@ -129,13 +130,15 @@ export function useDataGridColumnLayoutState(options: {
const autoHiddenNullColumnIndexes = ref<Set<number>>(new Set());
const persistedColumnOrderKeys = ref<string[]>([]);
const persistedHiddenColumnKeys = ref<string[]>([...(toValue(options.initialHiddenColumnKeys) ?? [])]);
- const frozenColumnCount = ref(0);
+ const manualFrozenColumnCount = ref(0);
const columnOrderSnapshotBeforeFreeze = ref<string[] | null>(null);
let columnLayoutPersistTimer: ReturnType<typeof setTimeout> | undefined;
let columnLayoutPersistPending = false;
let pendingColumnLayoutScopeKey = "";
const orderedDisplayableColumnIndexes = computed(() => orderedColumnIndexes({ availableIndexes: toValue(options.displayableColumnIndexes), columnKeys: toValue(options.columnOrderKeys), orderedKeys: persistedColumnOrderKeys.value }));
const visibleColumnIndexes = computed(() => visibleColumnIndexesForFilter(orderedDisplayableColumnIndexes.value, hiddenColumnIndexes.value));
+ // The global preference is a rendering floor, never a per-layout persisted freeze.
+ const frozenColumnCount = computed(() => Math.min(visibleColumnIndexes.value.length, Math.max(manualFrozenColumnCount.value, toValue(options.freezeFirstColumn) ? 1 : 0)));
const displayableColumnCount = computed(() => toValue(options.displayableColumnIndexes).length);
const hiddenColumnCount = computed(() => displayableColumnCount.value - visibleColumnIndexes.value.length);
const allNullColumnCount = computed(() => toValue(options.allNullColumnIndexes).length);
@@ -274,12 +277,12 @@ export function useDataGridColumnLayoutState(options: {
function loadFrozenColumnCount() {
const state = loadDataGridColumnFrozenState(toValue(options.layoutScopeKey));
- frozenColumnCount.value = Math.min(state.frozenCount, visibleColumnIndexes.value.length);
+ manualFrozenColumnCount.value = Math.min(state.frozenCount, visibleColumnIndexes.value.length);
columnOrderSnapshotBeforeFreeze.value = state.orderBeforeFreeze;
}
function setFrozenColumnCount(count: number) {
const clampedCount = Math.max(0, Math.min(count, visibleColumnIndexes.value.length));
- frozenColumnCount.value = clampedCount;
+ manualFrozenColumnCount.value = clampedCount;
if (clampedCount > 0) {
saveDataGridColumnFrozenCount(toValue(options.layoutScopeKey), clampedCount, columnOrderSnapshotBeforeFreeze.value);
} else {
@@ -312,7 +315,7 @@ export function useDataGridColumnLayoutState(options: {
const selectedActualIdxs = [...new Set(selectedVisibleColIdxs.map((vIdx) => visibleIdxs[vIdx]).filter((idx): idx is number => idx !== undefined))];
if (selectedActualIdxs.length === 0) return;
const currentOrder = orderedDisplayableColumnIndexes.value;
- const frozenVisibleIndexes = visibleColumnIndexes.value.slice(0, frozenColumnCount.value);
+ const frozenVisibleIndexes = visibleColumnIndexes.value.slice(0, manualFrozenColumnCount.value);
const frozenSet = new Set(frozenVisibleIndexes);
const additions = selectedActualIdxs.filter((idx) => !frozenSet.has(idx));
if (additions.length === 0) return;
@@ -320,15 +323,15 @@ export function useDataGridColumnLayoutState(options: {
const remaining = currentOrder.filter((idx) => !additions.includes(idx));
const frozenEnd = frozenVisibleIndexes.reduce((end, idx) => Math.max(end, remaining.indexOf(idx) + 1), 0);
persistColumnOrder([...remaining.slice(0, frozenEnd), ...additions, ...remaining.slice(frozenEnd)]);
- setFrozenColumnCount(frozenColumnCount.value + additions.length);
+ setFrozenColumnCount(manualFrozenColumnCount.value + additions.length);
}
function unfreezeSelectedColumns(selectedVisibleColIdxs: number[]) {
- if (selectedVisibleColIdxs.length === 0 || frozenColumnCount.value === 0) return;
+ if (selectedVisibleColIdxs.length === 0 || manualFrozenColumnCount.value === 0) return;
const visibleIdxs = visibleColumnIndexes.value;
const selected = new Set(selectedVisibleColIdxs.map((vIdx) => visibleIdxs[vIdx]).filter((idx): idx is number => idx !== undefined));
const currentOrder = orderedDisplayableColumnIndexes.value;
- const frozen = visibleColumnIndexes.value.slice(0, frozenColumnCount.value);
+ const frozen = visibleColumnIndexes.value.slice(0, manualFrozenColumnCount.value);
const removing = frozen.filter((idx) => selected.has(idx));
if (removing.length === 0) return;
if (columnOrderSnapshotBeforeFreeze.value === null) columnOrderSnapshotBeforeFreeze.value = [...persistedColumnOrderKeys.value];
@@ -441,7 +444,7 @@ export function useDataGridColumnLayoutState(options: {
watch(
() => visibleColumnIndexes.value.length,
(visibleCount) => {
- if (frozenColumnCount.value > visibleCount) setFrozenColumnCount(visibleCount);
+ if (manualFrozenColumnCount.value > visibleCount) setFrozenColumnCount(visibleCount);
},
{ flush: "sync" },
);
diff --git a/apps/desktop/src/i18n/locales/az.ts b/apps/desktop/src/i18n/locales/az.ts
index 9bc201af58..8ccdc1dfb9 100644
--- a/apps/desktop/src/i18n/locales/az.ts
+++ b/apps/desktop/src/i18n/locales/az.ts
@@ -2240,6 +2240,9 @@ export default withEnglishFallback({
sortSqlCopied: "SQL sıralaması kopyalandı",
resizeSortPanel: "Sıralama panelinin ölçüsünü dəyiş",
sortTextView: "Sıralama mətn görünüşü",
+ freezeFirstColumnGlobally: "İlk sütunu qlobal sabitlə",
+ freezeFirstColumnGloballyHint: "Bütün məlumat cədvəllərində ilk görünən məlumat sütununu sabitlə.",
+ globalFirstColumnRemainsFrozen: "ilk sütun qlobal olaraq sabit qalır",
freezeToColumn: "Bu sütuna qədər sabitlə",
freezeSelectedColumns: "Seçilmiş sütunları sabitlə ({count})",
freezeCurrentColumn: "Cari sütunu sabitlə",
diff --git a/apps/desktop/src/i18n/locales/en.ts b/apps/desktop/src/i18n/locales/en.ts
index ff96b9ee97..84b42c288b 100644
--- a/apps/desktop/src/i18n/locales/en.ts
+++ b/apps/desktop/src/i18n/locales/en.ts
@@ -2703,6 +2703,9 @@ export default {
sortSqlCopied: "SQL sort copied",
resizeSortPanel: "Resize sort panel",
sortTextView: "Sort text view",
+ freezeFirstColumnGlobally: "Freeze First Column Globally",
+ freezeFirstColumnGloballyHint: "Keep the first visible data column frozen in all data grids.",
+ globalFirstColumnRemainsFrozen: "first column remains globally frozen",
freezeToColumn: "Freeze to This Column",
freezeSelectedColumns: "Freeze Selected Columns ({count})",
freezeCurrentColumn: "Freeze Current Column",
diff --git a/apps/desktop/src/i18n/locales/es.ts b/apps/desktop/src/i18n/locales/es.ts
index 040719d418..0e4dfd9964 100644
--- a/apps/desktop/src/i18n/locales/es.ts
+++ b/apps/desktop/src/i18n/locales/es.ts
@@ -2539,6 +2539,9 @@ export default withEnglishFallback({
sortSqlCopied: "Ordenación SQL copiada",
resizeSortPanel: "Cambiar el tamaño del panel de ordenación",
sortTextView: "Vista de texto de ordenación",
+ freezeFirstColumnGlobally: "Inmovilizar primera columna globalmente",
+ freezeFirstColumnGloballyHint: "Mantener fija la primera columna de datos visible en todas las tablas.",
+ globalFirstColumnRemainsFrozen: "la primera columna sigue fija globalmente",
freezeToColumn: "Inmovilizar hasta esta columna",
freezeSelectedColumns: "Inmovilizar columnas seleccionadas ({count})",
freezeCurrentColumn: "Inmovilizar columna actual",
diff --git a/apps/desktop/src/i18n/locales/id.ts b/apps/desktop/src/i18n/locales/id.ts
index a7cc2662b6..cbd4eb5c1a 100644
--- a/apps/desktop/src/i18n/locales/id.ts
+++ b/apps/desktop/src/i18n/locales/id.ts
@@ -2536,6 +2536,9 @@ export default withEnglishFallback({
sortSqlCopied: "SQL urutan disalin",
resizeSortPanel: "Ubah ukuran panel urutan",
sortTextView: "Tampilan teks urutan",
+ freezeFirstColumnGlobally: "Bekukan Kolom Pertama Secara Global",
+ freezeFirstColumnGloballyHint: "Bekukan kolom data pertama yang terlihat di semua tabel data.",
+ globalFirstColumnRemainsFrozen: "kolom pertama tetap dibekukan secara global",
freezeToColumn: "Bekukan hingga Kolom Ini",
freezeSelectedColumns: "Bekukan Kolom Terpilih ({count})",
freezeCurrentColumn: "Bekukan Kolom Saat Ini",
diff --git a/apps/desktop/src/i18n/locales/it.ts b/apps/desktop/src/i18n/locales/it.ts
index 02c5ad66af..1fd7a85bf3 100644
--- a/apps/desktop/src/i18n/locales/it.ts
+++ b/apps/desktop/src/i18n/locales/it.ts
@@ -2433,6 +2433,9 @@ export default withEnglishFallback({
sortSqlCopied: "Ordinamento SQL copiato",
resizeSortPanel: "Ridimensiona pannello di ordinamento",
sortTextView: "Vista testuale dell'ordinamento",
+ freezeFirstColumnGlobally: "Blocca prima colonna globalmente",
+ freezeFirstColumnGloballyHint: "Mantieni bloccata la prima colonna di dati visibile in tutte le tabelle.",
+ globalFirstColumnRemainsFrozen: "la prima colonna resta bloccata globalmente",
freezeToColumn: "Blocca fino a questa colonna",
freezeSelectedColumns: "Blocca colonne selezionate ({count})",
freezeCurrentColumn: "Blocca colonna corrente",
diff --git a/apps/desktop/src/i18n/locales/ja.ts b/apps/desktop/src/i18n/locales/ja.ts
index 31586a84d1..b72b5ef3bd 100644
--- a/apps/desktop/src/i18n/locales/ja.ts
+++ b/apps/desktop/src/i18n/locales/ja.ts
@@ -2439,6 +2439,9 @@ export default withEnglishFallback({
sortSqlCopied: "SQL 並べ替えをコピーしました",
resizeSortPanel: "並べ替えパネルのサイズを変更",
sortTextView: "並べ替えテキストビュー",
+ freezeFirstColumnGlobally: "すべての表で先頭列を固定",
+ freezeFirstColumnGloballyHint: "すべてのデータ表で最初の表示データ列を固定します。",
+ globalFirstColumnRemainsFrozen: "先頭列は全体設定により固定されたままです",
freezeToColumn: "この列まで固定",
freezeSelectedColumns: "選択列を固定 ({count})",
freezeCurrentColumn: "現在の列を固定",
diff --git a/apps/desktop/src/i18n/locales/ko.ts b/apps/desktop/src/i18n/locales/ko.ts
index c62a07aa6a..1a575055a4 100644
--- a/apps/desktop/src/i18n/locales/ko.ts
+++ b/apps/desktop/src/i18n/locales/ko.ts
@@ -2480,6 +2480,9 @@ export default withEnglishFallback({
sortSqlCopied: "SQL 정렬이 복사되었습니다",
resizeSortPanel: "정렬 패널 크기 조정",
sortTextView: "정렬 텍스트 보기",
+ freezeFirstColumnGlobally: "모든 표의 첫 번째 열 고정",
+ freezeFirstColumnGloballyHint: "모든 데이터 표에서 첫 번째 표시 데이터 열을 고정합니다.",
+ globalFirstColumnRemainsFrozen: "첫 번째 열은 전역 설정으로 계속 고정됩니다",
freezeToColumn: "이 컬럼까지 고정",
freezeSelectedColumns: "선택한 컬럼 고정 ({count})",
freezeCurrentColumn: "현재 열 고정",
diff --git a/apps/desktop/src/i18n/locales/pt-BR.ts b/apps/desktop/src/i18n/locales/pt-BR.ts
index 477de4228e..2490aa1fe5 100644
--- a/apps/desktop/src/i18n/locales/pt-BR.ts
+++ b/apps/desktop/src/i18n/locales/pt-BR.ts
@@ -2434,6 +2434,9 @@ export default withEnglishFallback({
sortSqlCopied: "Ordenação SQL copiada",
resizeSortPanel: "Redimensionar painel de ordenação",
sortTextView: "Visualização textual da ordenação",
+ freezeFirstColumnGlobally: "Congelar primeira coluna globalmente",
+ freezeFirstColumnGloballyHint: "Manter congelada a primeira coluna de dados visível em todas as tabelas.",
+ globalFirstColumnRemainsFrozen: "a primeira coluna permanece congelada globalmente",
freezeToColumn: "Congelar até esta coluna",
freezeSelectedColumns: "Congelar colunas selecionadas ({count})",
freezeCurrentColumn: "Congelar coluna atual",
diff --git a/apps/desktop/src/i18n/locales/ru.ts b/apps/desktop/src/i18n/locales/ru.ts
index 8ca10ff065..9b99ceee3b 100644
--- a/apps/desktop/src/i18n/locales/ru.ts
+++ b/apps/desktop/src/i18n/locales/ru.ts
@@ -2596,6 +2596,9 @@ export default withEnglishFallback({
sortSqlCopied: "Сортировка SQL скопирована",
resizeSortPanel: "Изменить размер панели сортировки",
sortTextView: "Текстовый вид сортировки",
+ freezeFirstColumnGlobally: "Закреплять первый столбец во всех таблицах",
+ freezeFirstColumnGloballyHint: "Закреплять первый видимый столбец данных во всех таблицах.",
+ globalFirstColumnRemainsFrozen: "первый столбец остаётся закреплён глобально",
freezeToColumn: "Закрепить до этого столбца",
freezeSelectedColumns: "Закрепить выбранные столбцы ({count})",
freezeCurrentColumn: "Закрепить текущий столбец",
diff --git a/apps/desktop/src/i18n/locales/tr.ts b/apps/desktop/src/i18n/locales/tr.ts
index e8e3a366b7..d7219170b5 100644
--- a/apps/desktop/src/i18n/locales/tr.ts
+++ b/apps/desktop/src/i18n/locales/tr.ts
@@ -2233,6 +2233,9 @@ export default withEnglishFallback({
sortSqlCopied: "SQL sıralaması kopyalandı",
resizeSortPanel: "Sıralama panelini yeniden boyutlandır",
sortTextView: "Sıralama metin görünümü",
+ freezeFirstColumnGlobally: "İlk Sütunu Genel Olarak Sabitle",
+ freezeFirstColumnGloballyHint: "Tüm veri tablolarında ilk görünür veri sütununu sabit tut.",
+ globalFirstColumnRemainsFrozen: "ilk sütun genel ayarla sabit kalır",
freezeToColumn: "Bu Sütuna Kadar Dondur",
freezeSelectedColumns: "Seçili Sütunları Dondur ({count})",
freezeCurrentColumn: "Geçerli sütunu sabitle",
diff --git a/apps/desktop/src/i18n/locales/zh-CN.ts b/apps/desktop/src/i18n/locales/zh-CN.ts
index 3f84402379..2055bc1230 100644
--- a/apps/desktop/src/i18n/locales/zh-CN.ts
+++ b/apps/desktop/src/i18n/locales/zh-CN.ts
@@ -2638,6 +2638,9 @@ export default withEnglishFallback({
sortSqlCopied: "SQL 排序已复制",
resizeSortPanel: "调整排序面板高度",
sortTextView: "排序文本视图",
+ freezeFirstColumnGlobally: "全局冻结首列",
+ freezeFirstColumnGloballyHint: "在所有数据表格中冻结第一个可见数据列。",
+ globalFirstColumnRemainsFrozen: "首列仍由全局设置冻结",
freezeToColumn: "冻结到此列",
freezeSelectedColumns: "冻结选中列({count} 列)",
freezeCurrentColumn: "冻结当前列",
diff --git a/apps/desktop/src/i18n/locales/zh-TW.ts b/apps/desktop/src/i18n/locales/zh-TW.ts
index 4e18df5c68..3256d8f6d6 100644
--- a/apps/desktop/src/i18n/locales/zh-TW.ts
+++ b/apps/desktop/src/i18n/locales/zh-TW.ts
@@ -2434,6 +2434,9 @@ export default withEnglishFallback({
sortSqlCopied: "SQL 排序已複製",
resizeSortPanel: "調整排序面板高度",
sortTextView: "排序文字檢視",
+ freezeFirstColumnGlobally: "全域凍結首欄",
+ freezeFirstColumnGloballyHint: "在所有資料表格中凍結第一個可見資料欄。",
+ globalFirstColumnRemainsFrozen: "首欄仍由全域設定凍結",
freezeToColumn: "凍結到此欄",
freezeSelectedColumns: "凍結選取欄({count} 欄)",
freezeCurrentColumn: "凍結目前欄",
diff --git a/apps/desktop/src/lib/dataGrid/canvasDataGridRenderer.ts b/apps/desktop/src/lib/dataGrid/canvasDataGridRenderer.ts
index 9bb0b89d6c..35f39ffc86 100644
--- a/apps/desktop/src/lib/dataGrid/canvasDataGridRenderer.ts
+++ b/apps/desktop/src/lib/dataGrid/canvasDataGridRenderer.ts
@@ -764,7 +764,8 @@ export function drawCanvasDataGrid(options: DrawCanvasDataGridOptions): boolean
// 画冻结列分隔线(与 DOM 模式和列头一致:2px 灰色右边框)
// DOM 的 border-right 右边缘对齐单元格右边缘,中心偏左 1px;
// Canvas 的 stroke 以坐标点为中心,需左移 1px 使两者对齐
- if (frozenColumnCount > 0 && frozenColumnCount < renderedColumnWidths.length) {
+ const frozenSeparatorHeight = Math.min(height, Math.max(0, rowCount * CANVAS_DATA_GRID_ROW_HEIGHT - scrollTop));
+ if (frozenColumnCount > 0 && frozenColumnCount < renderedColumnWidths.length && frozenSeparatorHeight > 0) {
const frozenWidth = offsets[frozenColumnCount] ?? 0;
const separatorX = rowNumberWidth + frozenWidth - 1;
ctx.save();
@@ -772,7 +773,7 @@ export function drawCanvasDataGrid(options: DrawCanvasDataGridOptions): boolean
ctx.lineWidth = 2;
ctx.beginPath();
ctx.moveTo(separatorX, 0);
- ctx.lineTo(separatorX, height);
+ ctx.lineTo(separatorX, frozenSeparatorHeight);
ctx.stroke();
ctx.restore();
}
diff --git a/apps/desktop/src/stores/settingsStore.ts b/apps/desktop/src/stores/settingsStore.ts
index 3fcd195f03..6236524151 100644
--- a/apps/desktop/src/stores/settingsStore.ts
+++ b/apps/desktop/src/stores/settingsStore.ts
@@ -1100,6 +1100,7 @@ export interface EditorSettings {
dataGridMultiRowTranspose: boolean;
dataGridHideNullColumns: boolean;
dataGridHideEmptyColumns: boolean;
+ dataGridFreezeFirstColumn: boolean;
dataGridBooleanDisplayMode: "dropdown" | "checkbox";
numericColumnRightAlign: boolean;
tableFontFamily: string;
@@ -1432,6 +1433,7 @@ export const DEFAULT_EDITOR_SETTINGS: EditorSettings = {
dataGridMultiRowTranspose: false,
dataGridHideNullColumns: false,
dataGridHideEmptyColumns: false,
+ dataGridFreezeFirstColumn: false,
dataGridBooleanDisplayMode: "dropdown",
numericColumnRightAlign: true,
tableFontFamily: DEFAULT_DATA_GRID_FONT_FAMILY,
@@ -2082,6 +2084,7 @@ export function normalizeEditorSettings(settings: Partial<EditorSettings>, exist
dataGridMultiRowTranspose: settings.dataGridMultiRowTranspose === true,
dataGridHideNullColumns: settings.dataGridHideNullColumns === true,
dataGridHideEmptyColumns: settings.dataGridHideEmptyColumns === true,
+ dataGridFreezeFirstColumn: settings.dataGridFreezeFirstColumn === true,
dataGridBooleanDisplayMode: settings.dataGridBooleanDisplayMode === "checkbox" ? "checkbox" : "dropdown",
numericColumnRightAlign: typeof settings.numericColumnRightAlign === "boolean" ? settings.numericColumnRightAlign : DEFAULT_EDITOR_SETTINGS.numericColumnRightAlign,
tableFontFamily: normalizeFontFamily(settings.tableFontFamily, DEFAULT_EDITOR_SETTINGS.tableFontFamily),
@@ -2972,6 +2975,7 @@ export const useSettingsStore = defineStore("settings", () => {
if (partial.dataGridMultiRowTranspose !== undefined) editorSettings.value.dataGridMultiRowTranspose = partial.dataGridMultiRowTranspose === true;
if (partial.dataGridHideNullColumns !== undefined) editorSettings.value.dataGridHideNullColumns = partial.dataGridHideNullColumns === true;
if (partial.dataGridHideEmptyColumns !== undefined) editorSettings.value.dataGridHideEmptyColumns = partial.dataGridHideEmptyColumns === true;
+ if (partial.dataGridFreezeFirstColumn !== undefined) editorSettings.value.dataGridFreezeFirstColumn = partial.dataGridFreezeFirstColumn === true;
if (partial.dataGridBooleanDisplayMode !== undefined) editorSettings.value.dataGridBooleanDisplayMode = partial.dataGridBooleanDisplayMode === "dropdown" ? "dropdown" : "checkbox";
if (partial.numericColumnRightAlign !== undefined) editorSettings.value.numericColumnRightAlign = partial.numericColumnRightAlign === true;
if (partial.tableFontFamily !== undefined) editorSettings.value.tableFontFamily = normalizeFontFamily(partial.tableFontFamily, DEFAULT_EDITOR_SETTINGS.tableFontFamily);