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): customize crosshair highlight colors

lxk95526085752a1e2
diff --git a/apps/desktop/src/components/editor/EditorSettingsDialog.vue b/apps/desktop/src/components/editor/EditorSettingsDialog.vue
index c48f0db52e..e28eb34d8d 100644
--- a/apps/desktop/src/components/editor/EditorSettingsDialog.vue
+++ b/apps/desktop/src/components/editor/EditorSettingsDialog.vue
@@ -766,6 +766,8 @@ const editDataGridAutoTransposeSingleRow = ref(settingsStore.editorSettings.data
const editDataGridCellDetailButtonVisible = ref(settingsStore.editorSettings.dataGridCellDetailButtonVisible);
const editDataGridCellDetailDialogDefault = ref(settingsStore.editorSettings.dataGridCellDetailDialogDefault);
const editDataGridCrosshairHighlight = ref(settingsStore.editorSettings.dataGridCrosshairHighlight);
+const editDataGridCrosshairRowBg = ref(settingsStore.editorSettings.dataGridCrosshairRowBg);
+const editDataGridCrosshairColBg = ref(settingsStore.editorSettings.dataGridCrosshairColBg);
const editDataGridStripedRows = ref(settingsStore.editorSettings.dataGridStripedRows);
const editDataGridZebraRowBg = ref(settingsStore.editorSettings.dataGridZebraRowBg);
const editPageSize = ref(settingsStore.editorSettings.pageSize);
@@ -1135,6 +1137,8 @@ function currentEditorSettingsDraft(): EditorSettingsDraft {
dataGridCellDetailButtonVisible: editDataGridCellDetailButtonVisible.value,
dataGridCellDetailDialogDefault: editDataGridCellDetailDialogDefault.value,
dataGridCrosshairHighlight: editDataGridCrosshairHighlight.value,
+ dataGridCrosshairRowBg: editDataGridCrosshairRowBg.value,
+ dataGridCrosshairColBg: editDataGridCrosshairColBg.value,
dataGridStripedRows: editDataGridStripedRows.value,
dataGridZebraRowBg: editDataGridZebraRowBg.value,
flatteningMultiLineText: editFlatteningMultiLineText.value,
@@ -1819,6 +1823,8 @@ function syncEditorSettingsDraftFromStore() {
editDataGridCellDetailButtonVisible.value = settingsStore.editorSettings.dataGridCellDetailButtonVisible;
editDataGridCellDetailDialogDefault.value = settingsStore.editorSettings.dataGridCellDetailDialogDefault;
editDataGridCrosshairHighlight.value = settingsStore.editorSettings.dataGridCrosshairHighlight;
+ editDataGridCrosshairRowBg.value = settingsStore.editorSettings.dataGridCrosshairRowBg;
+ editDataGridCrosshairColBg.value = settingsStore.editorSettings.dataGridCrosshairColBg;
editDataGridStripedRows.value = settingsStore.editorSettings.dataGridStripedRows;
editDataGridZebraRowBg.value = settingsStore.editorSettings.dataGridZebraRowBg;
editFlatteningMultiLineText.value = settingsStore.editorSettings.flatteningMultiLineText;
@@ -1978,6 +1984,8 @@ const editorSettingsDraftRefs: EditorSettingsDraftRefMap = {
dataGridCellDetailButtonVisible: editDataGridCellDetailButtonVisible,
dataGridCellDetailDialogDefault: editDataGridCellDetailDialogDefault,
dataGridCrosshairHighlight: editDataGridCrosshairHighlight,
+ dataGridCrosshairRowBg: editDataGridCrosshairRowBg,
+ dataGridCrosshairColBg: editDataGridCrosshairColBg,
dataGridStripedRows: editDataGridStripedRows,
dataGridZebraRowBg: editDataGridZebraRowBg,
pageSize: editPageSize,
@@ -2576,6 +2584,8 @@ function resetDefaultsForTab(tab: SettingsCategory) {
editDataGridCellDetailButtonVisible.value = DEFAULT_EDITOR_SETTINGS.dataGridCellDetailButtonVisible;
editDataGridCellDetailDialogDefault.value = DEFAULT_EDITOR_SETTINGS.dataGridCellDetailDialogDefault;
editDataGridCrosshairHighlight.value = DEFAULT_EDITOR_SETTINGS.dataGridCrosshairHighlight;
+ editDataGridCrosshairRowBg.value = DEFAULT_EDITOR_SETTINGS.dataGridCrosshairRowBg;
+ editDataGridCrosshairColBg.value = DEFAULT_EDITOR_SETTINGS.dataGridCrosshairColBg;
editDataGridStripedRows.value = DEFAULT_EDITOR_SETTINGS.dataGridStripedRows;
editDataGridZebraRowBg.value = DEFAULT_EDITOR_SETTINGS.dataGridZebraRowBg;
editFlatteningMultiLineText.value = DEFAULT_EDITOR_SETTINGS.flatteningMultiLineText;
@@ -2701,6 +2711,8 @@ function resetAllDefaults() {
editDataGridCellDetailButtonVisible.value = DEFAULT_EDITOR_SETTINGS.dataGridCellDetailButtonVisible;
editDataGridCellDetailDialogDefault.value = DEFAULT_EDITOR_SETTINGS.dataGridCellDetailDialogDefault;
editDataGridCrosshairHighlight.value = DEFAULT_EDITOR_SETTINGS.dataGridCrosshairHighlight;
+ editDataGridCrosshairRowBg.value = DEFAULT_EDITOR_SETTINGS.dataGridCrosshairRowBg;
+ editDataGridCrosshairColBg.value = DEFAULT_EDITOR_SETTINGS.dataGridCrosshairColBg;
editDataGridStripedRows.value = DEFAULT_EDITOR_SETTINGS.dataGridStripedRows;
editDataGridZebraRowBg.value = DEFAULT_EDITOR_SETTINGS.dataGridZebraRowBg;
editFlatteningMultiLineText.value = DEFAULT_EDITOR_SETTINGS.flatteningMultiLineText;
@@ -8907,7 +8919,37 @@ onUnmounted(() => {
{{ t("settings.dataGridCrosshairHighlightDescription") }}
</p>
</div>
- <Switch id="data-grid-crosshair-highlight" v-model="editDataGridCrosshairHighlight" />
+ <div class="flex items-center gap-3">
+ <div v-if="editDataGridCrosshairHighlight" class="flex flex-wrap items-center gap-2.5">
+ <div class="flex items-center gap-1.5">
+ <Label for="data-grid-crosshair-row-bg" class="text-xs text-muted-foreground">{{ t("settings.dataGridCrosshairRowBg") }}</Label>
+ <input
+ id="data-grid-crosshair-row-bg"
+ type="color"
+ class="h-6 w-8 shrink-0 cursor-pointer rounded border border-border bg-transparent p-0.5"
+ :value="editDataGridCrosshairRowBg || (isDark ? '#4b5462' : '#aec3e0')"
+ @input="editDataGridCrosshairRowBg = ($event.target as HTMLInputElement).value"
+ />
+ <Button v-if="editDataGridCrosshairRowBg" type="button" variant="ghost" size="sm" class="h-6 px-1 text-[11px] text-muted-foreground hover:text-foreground" @click="editDataGridCrosshairRowBg = ''">
+ {{ t("settings.reset") }}
+ </Button>
+ </div>
+ <div class="flex items-center gap-1.5">
+ <Label for="data-grid-crosshair-col-bg" class="text-xs text-muted-foreground">{{ t("settings.dataGridCrosshairColBg") }}</Label>
+ <input
+ id="data-grid-crosshair-col-bg"
+ type="color"
+ class="h-6 w-8 shrink-0 cursor-pointer rounded border border-border bg-transparent p-0.5"
+ :value="editDataGridCrosshairColBg || (isDark ? '#626f82' : '#8eaad2')"
+ @input="editDataGridCrosshairColBg = ($event.target as HTMLInputElement).value"
+ />
+ <Button v-if="editDataGridCrosshairColBg" type="button" variant="ghost" size="sm" class="h-6 px-1 text-[11px] text-muted-foreground hover:text-foreground" @click="editDataGridCrosshairColBg = ''">
+ {{ t("settings.reset") }}
+ </Button>
+ </div>
+ </div>
+ <Switch id="data-grid-crosshair-highlight" v-model="editDataGridCrosshairHighlight" />
+ </div>
</div>
<div class="settings-item flex items-center justify-between gap-4 rounded-md border bg-muted/20 px-3 py-2">
<div class="space-y-1">
diff --git a/apps/desktop/src/components/grid/DataGrid.vue b/apps/desktop/src/components/grid/DataGrid.vue
index 3511dc50e5..d634f77b36 100644
--- a/apps/desktop/src/components/grid/DataGrid.vue
+++ b/apps/desktop/src/components/grid/DataGrid.vue
@@ -2662,6 +2662,8 @@ const gridStyle = computed(() => ({
[EDITOR_FONT_FAMILY_CSS_VAR]: settingsStore.editorSettings.fontFamily,
"--dbx-data-grid-font-family": tableFontFamily.value,
"--dbx-table-font-size": `${tableFontSize.value}px`,
+ ...(settingsStore.editorSettings.dataGridCrosshairRowBg?.trim() ? { "--data-grid-cell-crosshair-row-bg": settingsStore.editorSettings.dataGridCrosshairRowBg.trim() } : {}),
+ ...(settingsStore.editorSettings.dataGridCrosshairColBg?.trim() ? { "--data-grid-cell-crosshair-col-bg": settingsStore.editorSettings.dataGridCrosshairColBg.trim() } : {}),
}));
const gridHorizontalScrollLeft = ref(0);
let gridScrollLeftBeforeTranspose = 0;
@@ -7464,7 +7466,7 @@ const dataGridTypeColorKey = computed(() => {
});
const canvasRenderStyleKey = computed(
() =>
- `${settingsStore.editorSettings.theme}:${settingsStore.editorSettings.uiScale}:${canvasBackingPixelRatio.value}:${isDark.value}:${themePalette.value}:${tableFontFamily.value}:${tableFontSize.value}:${!!saveError.value}:${dataGridTypeColorKey.value}:${dataGridStripedRows.value}:${settingsStore.editorSettings.dataGridZebraRowBg}`,
+ `${settingsStore.editorSettings.theme}:${settingsStore.editorSettings.uiScale}:${canvasBackingPixelRatio.value}:${isDark.value}:${themePalette.value}:${tableFontFamily.value}:${tableFontSize.value}:${!!saveError.value}:${dataGridTypeColorKey.value}:${dataGridStripedRows.value}:${settingsStore.editorSettings.dataGridZebraRowBg}:${settingsStore.editorSettings.dataGridCrosshairRowBg}:${settingsStore.editorSettings.dataGridCrosshairColBg}`,
);
const CANVAS_MOUSE_WHEEL_SCROLL_MULTIPLIER = 1.5;
const CANVAS_TRACKPAD_DELTA_THRESHOLD = 40;
@@ -8246,6 +8248,8 @@ function drawCanvasGrid() {
showWhitespace: showWhitespaceEnabled.value,
stripedRows: dataGridStripedRows.value,
zebraRowBg: settingsStore.editorSettings.dataGridZebraRowBg,
+ crosshairRowBg: settingsStore.editorSettings.dataGridCrosshairRowBg,
+ crosshairColBg: settingsStore.editorSettings.dataGridCrosshairColBg,
rowNumberMode: dataGridRowNumberMode.value,
});
if (!drawn) return;
diff --git a/apps/desktop/src/i18n/locales/az.ts b/apps/desktop/src/i18n/locales/az.ts
index 44de9c8af4..e63a6dd659 100644
--- a/apps/desktop/src/i18n/locales/az.ts
+++ b/apps/desktop/src/i18n/locales/az.ts
@@ -7411,6 +7411,8 @@ export default withEnglishFallback({
dataGridCellDetailDialogDefaultDescription: "Xana təfərrüatları düyməsinə kliklədikdə yan və ya aşağı panel yerinə standart olaraq modal dialoq pəncərəsində açır.",
dataGridCrosshairHighlight: "Sətir və sütunun çarpaz vurğulanması",
dataGridCrosshairHighlightDescription: "Aktiv olduqda aktiv xananın bütün sətrini və sütununu yüngülcə vurğula (Excel-dəki kimi). Fokuslanmış xana seçilmiş üslubunu saxlayır.",
+ dataGridCrosshairRowBg: "Sətir vurğu rəngi",
+ dataGridCrosshairColBg: "Sütun vurğu rəngi",
dataGridZebraRowBg: "Zolaq rəngi",
infiniteScroll: "Sonsuz sürüşdürmə ilə yükləmə",
autoCalculateTotalRows: "Ümumi sətir sayını avtomatik hesabla",
diff --git a/apps/desktop/src/i18n/locales/en.ts b/apps/desktop/src/i18n/locales/en.ts
index 660d49f0d1..16b8698836 100644
--- a/apps/desktop/src/i18n/locales/en.ts
+++ b/apps/desktop/src/i18n/locales/en.ts
@@ -8414,6 +8414,8 @@ export default {
dataGridCellDetailDialogDefaultDescription: "Open cell details in a modal dialog by default instead of the side or bottom panel.",
dataGridCrosshairHighlight: "Crosshair row & column highlight",
dataGridCrosshairHighlightDescription: "When enabled, lightly highlight the entire row and column of the active cell (like Excel). The focused cell keeps its selected style.",
+ dataGridCrosshairRowBg: "Row highlight color",
+ dataGridCrosshairColBg: "Column highlight color",
dataGridZebraRowBg: "Stripe Color",
infiniteScroll: "Infinite scroll loading",
autoCalculateTotalRows: "Auto-calculate total row count",
diff --git a/apps/desktop/src/i18n/locales/es.ts b/apps/desktop/src/i18n/locales/es.ts
index 281abf103d..5af0930b8c 100644
--- a/apps/desktop/src/i18n/locales/es.ts
+++ b/apps/desktop/src/i18n/locales/es.ts
@@ -7690,6 +7690,8 @@ export default withEnglishFallback({
dataGridCellDetailDialogDefaultDescription: "Abre los detalles de celda en un diálogo modal por defecto en lugar del panel lateral o inferior.",
dataGridCrosshairHighlight: "Resaltado de fila y columna en cruz",
dataGridCrosshairHighlightDescription: "Cuando esté activado, resalta ligeramente toda la fila y la columna de la celda activa (como Excel). La celda enfocada conserva su estilo seleccionado.",
+ dataGridCrosshairRowBg: "Color de fila resaltada",
+ dataGridCrosshairColBg: "Color de columna resaltada",
dataGridZebraRowBg: "Color de fila alterna",
infiniteScroll: "Carga de desplazamiento infinito",
autoCalculateTotalRows: "Calcular automáticamente el total de filas",
diff --git a/apps/desktop/src/i18n/locales/id.ts b/apps/desktop/src/i18n/locales/id.ts
index 3fc7968efd..4efd27d451 100644
--- a/apps/desktop/src/i18n/locales/id.ts
+++ b/apps/desktop/src/i18n/locales/id.ts
@@ -8142,6 +8142,8 @@ export default withEnglishFallback({
dataGridCellDetailDialogDefaultDescription: "Buka detail sel dalam dialog modal secara default daripada di panel samping atau bawah.",
dataGridCrosshairHighlight: "Sorot baris & kolom crosshair",
dataGridCrosshairHighlightDescription: "Jika diaktifkan, sorot secara samar seluruh baris dan kolom dari sel aktif (seperti Excel). Sel yang difokuskan tetap mempertahankan gaya terpilihnya.",
+ dataGridCrosshairRowBg: "Warna sorot baris",
+ dataGridCrosshairColBg: "Warna sorot kolom",
infiniteScroll: "Pemuatan gulir tak terbatas",
autoCalculateTotalRows: "Hitung total jumlah baris secara otomatis",
autoCalculateTotalRowsDescription: "Jalankan COUNT(*) secara otomatis setelah setiap kueri untuk menampilkan total baris yang cocok. Nonaktif secara default agar kueri besar tetap cepat — hitung sesuai kebutuhan dari footer hasil.",
diff --git a/apps/desktop/src/i18n/locales/it.ts b/apps/desktop/src/i18n/locales/it.ts
index d413469aee..2f81ea32e2 100644
--- a/apps/desktop/src/i18n/locales/it.ts
+++ b/apps/desktop/src/i18n/locales/it.ts
@@ -7468,6 +7468,8 @@ export default withEnglishFallback({
dataGridCellDetailDialogDefaultDescription: "Apre i dettagli della cella in una finestra di dialogo modale per impostazione predefinita anziché nel pannello laterale o inferiore.",
dataGridCrosshairHighlight: "Evidenzia riga e colonna a croce",
dataGridCrosshairHighlightDescription: "Se attivato, evidenzia leggermente l'intera riga e la colonna della cella attiva (come Excel). La cella focalizzata mantiene il suo stile selezionato.",
+ dataGridCrosshairRowBg: "Colore riga evidenziata",
+ dataGridCrosshairColBg: "Colore colonna evidenziata",
dataGridZebraRowBg: "Colore riga alterna",
infiniteScroll: "Caricamento a scorrimento infinito",
autoCalculateTotalRows: "Calcola automaticamente il totale delle righe",
diff --git a/apps/desktop/src/i18n/locales/ja.ts b/apps/desktop/src/i18n/locales/ja.ts
index f69d9f757b..fc0195d413 100644
--- a/apps/desktop/src/i18n/locales/ja.ts
+++ b/apps/desktop/src/i18n/locales/ja.ts
@@ -7494,6 +7494,8 @@ export default withEnglishFallback({
dataGridCellDetailDialogDefaultDescription: "セル詳細ボタンをクリックしたときに、サイドや下部パネルではなくモーダルダイアログで表示します。",
dataGridCrosshairHighlight: "行と列の十字ハイライト",
dataGridCrosshairHighlightDescription: "有効にすると、アクティブなセルの行と列全体を淡くハイライトします(Excel と同様)。フォーカスされたセルは選択スタイルを維持します。",
+ dataGridCrosshairRowBg: "行ハイライト色",
+ dataGridCrosshairColBg: "列ハイライト色",
dataGridZebraRowBg: "縞模様の色",
tableColumnTemplateFields: "新規テーブルのプリセット列",
tableColumnTemplateFieldsDescription: "データベース種別を選択し、新規テーブル作成時に使うプリセット列の型を設定します。",
diff --git a/apps/desktop/src/i18n/locales/ko.ts b/apps/desktop/src/i18n/locales/ko.ts
index 98fe929688..c7591d04f8 100644
--- a/apps/desktop/src/i18n/locales/ko.ts
+++ b/apps/desktop/src/i18n/locales/ko.ts
@@ -7309,6 +7309,8 @@ export default withEnglishFallback({
dataGridCellDetailDialogDefaultDescription: "셀 세부 정보 버튼을 클릭할 때 사이드 또는 하단 패널 대신 모달 대화상자로 표시합니다.",
dataGridCrosshairHighlight: "행·열 십자 강조",
dataGridCrosshairHighlightDescription: "활성화하면 활성 셀의 전체 행과 열을 연하게 강조합니다(Excel과 유사). 포커스 셀은 기존 선택 스타일을 유지합니다.",
+ dataGridCrosshairRowBg: "행 강조 색상",
+ dataGridCrosshairColBg: "열 강조 색상",
dataGridZebraRowBg: "줄무늬 색상",
infiniteScroll: "무한 스크롤 로딩",
autoCalculateTotalRows: "전체 행 수 자동 집계",
diff --git a/apps/desktop/src/i18n/locales/pt-BR.ts b/apps/desktop/src/i18n/locales/pt-BR.ts
index b661dfb4ac..1fc0d63e57 100644
--- a/apps/desktop/src/i18n/locales/pt-BR.ts
+++ b/apps/desktop/src/i18n/locales/pt-BR.ts
@@ -7469,6 +7469,8 @@ export default withEnglishFallback({
dataGridCellDetailDialogDefaultDescription: "Abre os detalhes da célula em uma caixa de diálogo modal por padrão, em vez do painel lateral ou inferior.",
dataGridCrosshairHighlight: "Destacar linha e coluna em cruz",
dataGridCrosshairHighlightDescription: "Quando ativado, destaca levemente toda a linha e a coluna da célula ativa (como no Excel). A célula focada mantém o estilo selecionado.",
+ dataGridCrosshairRowBg: "Cor de destaque da linha",
+ dataGridCrosshairColBg: "Cor de destaque da coluna",
dataGridZebraRowBg: "Cor da linha alternada",
infiniteScroll: "Carregamento por rolagem infinita",
autoCalculateTotalRows: "Calcular automaticamente o total de linhas",
diff --git a/apps/desktop/src/i18n/locales/ru.ts b/apps/desktop/src/i18n/locales/ru.ts
index ed35ef4642..caaabc493c 100644
--- a/apps/desktop/src/i18n/locales/ru.ts
+++ b/apps/desktop/src/i18n/locales/ru.ts
@@ -8711,6 +8711,8 @@ export default withEnglishFallback({
dataGridCellDetailDialogDefaultDescription: "Открывать сведения о ячейке в модальном окне по умолчанию вместо боковой или нижней панели.",
dataGridCrosshairHighlight: "Подсветка строки и столбца перекрестием",
dataGridCrosshairHighlightDescription: "Если включено, слегка подсвечиваются вся строка и столбец активной ячейки (как в Excel). Ячейка в фокусе сохраняет свой выделенный стиль.",
+ dataGridCrosshairRowBg: "Цвет подсветки строки",
+ dataGridCrosshairColBg: "Цвет подсветки столбца",
dataGridZebraRowBg: "Цвет полосы",
infiniteScroll: "Бесконечная прокрутка с подгрузкой",
autoCalculateTotalRows: "Автоматически считать общее число строк",
diff --git a/apps/desktop/src/i18n/locales/tr.ts b/apps/desktop/src/i18n/locales/tr.ts
index d4e7975658..d2d063f057 100644
--- a/apps/desktop/src/i18n/locales/tr.ts
+++ b/apps/desktop/src/i18n/locales/tr.ts
@@ -7295,6 +7295,8 @@ export default withEnglishFallback({
dataGridCellDetailDialogDefaultDescription: "Hücre ayrıntıları düğmesine tıklandığında yan veya alt panel yerine varsayılan olarak bir modal iletişim kutusunda açar.",
dataGridCrosshairHighlight: "Artı imleç satır ve sütun vurgusu",
dataGridCrosshairHighlightDescription: "Etkinleştirildiğinde etkin hücrenin tüm satırı ve sütunu hafifçe vurgulanır (Excel gibi). Odaklanan hücre kendi seçili biçemini korur.",
+ dataGridCrosshairRowBg: "Satır vurgu rengi",
+ dataGridCrosshairColBg: "Sütun vurgu rengi",
dataGridZebraRowBg: "Çizgi Rengi",
infiniteScroll: "Sonsuz kaydırmayla yükleme",
autoCalculateTotalRows: "Toplam satır sayısını otomatik hesapla",
diff --git a/apps/desktop/src/i18n/locales/zh-CN.ts b/apps/desktop/src/i18n/locales/zh-CN.ts
index b2dfbca831..2d6fa8b7e1 100644
--- a/apps/desktop/src/i18n/locales/zh-CN.ts
+++ b/apps/desktop/src/i18n/locales/zh-CN.ts
@@ -8400,6 +8400,8 @@ export default withEnglishFallback({
dataGridCellDetailDialogDefaultDescription: "点击单元格详情按钮时,默认使用弹窗展示而非侧边或下方分屏。",
dataGridCrosshairHighlight: "行列十字高亮",
dataGridCrosshairHighlightDescription: "开启后,以当前活动单元格为中心淡色高亮整行和整列(类似 Excel)。焦点单元格仍保留原有的选中样式。",
+ dataGridCrosshairRowBg: "行高亮颜色",
+ dataGridCrosshairColBg: "列高亮颜色",
dataGridZebraRowBg: "斑马纹颜色",
infiniteScroll: "无限滚动加载",
autoCalculateTotalRows: "自动统计总行数",
diff --git a/apps/desktop/src/i18n/locales/zh-TW.ts b/apps/desktop/src/i18n/locales/zh-TW.ts
index e4273e31d6..d3ce5d3404 100644
--- a/apps/desktop/src/i18n/locales/zh-TW.ts
+++ b/apps/desktop/src/i18n/locales/zh-TW.ts
@@ -6818,6 +6818,8 @@ export default withEnglishFallback({
dataGridCellDetailDialogDefaultDescription: "點擊儲存格詳情按鈕時,預設使用彈窗展示而非側邊或下方分屏。",
dataGridCrosshairHighlight: "行列十字高亮",
dataGridCrosshairHighlightDescription: "開啟後,以目前活動儲存格為中心淡色高亮整列和整行(類似 Excel)。焦點儲存格仍保留原有選取樣式。",
+ dataGridCrosshairRowBg: "橫行高亮顏色",
+ dataGridCrosshairColBg: "直欄高亮顏色",
dataGridZebraRowBg: "斑馬紋顏色",
infiniteScroll: "無限滾動載入",
autoCalculateTotalRows: "自動統計總筆數",
diff --git a/apps/desktop/src/lib/__tests__/dataGrid/canvasDataGridRendererFrozen.spec.ts b/apps/desktop/src/lib/__tests__/dataGrid/canvasDataGridRendererFrozen.spec.ts
index 82c6a9cf10..fd607273e8 100644
--- a/apps/desktop/src/lib/__tests__/dataGrid/canvasDataGridRendererFrozen.spec.ts
+++ b/apps/desktop/src/lib/__tests__/dataGrid/canvasDataGridRendererFrozen.spec.ts
@@ -274,4 +274,20 @@ describe("drawCanvasDataGrid with frozen columns", () => {
});
expect(() => drawCanvasDataGrid(options)).not.toThrow();
});
+
+ it("draws with custom crosshair row and column colors", () => {
+ const canvas = createMockCanvas();
+ const optionsWithCustomCrosshairColors = createBaseOptions({
+ canvas,
+ crosshair: {
+ rowIndex: 0,
+ visibleColIdx: 0,
+ rowCrosshair: true,
+ columnCrosshair: true,
+ },
+ crosshairRowBg: "#aec3e0",
+ crosshairColBg: "#8eaad2",
+ });
+ expect(() => drawCanvasDataGrid(optionsWithCustomCrosshairColors)).not.toThrow();
+ });
});
diff --git a/apps/desktop/src/lib/dataGrid/canvasDataGridRenderer.ts b/apps/desktop/src/lib/dataGrid/canvasDataGridRenderer.ts
index 932c27127f..9bb0b89d6c 100644
--- a/apps/desktop/src/lib/dataGrid/canvasDataGridRenderer.ts
+++ b/apps/desktop/src/lib/dataGrid/canvasDataGridRenderer.ts
@@ -101,6 +101,8 @@ export interface DrawCanvasDataGridOptions {
colorizeDataTypes?: boolean;
/** 行列十字高亮目标(原样传入,null 表示开关关闭或无焦点)。只画当前 viewport 内的行/列底色 */
crosshair?: CrosshairTarget | null;
+ crosshairRowBg?: string;
+ crosshairColBg?: string;
rightAlignedActionCell?: CanvasRightAlignedActionCell | null;
booleanDisplayMode?: "checkbox" | "dropdown";
flatteningMultiLineEnabled: boolean;
@@ -390,6 +392,8 @@ export function drawCanvasDataGrid(options: DrawCanvasDataGridOptions): boolean
columnTypeVisualKinds,
colorizeDataTypes = false,
crosshair,
+ crosshairRowBg: rawCrosshairRowBg,
+ crosshairColBg: rawCrosshairColBg,
rightAlignedActionCell,
columnIsBoolean,
booleanDisplayMode = "dropdown",
@@ -428,6 +432,8 @@ export function drawCanvasDataGrid(options: DrawCanvasDataGridOptions): boolean
ctx.clearRect(0, 0, width, height);
const { normalFont, tabularFont, semiboldFont, italicFont, theme, searchFill, currentSearchFill, currentSearchBorder, duplicateHighlightFill, nullHighlightFill } = resolveCanvasRenderState(canvas, isDark, styleKey);
+ const crosshairRowBg = rawCrosshairRowBg?.trim() || theme.cellCrosshairRow;
+ const crosshairColBg = rawCrosshairColBg?.trim() || theme.cellCrosshairCol;
const scrollTop = scroller.scrollTop;
const scrollLeft = scroller.scrollLeft;
@@ -482,7 +488,7 @@ export function drawCanvasDataGrid(options: DrawCanvasDataGridOptions): boolean
// 十字行高亮:叠在基础行色之上,但低于整行选中(rowSelectionVisual),
// 也低于后续 drawCell 的脏格/搜索/选中格填充
if (crosshair?.rowCrosshair && item.displayIndex === crosshair.rowIndex && !rowSelectionVisual && !item.isDeleted) {
- ctx.fillStyle = theme.cellCrosshairRow;
+ ctx.fillStyle = crosshairRowBg;
ctx.fillRect(rowNumberWidth, y, width - rowNumberWidth, CANVAS_DATA_GRID_ROW_HEIGHT);
}
@@ -568,7 +574,7 @@ export function drawCanvasDataGrid(options: DrawCanvasDataGridOptions): boolean
// 十字列高亮:整列覆盖,叠在行底色之上;脏格/搜索/选中格填充在其后绘制,优先级更高
if (crosshair?.columnCrosshair && visibleColIdx === crosshair.visibleColIdx && !selectedFillVisual && !item.isDeleted) {
- ctx.fillStyle = theme.cellCrosshairCol;
+ ctx.fillStyle = crosshairColBg;
ctx.fillRect(clippedX, y, cellPaintWidth, CANVAS_DATA_GRID_ROW_HEIGHT);
}
diff --git a/apps/desktop/src/lib/settings/__tests__/editorSettingsDraft.spec.ts b/apps/desktop/src/lib/settings/__tests__/editorSettingsDraft.spec.ts
index 1436da34c1..a8c56d05cb 100644
--- a/apps/desktop/src/lib/settings/__tests__/editorSettingsDraft.spec.ts
+++ b/apps/desktop/src/lib/settings/__tests__/editorSettingsDraft.spec.ts
@@ -152,6 +152,11 @@ describe("EDITOR_SETTINGS_DRAFT_KEYS", () => {
expect(EDITOR_SETTINGS_DRAFT_KEYS).toContain("dataGridZebraRowBg");
});
+ it("includes crosshair row and column backgrounds in draft keys", () => {
+ expect(EDITOR_SETTINGS_DRAFT_KEYS).toContain("dataGridCrosshairRowBg");
+ expect(EDITOR_SETTINGS_DRAFT_KEYS).toContain("dataGridCrosshairColBg");
+ });
+
it("includes dataGridCellDetailDialogDefault", () => {
expect(EDITOR_SETTINGS_DRAFT_KEYS).toContain("dataGridCellDetailDialogDefault");
});
diff --git a/apps/desktop/src/lib/settings/__tests__/settingsTransfer.spec.ts b/apps/desktop/src/lib/settings/__tests__/settingsTransfer.spec.ts
index 5790be5bab..9d2cb0386d 100644
--- a/apps/desktop/src/lib/settings/__tests__/settingsTransfer.spec.ts
+++ b/apps/desktop/src/lib/settings/__tests__/settingsTransfer.spec.ts
@@ -525,4 +525,20 @@ describe("settingsTransfer", () => {
if (!result.ok) return;
expect(result.value.editorSettings.dataGridZebraRowBg).toBe("#232323");
});
+
+ it("round-trips crosshair row and column backgrounds in data category", () => {
+ expect(transferCategoryForKey("dataGridCrosshairRowBg")).toBe("data");
+ expect(transferCategoryForKey("dataGridCrosshairColBg")).toBe("data");
+
+ const text = serializeSettingsTransfer({
+ ...DEFAULT_EDITOR_SETTINGS,
+ dataGridCrosshairRowBg: "#232323",
+ dataGridCrosshairColBg: "#343434",
+ });
+ const result = parseSettingsTransferFile(text);
+ expect(result.ok).toBe(true);
+ if (!result.ok) return;
+ expect(result.value.editorSettings.dataGridCrosshairRowBg).toBe("#232323");
+ expect(result.value.editorSettings.dataGridCrosshairColBg).toBe("#343434");
+ });
});
diff --git a/apps/desktop/src/lib/settings/editorSettingsDraft.ts b/apps/desktop/src/lib/settings/editorSettingsDraft.ts
index b3a2c166ff..0b5a4593c6 100644
--- a/apps/desktop/src/lib/settings/editorSettingsDraft.ts
+++ b/apps/desktop/src/lib/settings/editorSettingsDraft.ts
@@ -80,6 +80,8 @@ export const EDITOR_SETTINGS_DRAFT_KEYS = [
"dataGridCellDetailButtonVisible",
"dataGridCellDetailDialogDefault",
"dataGridCrosshairHighlight",
+ "dataGridCrosshairRowBg",
+ "dataGridCrosshairColBg",
"dataGridStripedRows",
"dataGridZebraRowBg",
"pageSize",
diff --git a/apps/desktop/src/lib/settings/settingsTransfer.ts b/apps/desktop/src/lib/settings/settingsTransfer.ts
index 68a2738798..177e2b3ad0 100644
--- a/apps/desktop/src/lib/settings/settingsTransfer.ts
+++ b/apps/desktop/src/lib/settings/settingsTransfer.ts
@@ -173,6 +173,8 @@ const SETTINGS_TRANSFER_CATEGORY_KEYS: Record<SettingsTransferCategoryId, readon
"dataGridCellDetailButtonVisible",
"dataGridCellDetailDialogDefault",
"dataGridCrosshairHighlight",
+ "dataGridCrosshairRowBg",
+ "dataGridCrosshairColBg",
"dataGridStripedRows",
"dataGridZebraRowBg",
"flatteningMultiLineText",
diff --git a/apps/desktop/src/stores/__tests__/settingsStore.spec.ts b/apps/desktop/src/stores/__tests__/settingsStore.spec.ts
index fae9f11506..81ba680071 100644
--- a/apps/desktop/src/stores/__tests__/settingsStore.spec.ts
+++ b/apps/desktop/src/stores/__tests__/settingsStore.spec.ts
@@ -715,6 +715,15 @@ describe("normalizeEditorSettings", () => {
}
});
+ it("defaults crosshair row and column backgrounds empty and normalizes custom colors", () => {
+ expect(normalizeEditorSettings({}).dataGridCrosshairRowBg).toBe("");
+ expect(normalizeEditorSettings({}).dataGridCrosshairColBg).toBe("");
+ expect(normalizeEditorSettings({ dataGridCrosshairRowBg: " #aec3e0 \n", dataGridCrosshairColBg: " #8eaad2 " }).dataGridCrosshairRowBg).toBe("#aec3e0");
+ expect(normalizeEditorSettings({ dataGridCrosshairRowBg: " #aec3e0 \n", dataGridCrosshairColBg: " #8eaad2 " }).dataGridCrosshairColBg).toBe("#8eaad2");
+ expect(normalizeEditorSettings({ dataGridCrosshairRowBg: null as never, dataGridCrosshairColBg: null as never }).dataGridCrosshairRowBg).toBe("");
+ expect(normalizeEditorSettings({ dataGridCrosshairRowBg: null as never, dataGridCrosshairColBg: null as never }).dataGridCrosshairColBg).toBe("");
+ });
+
it("defaults zebra row background empty and normalizes custom color", () => {
expect(normalizeEditorSettings({}).dataGridZebraRowBg).toBe("");
expect(normalizeEditorSettings({ dataGridZebraRowBg: " #334455 \n" }).dataGridZebraRowBg).toBe("#334455");
@@ -1703,14 +1712,28 @@ describe("settingsStore persisted settings initialization", () => {
await store.initEditorSettings();
expect(store.editorSettings.dataGridCrosshairHighlight).toBe(false);
+ expect(store.editorSettings.dataGridCrosshairRowBg).toBe("");
+ expect(store.editorSettings.dataGridCrosshairColBg).toBe("");
- await store.updateEditorSettingsAndPersist({ dataGridCrosshairHighlight: true });
- expect(saveEditorSettings).toHaveBeenLastCalledWith(expect.objectContaining({ dataGridCrosshairHighlight: true }));
+ await store.updateEditorSettingsAndPersist({
+ dataGridCrosshairHighlight: true,
+ dataGridCrosshairRowBg: "#112233",
+ dataGridCrosshairColBg: "#445566",
+ });
+ expect(saveEditorSettings).toHaveBeenLastCalledWith(
+ expect.objectContaining({
+ dataGridCrosshairHighlight: true,
+ dataGridCrosshairRowBg: "#112233",
+ dataGridCrosshairColBg: "#445566",
+ }),
+ );
setActivePinia(createPinia());
const restartedStore = useSettingsStore();
await restartedStore.initEditorSettings();
expect(restartedStore.editorSettings.dataGridCrosshairHighlight).toBe(true);
+ expect(restartedStore.editorSettings.dataGridCrosshairRowBg).toBe("#112233");
+ expect(restartedStore.editorSettings.dataGridCrosshairColBg).toBe("#445566");
});
it("loads, persists, and reloads data grid striped rows preference", async () => {
diff --git a/apps/desktop/src/stores/settingsStore.ts b/apps/desktop/src/stores/settingsStore.ts
index 1cdc404f73..b39260fba1 100644
--- a/apps/desktop/src/stores/settingsStore.ts
+++ b/apps/desktop/src/stores/settingsStore.ts
@@ -1021,6 +1021,8 @@ export interface EditorSettings {
dataGridCellDetailButtonVisible: boolean;
dataGridCellDetailDialogDefault: boolean;
dataGridCrosshairHighlight: boolean;
+ dataGridCrosshairRowBg: string;
+ dataGridCrosshairColBg: string;
dataGridStripedRows: boolean;
dataGridZebraRowBg: string;
dataGridMultiRowTranspose: boolean;
@@ -1340,6 +1342,8 @@ export const DEFAULT_EDITOR_SETTINGS: EditorSettings = {
dataGridCellDetailButtonVisible: true,
dataGridCellDetailDialogDefault: false,
dataGridCrosshairHighlight: false,
+ dataGridCrosshairRowBg: "",
+ dataGridCrosshairColBg: "",
dataGridStripedRows: true,
dataGridZebraRowBg: "",
dataGridMultiRowTranspose: false,
@@ -1974,6 +1978,8 @@ export function normalizeEditorSettings(settings: Partial<EditorSettings>, exist
dataGridCellDetailButtonVisible: typeof settings.dataGridCellDetailButtonVisible === "boolean" ? settings.dataGridCellDetailButtonVisible : DEFAULT_EDITOR_SETTINGS.dataGridCellDetailButtonVisible,
dataGridCellDetailDialogDefault: settings.dataGridCellDetailDialogDefault === true,
dataGridCrosshairHighlight: typeof settings.dataGridCrosshairHighlight === "boolean" ? settings.dataGridCrosshairHighlight : DEFAULT_EDITOR_SETTINGS.dataGridCrosshairHighlight,
+ dataGridCrosshairRowBg: typeof settings.dataGridCrosshairRowBg === "string" ? settings.dataGridCrosshairRowBg.trim() : DEFAULT_EDITOR_SETTINGS.dataGridCrosshairRowBg,
+ dataGridCrosshairColBg: typeof settings.dataGridCrosshairColBg === "string" ? settings.dataGridCrosshairColBg.trim() : DEFAULT_EDITOR_SETTINGS.dataGridCrosshairColBg,
dataGridStripedRows: typeof settings.dataGridStripedRows === "boolean" ? settings.dataGridStripedRows : DEFAULT_EDITOR_SETTINGS.dataGridStripedRows,
dataGridZebraRowBg: typeof settings.dataGridZebraRowBg === "string" ? settings.dataGridZebraRowBg.trim() : DEFAULT_EDITOR_SETTINGS.dataGridZebraRowBg,
dataGridMultiRowTranspose: settings.dataGridMultiRowTranspose === true,
@@ -2851,6 +2857,8 @@ export const useSettingsStore = defineStore("settings", () => {
if (partial.dataGridCellDetailButtonVisible !== undefined) editorSettings.value.dataGridCellDetailButtonVisible = typeof partial.dataGridCellDetailButtonVisible === "boolean" ? partial.dataGridCellDetailButtonVisible : DEFAULT_EDITOR_SETTINGS.dataGridCellDetailButtonVisible;
if (partial.dataGridCellDetailDialogDefault !== undefined) editorSettings.value.dataGridCellDetailDialogDefault = partial.dataGridCellDetailDialogDefault === true;
if (partial.dataGridCrosshairHighlight !== undefined) editorSettings.value.dataGridCrosshairHighlight = typeof partial.dataGridCrosshairHighlight === "boolean" ? partial.dataGridCrosshairHighlight : DEFAULT_EDITOR_SETTINGS.dataGridCrosshairHighlight;
+ if (partial.dataGridCrosshairRowBg !== undefined) editorSettings.value.dataGridCrosshairRowBg = typeof partial.dataGridCrosshairRowBg === "string" ? partial.dataGridCrosshairRowBg.trim() : DEFAULT_EDITOR_SETTINGS.dataGridCrosshairRowBg;
+ if (partial.dataGridCrosshairColBg !== undefined) editorSettings.value.dataGridCrosshairColBg = typeof partial.dataGridCrosshairColBg === "string" ? partial.dataGridCrosshairColBg.trim() : DEFAULT_EDITOR_SETTINGS.dataGridCrosshairColBg;
if (partial.dataGridStripedRows !== undefined) editorSettings.value.dataGridStripedRows = typeof partial.dataGridStripedRows === "boolean" ? partial.dataGridStripedRows : DEFAULT_EDITOR_SETTINGS.dataGridStripedRows;
if (partial.dataGridZebraRowBg !== undefined) editorSettings.value.dataGridZebraRowBg = typeof partial.dataGridZebraRowBg === "string" ? partial.dataGridZebraRowBg.trim() : DEFAULT_EDITOR_SETTINGS.dataGridZebraRowBg;
if (partial.dataGridMultiRowTranspose !== undefined) editorSettings.value.dataGridMultiRowTranspose = partial.dataGridMultiRowTranspose === true;