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。
TypeScript aicliclickhousedatabasedatabase-clientdatabase-managementdockerguimcpmongodbmysqlpostgresqlredisrustsql-serversqlitetaurivue
feat(ui): add scroll shortcuts, empty-column hiding and error mapping
t8y2c91342ac9db1
diff --git a/apps/desktop/src/components/document/DocumentBrowser.vue b/apps/desktop/src/components/document/DocumentBrowser.vueindex 410c72dcd9..71c30563e5 100644--- a/apps/desktop/src/components/document/DocumentBrowser.vue+++ b/apps/desktop/src/components/document/DocumentBrowser.vue@@ -13,6 +13,7 @@ import ErrorBanner from "@/components/ui/ErrorBanner.vue";import DataGrid from "@/components/grid/DataGrid.vue";import DataGridColumnLayoutPopover from "@/components/grid/DataGridColumnLayoutPopover.vue";import DataGridCopyFormatControl from "@/components/grid/DataGridCopyFormatControl.vue";+import DataGridEmptyColumnsControl from "@/components/grid/DataGridEmptyColumnsControl.vue";import DataGridFontFamilyControl from "@/components/grid/DataGridFontFamilyControl.vue";import DataGridColumnWidthModeControl from "@/components/grid/DataGridColumnWidthModeControl.vue";import LightTooltip from "@/components/ui/LightTooltip.vue";@@ -2932,6 +2933,7 @@ defineExpose({ focusSearch });</span><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" /><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.vueindex 7b0fdd5ffc..7c3c7b81b3 100644--- a/apps/desktop/src/components/editor/CloudSyncSelectionDialog.vue+++ b/apps/desktop/src/components/editor/CloudSyncSelectionDialog.vue@@ -107,6 +107,7 @@ const editorSettingCategoryOverrides: Partial<Record<string, BackupSettingsCategmongoViewMode: "data",dataGridMultiRowTranspose: "data",dataGridHideNullColumns: "data",+ dataGridHideEmptyColumns: "data",dataGridBooleanDisplayMode: "data",numericColumnRightAlign: "data",structureEditorDensity: "data",diff --git a/apps/desktop/src/components/editor/QueryEditor.vue b/apps/desktop/src/components/editor/QueryEditor.vueindex c17310dc91..3a22d2eae3 100644--- a/apps/desktop/src/components/editor/QueryEditor.vue+++ b/apps/desktop/src/components/editor/QueryEditor.vue@@ -131,6 +131,7 @@ import { computePasteCaretResyncTarget } from "@/lib/editor/queryEditorPasteCareimport { extendQueryEditorSelection, runQueryEditorAltExtendSelection } from "@/lib/editor/queryEditorExtendSelection";import { addNextQueryEditorSelectionOccurrence, selectAllQueryEditorSelectionOccurrences } from "@/lib/editor/queryEditorOccurrenceSelection";import { selectLineEnds } from "@/lib/editor/selectLineEnds";+import { scrollEditorLine } from "@/lib/editor/scrollEditorLine";import { createQueryEditorStringMouseSelection } from "@/lib/editor/queryEditorStringMouseSelection";import { createQueryEditorCompletionShortcutBindings } from "@/lib/editor/queryEditorCompletionShortcut";import { createQueryEditorSelectionCaseShortcutBindings } from "@/lib/editor/queryEditorSelectionCaseShortcut";@@ -1407,6 +1408,8 @@ function runKeymapExtension(codeMirrorKeymap: (typeof import("@codemirror/view")...binding(shortcuts.deleteLine, (view) => codeMirrorRuntime.codeMirrorDeleteLine?.(view) ?? false),...binding(shortcuts.moveLineUp, (view) => codeMirrorRuntime.codeMirrorMoveLineUp?.(view) ?? false),...binding(shortcuts.moveLineDown, (view) => codeMirrorRuntime.codeMirrorMoveLineDown?.(view) ?? false),+ ...binding(shortcuts.scrollLineUp, (view) => scrollEditorLine(view, "up")),+ ...binding(shortcuts.scrollLineDown, (view) => scrollEditorLine(view, "down")),...binding(shortcuts.copyLineUp, (view) => codeMirrorRuntime.codeMirrorCopyLineUp?.(view) ?? false),...binding(shortcuts.copyLineDown, (view) => codeMirrorRuntime.codeMirrorCopyLineDown?.(view) ?? false),...binding(shortcuts.undo, (view) => codeMirrorRuntime.codeMirrorUndo?.(view) ?? false),@@ -2408,12 +2411,9 @@ watch(},);-watch(- () => props.executionError,- () => {- reconfigureDiagnostics();- },-);+watch([() => props.executionError, () => props.executionErrorSql, () => props.executionErrorResult], () => {+ reconfigureDiagnostics();+});watch(() => props.statementExecutionMarkers ?? [],diff --git a/apps/desktop/src/components/editor/__tests__/useQueryEditorDiagnostics.spec.ts b/apps/desktop/src/components/editor/__tests__/useQueryEditorDiagnostics.spec.tsindex 523e9e5f98..fc57716742 100644--- a/apps/desktop/src/components/editor/__tests__/useQueryEditorDiagnostics.spec.ts+++ b/apps/desktop/src/components/editor/__tests__/useQueryEditorDiagnostics.spec.ts@@ -7,7 +7,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";import { useQueryEditorDiagnostics } from "../useQueryEditorDiagnostics";import type { SqlSemanticDiagnostic } from "@/lib/sql/semantic/diagnostics";import type { QueryEditorProps } from "../queryEditorTypes";-import type { SqlReferenceAnalysis } from "@/types/database";+import type { QueryResult, SqlReferenceAnalysis } from "@/types/database";const { analyze, buildDiagnostics } = vi.hoisted(() => ({ analyze: vi.fn(), buildDiagnostics: vi.fn() }));vi.mock("@/lib/backend/api", () => ({ analyzeSqlReferences: analyze }));@@ -87,6 +87,67 @@ function createHarness(overrides: Partial<QueryEditorProps> = {}) {}describe("QueryEditor diagnostic scheduling ownership", () => {+ it("maps a typed execution error onto a selected statement in a larger document", () => {+ const statement = "SELECT missing;";+ const modelValue = `SELECT 1;\n${statement}`;+ const sourceFrom = modelValue.indexOf(statement);+ const result: QueryResult = {+ columns: ["Error"],+ rows: [["unknown column"]],+ affected_rows: 0,+ execution_time_ms: 0,+ execution_error: true,+ sourceStatement: statement,+ sourceFrom,+ sourceTo: sourceFrom + statement.length,+ error: { version: 1, code: "DBX-JDBC-4001", messageKey: "backendErrors.jdbc.sqlFailed", messageParams: {}, source: "jdbcAgent", operationOutcome: "unknown", errorPosition: { line: 1, column: 8, offset: 7 } },+ };+ const { diagnostics, currentView } = createHarness({ modelValue, executionError: "unknown column", executionErrorSql: statement, executionErrorResult: result });+ expect(diagnostics.sqlErrorDecorationRange(currentView.state)).toEqual([{ from: sourceFrom + 7, to: sourceFrom + 8, message: "unknown column" }]);+ currentView.dispatch({ changes: { from: sourceFrom + 7, to: sourceFrom + 14, insert: "present" } });+ expect(diagnostics.sqlErrorDecorationRange(currentView.state)).toEqual([]);+ });++ it("retains legacy full-document textual diagnostics", () => {+ const { diagnostics, currentView } = createHarness({ executionError: "syntax error at line 1, column 8", executionErrorSql: "SELECT missing;" });+ expect(diagnostics.sqlErrorDecorationRange(currentView.state)).toEqual([{ from: 7, to: 8, message: "syntax error at line 1, column 8" }]);+ });++ it("retains textual diagnostics for older result envelopes without source metadata", () => {+ const result: QueryResult = { columns: ["Error"], rows: [["syntax error at line 1, column 8"]], affected_rows: 0, execution_time_ms: 0, execution_error: true };+ const { diagnostics, currentView } = createHarness({ executionError: "syntax error at line 1, column 8", executionErrorSql: "SELECT missing;", executionErrorResult: result });+ expect(diagnostics.sqlErrorDecorationRange(currentView.state)).toEqual([{ from: 7, to: 8, message: "syntax error at line 1, column 8" }]);+ });++ it("maps rewritten execution and a Unicode scalar position back onto source text", () => {+ const statement = "SELECT '😀', missing;";+ const executedStatement = `SELECT * FROM (${statement}) wrapped LIMIT 10`;+ const offset = executedStatement.indexOf("missing");+ const message = "unknown column";+ const result: QueryResult = {+ columns: ["Error"],+ rows: [[message]],+ affected_rows: 0,+ execution_time_ms: 0,+ execution_error: true,+ sourceStatement: statement,+ sourceFrom: 0,+ sourceTo: statement.length,+ executedStatement,+ error: { version: 1, code: "DBX-JDBC-4001", messageKey: "backendErrors.jdbc.sqlFailed", messageParams: {}, source: "jdbcAgent", operationOutcome: "unknown", errorPosition: { line: 1, column: Array.from(executedStatement.slice(0, offset)).length + 1, offset } },+ };+ const { diagnostics, currentView } = createHarness({ modelValue: statement, executionError: message, executionErrorResult: result });+ expect(diagnostics.sqlErrorDecorationRange(currentView.state)).toEqual([{ from: statement.indexOf("missing"), to: statement.indexOf("missing") + 1, message }]);+ });++ it("uses the statement index when identical statements have no saved source offsets", () => {+ const statement = "SELECT missing";+ const modelValue = `${statement};\n${statement};`;+ const message = "syntax error at line 1, column 8";+ const result: QueryResult = { columns: ["Error"], rows: [[message]], affected_rows: 0, execution_time_ms: 0, execution_error: true, statement_index: 1, sourceStatement: statement };+ const { diagnostics, currentView } = createHarness({ modelValue, executionError: message, executionErrorResult: result });+ expect(diagnostics.sqlErrorDecorationRange(currentView.state)).toEqual([{ from: statement.length + 9, to: statement.length + 10, message }]);+ });it("coalesces timers and shares the latest executable statement cache", async () => {const { diagnostics, currentView, runtime } = createHarness();diagnostics.scheduleSemanticDiagnostics(50);diff --git a/apps/desktop/src/components/editor/queryEditorTypes.ts b/apps/desktop/src/components/editor/queryEditorTypes.tsindex 9642ca856d..d1ae624494 100644--- a/apps/desktop/src/components/editor/queryEditorTypes.ts+++ b/apps/desktop/src/components/editor/queryEditorTypes.ts@@ -1,5 +1,5 @@import type { SqlCompletionScope } from "@/lib/sql/sqlCompletionLookupTarget";-import type { DatabaseType } from "@/types/database";+import type { DatabaseType, QueryResult } from "@/types/database";import type { CodeMirrorSqlDialectName } from "@/lib/editor/codemirrorSqlDialect";import type { SqlFormatDialect } from "@/lib/sql/sqlFormatter";import type { StatementExecutionMarker } from "@/lib/tabs/tabPresentation";@@ -22,6 +22,7 @@ export interface QueryEditorProps {compressRequestId?: number;executionError?: string;executionErrorSql?: string;+ executionErrorResult?: QueryResult;resultColumns?: string[];resultSourceStatement?: string;resultSourceFrom?: number;diff --git a/apps/desktop/src/components/editor/useQueryEditorDiagnostics.ts b/apps/desktop/src/components/editor/useQueryEditorDiagnostics.tsindex 766d6425c1..8699960604 100644--- a/apps/desktop/src/components/editor/useQueryEditorDiagnostics.ts+++ b/apps/desktop/src/components/editor/useQueryEditorDiagnostics.ts@@ -14,6 +14,7 @@ import { buildSqlSemanticModel } from "@/lib/sql/semantic/model";import { mergeSqlSemanticReferenceAnalysis } from "@/lib/sql/semantic/references";import { sqlServerUseDatabaseBeforeCursor } from "@/lib/sql/sqlCompletionLookupTarget";import { lineColumnToOffset, sqlErrorDecorationRange as resolveSqlErrorDecorationRange, sqlErrorSqlMatchesEditor } from "@/lib/sql/sqlDiagnostics";+import { scalarPositionToUtf16Offset, sqlErrorEditorOffset } from "@/lib/sql/errorPosition";import { analyzeMysqlRoutineSyntax, supportsMysqlRoutineSyntaxDiagnostics } from "@/lib/sql/mysqlRoutineSyntaxDiagnostics";import { buildOracleSyntaxDiagnostics } from "@/lib/sql/oracleSyntaxDiagnostics";import { buildSqlServerRoutineSyntaxDiagnostics } from "@/lib/sql/sqlServerRoutineSyntaxDiagnostics";@@ -90,6 +91,16 @@ export function useQueryEditorDiagnostics(options: QueryEditorDiagnosticsOptionsfunction sqlErrorDecorationRange(currentState: import("@codemirror/state").EditorState) {if (!props.executionError) return [];+ if (props.executionErrorResult?.sourceStatement) {+ const sql = currentState.doc.toString();+ const mapped = sqlErrorEditorOffset({ editorSql: sql, result: props.executionErrorResult, resultIndex: props.executionErrorResult.statement_index, databaseType: props.databaseType, parameterOptions: sqlStatementParameterOptions() });+ if (!mapped || mapped.offset >= sql.length) return [];+ const source = props.executionErrorResult.sourceStatement;+ const sourceRange = source ? resolveSqlErrorDecorationRange(source, props.executionError) : null;+ const sourceOffset = source ? scalarPositionToUtf16Offset(source, mapped.line, mapped.column) : undefined;+ const width = sourceRange && sourceRange.from === sourceOffset ? sourceRange.to - sourceRange.from : (sql.codePointAt(mapped.offset) ?? 0) > 0xffff ? 2 : 1;+ return [{ from: mapped.offset, to: Math.min(sql.length, mapped.offset + width), message: props.executionError }];+ }if (!props.executionErrorSql || !sqlErrorSqlMatchesEditor(currentState.doc.toString(), props.executionErrorSql)) return [];const range = resolveSqlErrorDecorationRange(currentState.doc.toString(), props.executionError);if (!range) return [];diff --git a/apps/desktop/src/components/grid/DataGrid.vue b/apps/desktop/src/components/grid/DataGrid.vueindex f38eb23853..bd1fa65e07 100644--- a/apps/desktop/src/components/grid/DataGrid.vue+++ b/apps/desktop/src/components/grid/DataGrid.vue@@ -451,6 +451,7 @@ const rowNumberWidth = ref(DATA_GRID_ROW_NUM_WIDTH);const largeValueResolutionVersion = ref(0);const multiRowTranspose = computed(() => settingsStore.editorSettings.dataGridMultiRowTranspose);const hideNullColumns = computed(() => settingsStore.editorSettings.dataGridHideNullColumns);+const hideEmptyColumns = computed(() => settingsStore.editorSettings.dataGridHideEmptyColumns);const booleanCellsUseCheckbox = computed(() => settingsStore.editorSettings.dataGridBooleanDisplayMode === "checkbox");const booleanDisplayMode = computed(() => settingsStore.editorSettings.dataGridBooleanDisplayMode);const colorizeDataGridCellTypes = computed(() => settingsStore.editorSettings.colorizeDataGridCellTypes);@@ -2324,6 +2325,8 @@ const displayableColumnIndexes = computed(() =>.map(({ index }) => index),);const allNullColumnIndexesForResult = computed(() => allNullColumnIndexes(props.result.rows, displayableColumnIndexes.value));+const allEmptyColumnIndexesForResult = computed(() => allNullColumnIndexes(props.result.rows, displayableColumnIndexes.value, true));+const allEmptyColumnCount = computed(() => allEmptyColumnIndexesForResult.value.length);const {hiddenColumnIndexes,nullColumnsHidden,@@ -2360,6 +2363,8 @@ const {commentByColumn: columnCommentMap,displayableColumnIndexes,allNullColumnIndexes: allNullColumnIndexesForResult,+ allEmptyColumnIndexes: allEmptyColumnIndexesForResult,+ hideEmptyColumns,columnOrderKeys,layoutScopeKey: resolvedColumnLayoutScopeKey,tableScopeKey: tableColumnOrderScopeKey,@@ -13079,6 +13084,7 @@ defineExpose({canToggleAllNullColumns,toggleAllNullColumns,openCellDetailSearch,+ allEmptyColumnCount,exportCsv,exportJson,exportSql,diff --git a/apps/desktop/src/components/grid/DataGridEmptyColumnsControl.vue b/apps/desktop/src/components/grid/DataGridEmptyColumnsControl.vuenew file mode 100644index 0000000000..45f18f203d--- /dev/null+++ b/apps/desktop/src/components/grid/DataGridEmptyColumnsControl.vue@@ -0,0 +1,21 @@+<script setup lang="ts">+import { computed } from "vue";+import { useI18n } from "vue-i18n";+import { Switch } from "@/components/ui/switch";+import { useSettingsStore } from "@/stores/settingsStore";++const props = defineProps<{ count?: number; columnCount?: number }>();+const { t } = useI18n();+const settingsStore = useSettingsStore();+const enabled = computed(() => settingsStore.editorSettings.dataGridHideEmptyColumns === true);+const disabled = computed(() => !enabled.value && (!(props.count ?? 0) || (props.columnCount ?? 0) <= 1));+</script>++<template>+ <div class="flex items-center justify-between gap-3 px-3 py-1.5 text-xs" :class="{ 'opacity-60': disabled }">+ <span class="min-w-0 font-medium"+ >{{ t("grid.hideEmptyColumns") }}<span v-if="count" class="text-muted-foreground tabular-nums"> ({{ count }})</span></span+ >+ <Switch size="sm" :model-value="enabled" :disabled="disabled" :aria-label="t('grid.hideEmptyColumns')" @update:model-value="settingsStore.updateEditorSettings({ dataGridHideEmptyColumns: $event })" />+ </div>+</template>diff --git a/apps/desktop/src/components/grid/__tests__/DataGridEmptyColumnsControl.spec.ts b/apps/desktop/src/components/grid/__tests__/DataGridEmptyColumnsControl.spec.tsnew file mode 100644index 0000000000..943b3397d5--- /dev/null+++ b/apps/desktop/src/components/grid/__tests__/DataGridEmptyColumnsControl.spec.ts@@ -0,0 +1,52 @@+// @vitest-environment happy-dom++import { createPinia, setActivePinia } from "pinia";+import { createApp, nextTick, type App } from "vue";+import { afterEach, describe, expect, it } from "vitest";+import DataGridEmptyColumnsControl from "../DataGridEmptyColumnsControl.vue";+import { useSettingsStore } from "@/stores/settingsStore";+import i18n from "@/i18n";++let app: App | undefined;+afterEach(() => {+ app?.unmount();+ app = undefined;+ document.body.replaceChildren();+});++describe("empty-column view option", () => {+ it("updates the persisted option without changing the NULL-only setting", async () => {+ const pinia = createPinia();+ setActivePinia(pinia);+ const settings = useSettingsStore();+ const host = document.createElement("div");+ document.body.append(host);+ app = createApp(DataGridEmptyColumnsControl, { count: 2, columnCount: 4 });+ app.use(pinia).use(i18n).mount(host);+ const toggle = host.querySelector<HTMLButtonElement>('[role="switch"]')!;+ expect(toggle.disabled).toBe(false);+ toggle.click();+ await nextTick();+ expect(settings.editorSettings.dataGridHideEmptyColumns).toBe(true);+ expect(settings.editorSettings.dataGridHideNullColumns).toBe(false);+ toggle.click();+ await nextTick();+ expect(settings.editorSettings.dataGridHideEmptyColumns).toBe(false);+ });++ it("allows an active preference to be disabled even with no empty columns", async () => {+ const pinia = createPinia();+ setActivePinia(pinia);+ const settings = useSettingsStore();+ settings.updateEditorSettings({ dataGridHideEmptyColumns: true });+ const host = document.createElement("div");+ app = createApp(DataGridEmptyColumnsControl, { count: 0, columnCount: 0 });+ app.use(pinia).use(i18n).mount(host);+ const toggle = host.querySelector<HTMLButtonElement>('[role="switch"]')!;+ expect(toggle.disabled).toBe(false);+ toggle.click();+ await nextTick();+ expect(settings.editorSettings.dataGridHideEmptyColumns).toBe(false);+ expect(toggle.disabled).toBe(true);+ });+});diff --git a/apps/desktop/src/components/layout/ContentArea.vue b/apps/desktop/src/components/layout/ContentArea.vueindex 27d1f68afd..bd963b6fa3 100644--- a/apps/desktop/src/components/layout/ContentArea.vue+++ b/apps/desktop/src/components/layout/ContentArea.vue@@ -80,6 +80,7 @@ import ProductionWatermark from "@/components/common/ProductionWatermark.vue";import DataGridCopyFormatControl from "@/components/grid/DataGridCopyFormatControl.vue";import DataGridFontFamilyControl from "@/components/grid/DataGridFontFamilyControl.vue";import DataGridColumnWidthModeControl from "@/components/grid/DataGridColumnWidthModeControl.vue";+import DataGridEmptyColumnsControl from "@/components/grid/DataGridEmptyColumnsControl.vue";import DataGridColumnLayoutPopover from "@/components/grid/DataGridColumnLayoutPopover.vue";import type { DataGridColumnLayoutHandle } from "@/components/grid/dataGridColumnLayoutPopover";import type { ColumnInfo } from "@/components/editor/ColumnInfoPanel.vue";@@ -223,6 +224,7 @@ type DataGridHandle = DataGridColumnLayoutHandle & {openCellDetailSearch: () => boolean;nullColumnsHidden: boolean;allNullColumnCount: number;+ allEmptyColumnCount: number;canToggleAllNullColumns: boolean;toggleAllNullColumns: () => void;defaultCopyPreference: string;@@ -2012,6 +2014,7 @@ defineExpose({:compress-request-id="compressSqlRequest?.tabId === activeTab.id ? compressSqlRequest.id : undefined":execution-error="activeQueryError":execution-error-sql="activeTab.lastExecutedSql"+ :execution-error-result="activeQueryError ? activeTab.result : undefined":result-columns="activeTab.result?.columns":result-source-statement="activeTab.result?.sourceStatement":result-source-from="activeTab.result?.sourceFrom"@@ -2469,6 +2472,7 @@ defineExpose({</span><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" /><DataGridCopyFormatControl:current-label="dataGridRef?.defaultCopyPreferenceLabel ?? '-'":current-value="dataGridRef?.defaultCopyPreference ?? ''"@@ -3170,6 +3174,7 @@ defineExpose({</span><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" /><DataGridCopyFormatControl:current-label="dataGridRef?.defaultCopyPreferenceLabel ?? '-'":current-value="dataGridRef?.defaultCopyPreference ?? ''"diff --git a/apps/desktop/src/composables/__tests__/useDataGridColumnLayout.spec.ts b/apps/desktop/src/composables/__tests__/useDataGridColumnLayout.spec.tsindex 131ae1a4ea..258e27da9e 100644--- a/apps/desktop/src/composables/__tests__/useDataGridColumnLayout.spec.ts+++ b/apps/desktop/src/composables/__tests__/useDataGridColumnLayout.spec.ts@@ -7,6 +7,46 @@ import { columnHeaderDragAutoScrollDelta, columnHeaderDropTargetIndex } from "@/import { loadDataGridColumnLayout, saveDataGridColumnLayout } from "@/lib/dataGrid/dataGridColumnLayoutStorage";describe("useDataGridColumnLayout", () => {+ it("combines independent NULL and empty-column toggles without losing manual visibility", async () => {+ const scope = effectScope();+ const hideNullColumns = ref(true);+ const hideEmptyColumns = ref(false);+ const allEmptyColumnIndexes = ref([1, 2]);+ const state = scope.run(() =>+ useDataGridColumnLayoutState({+ columns: ref(["value", "null", "mixed", "manual"]),+ displayableColumnIndexes: ref([0, 1, 2, 3]),+ allNullColumnIndexes: ref([1]),+ allEmptyColumnIndexes,+ columnOrderKeys: ref(["value", "null", "mixed", "manual"]),+ layoutScopeKey: ref("empty-columns"),+ tableScopeKey: ref(""),+ hideNullColumns,+ hideEmptyColumns,+ onHideNullColumnsChange: (hidden) => {+ hideNullColumns.value = hidden;+ },+ }),+ )!;+ try {+ state.hideColumns([3]);+ expect(state.visibleColumnIndexes.value).toEqual([0, 2]);+ hideEmptyColumns.value = true;+ await nextTick();+ expect(state.visibleColumnIndexes.value).toEqual([0]);+ state.toggleAllNullColumns();+ await nextTick();+ expect(state.visibleColumnIndexes.value).toEqual([0]);+ allEmptyColumnIndexes.value = [];+ await nextTick();+ expect(state.visibleColumnIndexes.value).toEqual([0, 1, 2]);+ hideEmptyColumns.value = false;+ await nextTick();+ expect(state.hiddenColumnIndexes.value).toEqual(new Set([3]));+ } finally {+ scope.stop();+ }+ });beforeEach(() => {const values = new Map<string, string>();vi.stubGlobal("localStorage", {diff --git a/apps/desktop/src/composables/useDataGridColumnLayout.ts b/apps/desktop/src/composables/useDataGridColumnLayout.tsindex 033d8d60f2..a10f834c2b 100644--- a/apps/desktop/src/composables/useDataGridColumnLayout.ts+++ b/apps/desktop/src/composables/useDataGridColumnLayout.ts@@ -111,6 +111,8 @@ export function useDataGridColumnLayoutState(options: {commentByColumn?: MaybeRefOrGetter<ReadonlyMap<string, string>>;displayableColumnIndexes: MaybeRefOrGetter<readonly number[]>;allNullColumnIndexes: MaybeRefOrGetter<readonly number[]>;+ allEmptyColumnIndexes?: MaybeRefOrGetter<readonly number[]>;+ hideEmptyColumns?: MaybeRefOrGetter<boolean>;columnOrderKeys: MaybeRefOrGetter<readonly string[]>;layoutScopeKey: MaybeRefOrGetter<string>;tableScopeKey: MaybeRefOrGetter<string>;@@ -122,6 +124,8 @@ export function useDataGridColumnLayoutState(options: {const hiddenColumnIndexes = ref<Set<number>>(hiddenColumnIndexesForKeys(toValue(options.initialHiddenColumnKeys), toValue(options.columnOrderKeys), toValue(options.displayableColumnIndexes)));const localNullColumnsHidden = ref(false);const nullColumnsHidden = computed(() => (options.hideNullColumns === undefined ? localNullColumnsHidden.value : toValue(options.hideNullColumns)));+ const emptyColumnsHidden = computed(() => options.hideEmptyColumns !== undefined && toValue(options.hideEmptyColumns));+ const automaticHiddenColumnIndexes = computed(() => [...new Set([...(nullColumnsHidden.value ? toValue(options.allNullColumnIndexes) : []), ...(emptyColumnsHidden.value && options.allEmptyColumnIndexes !== undefined ? toValue(options.allEmptyColumnIndexes) : [])])]);const autoHiddenNullColumnIndexes = ref<Set<number>>(new Set());const persistedColumnOrderKeys = ref<string[]>([]);const persistedHiddenColumnKeys = ref<string[]>([...(toValue(options.initialHiddenColumnKeys) ?? [])]);@@ -401,8 +405,8 @@ export function useDataGridColumnLayoutState(options: {function applyNullColumnVisibility(hidden: boolean) {hiddenColumnIndexes.value = removeAutoHiddenColumnIndexes(hiddenColumnIndexes.value, autoHiddenNullColumnIndexes.value);autoHiddenNullColumnIndexes.value = new Set();- if (!hidden) return;- const next = hiddenColumnIndexesWithAllNullColumns({ availableIndexes: [...toValue(options.displayableColumnIndexes)], hiddenIndexes: hiddenColumnIndexes.value, allNullIndexes: new Set(toValue(options.allNullColumnIndexes)) });+ if (!hidden && !emptyColumnsHidden.value) return;+ const next = hiddenColumnIndexesWithAllNullColumns({ availableIndexes: [...toValue(options.displayableColumnIndexes)], hiddenIndexes: hiddenColumnIndexes.value, allNullIndexes: new Set(automaticHiddenColumnIndexes.value) });hiddenColumnIndexes.value = next.hiddenIndexes;autoHiddenNullColumnIndexes.value = next.autoHiddenIndexes;}@@ -433,7 +437,7 @@ export function useDataGridColumnLayoutState(options: {}onScopeDispose(flushPersistColumnLayout);- watch([() => nullColumnsHidden.value, () => [...toValue(options.allNullColumnIndexes)], () => [...toValue(options.displayableColumnIndexes)]], ([hidden]) => applyNullColumnVisibility(hidden as boolean), { immediate: true });+ watch([() => nullColumnsHidden.value, automaticHiddenColumnIndexes, () => [...toValue(options.displayableColumnIndexes)]], ([hidden]) => applyNullColumnVisibility(hidden as boolean), { immediate: true });watch(() => visibleColumnIndexes.value.length,(visibleCount) => {diff --git a/apps/desktop/src/i18n/locales/az.ts b/apps/desktop/src/i18n/locales/az.tsindex 5658cfe3b2..45ab2c5c3d 100644--- a/apps/desktop/src/i18n/locales/az.ts+++ b/apps/desktop/src/i18n/locales/az.ts@@ -2155,6 +2155,7 @@ export default withEnglishFallback({resultRunDisplayList: "Siyahı",resultRunDisplayTabs: "Yan-yana",hideNullColumns: "NULL sütunlarını gizlət",+ hideEmptyColumns: "NULL / boş sətir sütunlarını gizlət",hideNullColumnsHint: "Cari nəticədə bütün dəyərləri NULL olan sütunları göstər və ya gizlət.",searchMode: "Axtarış rejimi",searchModeHint: "Ctrl+F düymələrinin uyğun sətirləri süzməsini, yoxsa bütün sətirləri göstərib uyğunluqları vurğulamasını seçin.",@@ -7962,6 +7963,8 @@ export default withEnglishFallback({shortcutDuplicateLine: "Cari sətrin surətini yarat",shortcutDeleteLine: "Cari sətri sil",shortcutMoveLineUp: "Sətri yuxarı köçür",+ shortcutScrollLineUp: "Kursoru köçürmədən redaktoru bir sətir yuxarı sürüşdür",+ shortcutScrollLineDown: "Kursoru köçürmədən redaktoru bir sətir aşağı sürüşdür",shortcutMoveLineDown: "Sətri aşağı köçür",shortcutCopyLineUp: "Sətri yuxarı kopyala",shortcutCopyLineDown: "Sətri aşağı kopyala",diff --git a/apps/desktop/src/i18n/locales/en.ts b/apps/desktop/src/i18n/locales/en.tsindex f472772d43..f89900a18e 100644--- a/apps/desktop/src/i18n/locales/en.ts+++ b/apps/desktop/src/i18n/locales/en.ts@@ -2592,6 +2592,7 @@ export default {resultRunDisplayList: "List",resultRunDisplayTabs: "Tiled",hideNullColumns: "Hide NULL",+ hideEmptyColumns: "Hide NULL / empty-string columns",hideNullColumnsHint: "Toggle columns whose values are all NULL in the current result.",searchMode: "Search mode",searchModeHint: "Choose whether Ctrl+F filters matching rows or keeps all rows visible and highlights matches.",@@ -9059,6 +9060,8 @@ export default {shortcutDuplicateLine: "Duplicate current line",shortcutDeleteLine: "Delete current line",shortcutMoveLineUp: "Move line up",+ shortcutScrollLineUp: "Scroll editor up one line (keep cursor)",+ shortcutScrollLineDown: "Scroll editor down one line (keep cursor)",shortcutMoveLineDown: "Move line down",shortcutCopyLineUp: "Copy line up",shortcutCopyLineDown: "Copy line down",diff --git a/apps/desktop/src/i18n/locales/es.ts b/apps/desktop/src/i18n/locales/es.tsindex b1e2695b0e..64162a1676 100644--- a/apps/desktop/src/i18n/locales/es.ts+++ b/apps/desktop/src/i18n/locales/es.ts@@ -2439,6 +2439,7 @@ export default withEnglishFallback({resultRunDisplayList: "Lista",resultRunDisplayTabs: "Pestañas",hideNullColumns: "Ocultar NULL",+ hideEmptyColumns: "Ocultar columnas NULL / cadena vacía",hideNullColumnsHint: "Alterna columnas cuyos valores son todos NULL en el resultado actual.",searchMode: "Modo de búsqueda",searchModeHint: "Elija si Ctrl+F filtra las filas que coinciden o mantiene todas las filas visibles y resalta las coincidencias.",@@ -8296,6 +8297,8 @@ export default withEnglishFallback({shortcutDuplicateLine: "Duplicar línea actual",shortcutDeleteLine: "Eliminar línea actual",shortcutMoveLineUp: "Mover línea arriba",+ shortcutScrollLineUp: "Desplazar el editor una línea arriba sin mover el cursor",+ shortcutScrollLineDown: "Desplazar el editor una línea abajo sin mover el cursor",shortcutMoveLineDown: "Mover línea abajo",shortcutCopyLineUp: "Copiar línea arriba",shortcutCopyLineDown: "Copiar línea abajo",diff --git a/apps/desktop/src/i18n/locales/id.ts b/apps/desktop/src/i18n/locales/id.tsindex e1eae53149..3eba935310 100644--- a/apps/desktop/src/i18n/locales/id.ts+++ b/apps/desktop/src/i18n/locales/id.ts@@ -2427,6 +2427,7 @@ export default withEnglishFallback({resultRunDisplayList: "Daftar",resultRunDisplayTabs: "Berjajar",hideNullColumns: "Sembunyikan NULL",+ hideEmptyColumns: "Sembunyikan kolom NULL / string kosong",hideNullColumnsHint: "Alihkan kolom yang nilainya seluruhnya NULL pada hasil saat ini.",searchMode: "Mode pencarian",searchModeHint: "Pilih apakah Ctrl+F memfilter baris yang cocok atau tetap menampilkan semua baris dan menyorot kecocokan.",@@ -8753,6 +8754,8 @@ export default withEnglishFallback({shortcutDuplicateLine: "Duplikat baris saat ini",shortcutDeleteLine: "Hapus baris saat ini",shortcutMoveLineUp: "Pindahkan baris ke atas",+ shortcutScrollLineUp: "Gulir editor satu baris ke atas tanpa memindahkan kursor",+ shortcutScrollLineDown: "Gulir editor satu baris ke bawah tanpa memindahkan kursor",shortcutMoveLineDown: "Pindahkan baris ke bawah",shortcutCopyLineUp: "Salin baris ke atas",shortcutCopyLineDown: "Salin baris ke bawah",diff --git a/apps/desktop/src/i18n/locales/it.ts b/apps/desktop/src/i18n/locales/it.tsindex bfafcb623b..4ed8999792 100644--- a/apps/desktop/src/i18n/locales/it.ts+++ b/apps/desktop/src/i18n/locales/it.ts@@ -2337,6 +2337,7 @@ export default withEnglishFallback({resultRunDisplayList: "Elenco",resultRunDisplayTabs: "Schede",hideNullColumns: "Nascondi NULL",+ hideEmptyColumns: "Nascondi colonne NULL / stringa vuota",hideNullColumnsHint: "Nascondi le colonne i cui valori sono tutti NULL nel risultato corrente.",moreValues: "altri {count} valori, continua a digitare per restringere i risultati",filterByValue: "Filtra per Questo Valore",@@ -8059,6 +8060,8 @@ export default withEnglishFallback({shortcutDuplicateLine: "Duplica riga corrente",shortcutDeleteLine: "Elimina riga corrente",shortcutMoveLineUp: "Sposta riga su",+ shortcutScrollLineUp: "Scorri l'editor di una riga verso l'alto senza spostare il cursore",+ shortcutScrollLineDown: "Scorri l'editor di una riga verso il basso senza spostare il cursore",shortcutMoveLineDown: "Sposta riga giù",shortcutCopyLineUp: "Copia riga su",shortcutCopyLineDown: "Copia riga giù",diff --git a/apps/desktop/src/i18n/locales/ja.ts b/apps/desktop/src/i18n/locales/ja.tsindex b2d5f084a0..9f295e646e 100644--- a/apps/desktop/src/i18n/locales/ja.ts+++ b/apps/desktop/src/i18n/locales/ja.ts@@ -2343,6 +2343,7 @@ export default withEnglishFallback({resultRunDisplayList: "リスト",resultRunDisplayTabs: "タブ",hideNullColumns: "NULL列を非表示",+ hideEmptyColumns: "NULL / 空文字列の列を非表示",hideNullColumnsHint: "現在の結果ですべてNULLの列の表示を切り替えます。",moreValues: "さらに{count}件の値があります。絞り込むには入力を続けてください",filterByValue: "この値でフィルター",@@ -8048,6 +8049,8 @@ export default withEnglishFallback({shortcutDuplicateLine: "現在行を複製",shortcutDeleteLine: "現在行を削除",shortcutMoveLineUp: "行を上に移動",+ shortcutScrollLineUp: "カーソルを動かさずにエディターを1行上にスクロール",+ shortcutScrollLineDown: "カーソルを動かさずにエディターを1行下にスクロール",shortcutMoveLineDown: "行を下に移動",shortcutCopyLineUp: "行を上にコピー",shortcutCopyLineDown: "行を下にコピー",diff --git a/apps/desktop/src/i18n/locales/ko.ts b/apps/desktop/src/i18n/locales/ko.tsindex e18ac3953d..05988229f5 100644--- a/apps/desktop/src/i18n/locales/ko.ts+++ b/apps/desktop/src/i18n/locales/ko.ts@@ -2368,6 +2368,7 @@ export default withEnglishFallback({resultRunDisplayList: "목록",resultRunDisplayTabs: "바둑판",hideNullColumns: "NULL 숨기기",+ hideEmptyColumns: "NULL / 빈 문자열 열 숨기기",hideNullColumnsHint: "현재 결과에서 값이 모두 NULL인 컬럼을 전환합니다.",searchMode: "검색 모드",searchModeHint: "Ctrl+F가 일치하는 행을 필터링할지, 모든 행을 표시하고 일치 항목을 강조할지 선택하세요.",@@ -7912,6 +7913,8 @@ export default withEnglishFallback({shortcutDuplicateLine: "현재 줄 복제",shortcutDeleteLine: "현재 줄 삭제",shortcutMoveLineUp: "줄 위로 이동",+ shortcutScrollLineUp: "커서를 이동하지 않고 편집기를 한 줄 위로 스크롤",+ shortcutScrollLineDown: "커서를 이동하지 않고 편집기를 한 줄 아래로 스크롤",shortcutMoveLineDown: "줄 아래로 이동",shortcutCopyLineUp: "줄 위로 복사",shortcutCopyLineDown: "줄 아래로 복사",diff --git a/apps/desktop/src/i18n/locales/pt-BR.ts b/apps/desktop/src/i18n/locales/pt-BR.tsindex 5d4fedff1f..7371bba10f 100644--- a/apps/desktop/src/i18n/locales/pt-BR.ts+++ b/apps/desktop/src/i18n/locales/pt-BR.ts@@ -2338,6 +2338,7 @@ export default withEnglishFallback({resultRunDisplayList: "Lista",resultRunDisplayTabs: "Abas",hideNullColumns: "Ocultar NULL",+ hideEmptyColumns: "Ocultar colunas NULL / string vazia",hideNullColumnsHint: "Alterna colunas cujos valores são todos NULL no resultado atual.",moreValues: "Mais {count} valores, continue digitando para refinar os resultados",filterByValue: "Filtrar Por Este Valor",@@ -8057,6 +8058,8 @@ export default withEnglishFallback({shortcutDuplicateLine: "Duplicar linha atual",shortcutDeleteLine: "Excluir linha atual",shortcutMoveLineUp: "Mover linha para cima",+ shortcutScrollLineUp: "Rolar o editor uma linha para cima sem mover o cursor",+ shortcutScrollLineDown: "Rolar o editor uma linha para baixo sem mover o cursor",shortcutMoveLineDown: "Mover linha para baixo",shortcutCopyLineUp: "Copiar linha para cima",shortcutCopyLineDown: "Copiar linha para baixo",diff --git a/apps/desktop/src/i18n/locales/ru.ts b/apps/desktop/src/i18n/locales/ru.tsindex 9fd7865161..f927cfb68e 100644--- a/apps/desktop/src/i18n/locales/ru.ts+++ b/apps/desktop/src/i18n/locales/ru.ts@@ -2490,6 +2490,7 @@ export default withEnglishFallback({resultRunDisplayList: "Список",resultRunDisplayTabs: "Мозаика",hideNullColumns: "Скрыть NULL",+ hideEmptyColumns: "Скрыть столбцы NULL / пустых строк",hideNullColumnsHint: "Скрывает или показывает столбцы, все значения которых NULL в текущем результате.",searchMode: "Режим поиска",searchModeHint: "Выберите, будет ли Ctrl+F фильтровать совпадающие строки или оставит все строки видимыми и подсветит совпадения.",@@ -9350,6 +9351,8 @@ export default withEnglishFallback({shortcutDuplicateLine: "Дублировать текущую строку",shortcutDeleteLine: "Удалить текущую строку",shortcutMoveLineUp: "Переместить строку вверх",+ shortcutScrollLineUp: "Прокрутить редактор на строку вверх без перемещения курсора",+ shortcutScrollLineDown: "Прокрутить редактор на строку вниз без перемещения курсора",shortcutMoveLineDown: "Переместить строку вниз",shortcutCopyLineUp: "Копировать строку вверх",shortcutCopyLineDown: "Копировать строку вниз",diff --git a/apps/desktop/src/i18n/locales/tr.ts b/apps/desktop/src/i18n/locales/tr.tsindex 394e714f98..eb3db23ec4 100644--- a/apps/desktop/src/i18n/locales/tr.ts+++ b/apps/desktop/src/i18n/locales/tr.ts@@ -2148,6 +2148,7 @@ export default withEnglishFallback({resultRunDisplayList: "Liste",resultRunDisplayTabs: "Döşeli",hideNullColumns: "NULL'ları gizle",+ hideEmptyColumns: "NULL / boş dize sütunlarını gizle",hideNullColumnsHint: "Geçerli sonuçta tüm değerleri NULL olan sütunları aç/kapat.",searchMode: "Arama modu",searchModeHint: "Ctrl+F'nin eşleşen satırları filtrelemesini mi yoksa tüm satırları görünür tutup eşleşmeleri vurgulamasını mı istediğinizi seçin.",@@ -7863,6 +7864,8 @@ export default withEnglishFallback({shortcutDuplicateLine: "Geçerli satırı çoğalt",shortcutDeleteLine: "Geçerli satırı sil",shortcutMoveLineUp: "Satırı yukarı taşı",+ shortcutScrollLineUp: "İmleci taşımadan düzenleyiciyi bir satır yukarı kaydır",+ shortcutScrollLineDown: "İmleci taşımadan düzenleyiciyi bir satır aşağı kaydır",shortcutMoveLineDown: "Satırı aşağı taşı",shortcutCopyLineUp: "Satırı yukarı kopyala",shortcutCopyLineDown: "Satırı aşağı kopyala",diff --git a/apps/desktop/src/i18n/locales/zh-CN.ts b/apps/desktop/src/i18n/locales/zh-CN.tsindex 37e350f0fe..4be27fa748 100644--- a/apps/desktop/src/i18n/locales/zh-CN.ts+++ b/apps/desktop/src/i18n/locales/zh-CN.ts@@ -2527,6 +2527,7 @@ export default withEnglishFallback({resultRunDisplayList: "列表",resultRunDisplayTabs: "平铺",hideNullColumns: "隐藏 NULL 列",+ hideEmptyColumns: "隐藏 NULL / 空字符串列",hideNullColumnsHint: "切换隐藏当前结果中整列均为 NULL 的字段。",searchMode: "搜索模式",searchModeHint: "选择 Ctrl+F 搜索时过滤匹配行,或保留全部行并高亮定位命中项。",@@ -9040,6 +9041,8 @@ export default withEnglishFallback({shortcutDuplicateLine: "复制当前行",shortcutDeleteLine: "删除当前行",shortcutMoveLineUp: "上移当前行",+ shortcutScrollLineUp: "编辑器向上滚动一行(不移动光标)",+ shortcutScrollLineDown: "编辑器向下滚动一行(不移动光标)",shortcutMoveLineDown: "下移当前行",shortcutCopyLineUp: "向上复制当前行",shortcutCopyLineDown: "向下复制当前行",diff --git a/apps/desktop/src/i18n/locales/zh-TW.ts b/apps/desktop/src/i18n/locales/zh-TW.tsindex 5e01c37eb1..716115615b 100644--- a/apps/desktop/src/i18n/locales/zh-TW.ts+++ b/apps/desktop/src/i18n/locales/zh-TW.ts@@ -2338,6 +2338,7 @@ export default withEnglishFallback({resultRunDisplayList: "清單",resultRunDisplayTabs: "平鋪",hideNullColumns: "隱藏 NULL 欄",+ hideEmptyColumns: "隱藏 NULL / 空字串欄",hideNullColumnsHint: "切換隱藏目前結果中整欄皆為 NULL 的欄位。",moreValues: "還有 {count} 個值,輸入關鍵字繼續縮小範圍",filterByValue: "篩選此值",@@ -7375,6 +7376,8 @@ export default withEnglishFallback({shortcutDuplicateLine: "複製目前行",shortcutDeleteLine: "刪除目前行",shortcutMoveLineUp: "上移目前行",+ shortcutScrollLineUp: "編輯器向上捲動一行(不移動游標)",+ shortcutScrollLineDown: "編輯器向下捲動一行(不移動游標)",shortcutMoveLineDown: "下移目前行",shortcutCopyLineUp: "向上複製目前行",shortcutCopyLineDown: "向下複製目前行",diff --git a/apps/desktop/src/lib/__tests__/dataGridEmptyColumns.spec.ts b/apps/desktop/src/lib/__tests__/dataGridEmptyColumns.spec.tsnew file mode 100644index 0000000000..f09a908d27--- /dev/null+++ b/apps/desktop/src/lib/__tests__/dataGridEmptyColumns.spec.ts@@ -0,0 +1,30 @@+import { describe, expect, it } from "vitest";+import { allNullColumnIndexes } from "@/lib/dataGrid/dataGridColumnVisibility";++describe("empty column detection", () => {+ it("keeps the old NULL-only behavior and opts into mixed NULL/empty strings", () => {+ const rows = [+ [null, null, "", 0, false, " ", undefined],+ [null, "", "", 0, false, "", undefined],+ ];+ const indexes = [0, 1, 2, 3, 4, 5, 6];+ expect(allNullColumnIndexes(rows, indexes)).toEqual([0]);+ expect(allNullColumnIndexes(rows, indexes, true)).toEqual([0, 1, 2]);+ expect(indexes).toEqual([0, 1, 2, 3, 4, 5, 6]);+ });++ it("never hides columns based on an empty result or missing cells", () => {+ expect(allNullColumnIndexes([], [0, 1], true)).toEqual([]);+ expect(allNullColumnIndexes([[null], []], [0, 1], true)).toEqual([]);+ expect(+ allNullColumnIndexes(+ [+ [null, ""],+ ["value", ""],+ ],+ [0, 1],+ true,+ ),+ ).toEqual([1]);+ });+});diff --git a/apps/desktop/src/lib/__tests__/editor/scrollEditorLine.spec.ts b/apps/desktop/src/lib/__tests__/editor/scrollEditorLine.spec.tsnew file mode 100644index 0000000000..fc104a5d1d--- /dev/null+++ b/apps/desktop/src/lib/__tests__/editor/scrollEditorLine.spec.ts@@ -0,0 +1,46 @@+// @vitest-environment happy-dom++import { EditorSelection, EditorState } from "@codemirror/state";+import { EditorView, keymap, runScopeHandlers } from "@codemirror/view";+import { describe, expect, it } from "vitest";+import { scrollEditorLine } from "@/lib/editor/scrollEditorLine";+import { normalizeShortcutSettings, shortcutToCodeMirrorKey } from "@/lib/editor/shortcutRegistry";++describe("editor viewport scrolling", () => {+ it("scrolls both directions without editing text or moving any cursor", () => {+ const selection = EditorSelection.create([EditorSelection.range(0, 6), EditorSelection.cursor(9)], 1);+ const view = new EditorView({ parent: document.createElement("div"), state: EditorState.create({ doc: "SELECT 1;\nSELECT 2;", selection, extensions: [EditorState.allowMultipleSelections.of(true)] }) });+ try {+ const initialState = view.state;+ view.scrollDOM.scrollTop = 100;+ expect(scrollEditorLine(view, "up")).toBe(true);+ expect(view.scrollDOM.scrollTop).toBe(100 - view.defaultLineHeight);+ expect(scrollEditorLine(view, "down")).toBe(true);+ expect(view.scrollDOM.scrollTop).toBe(100);+ expect(view.state).toBe(initialState);+ expect(view.state.selection.eq(selection)).toBe(true);+ } finally {+ view.destroy();+ }+ });++ it("uses Ctrl+arrows on Windows/Linux and avoids macOS system/page-navigation keys", () => {+ for (const platform of ["Win32", "Linux x86_64"]) {+ expect(normalizeShortcutSettings(undefined, platform)).toMatchObject({ scrollLineUp: "Ctrl+ArrowUp", scrollLineDown: "Ctrl+ArrowDown" });+ }+ expect(normalizeShortcutSettings(undefined, "MacIntel")).toMatchObject({ scrollLineUp: "Ctrl+Alt+ArrowUp", scrollLineDown: "Ctrl+Alt+ArrowDown" });+ expect(normalizeShortcutSettings({ scrollLineUp: "", scrollLineDown: "Alt+J" }, "Win32")).toMatchObject({ scrollLineUp: "", scrollLineDown: "Alt+J" });+ });++ it("dispatches a customized keybinding without moving the selection", () => {+ const shortcuts = normalizeShortcutSettings({ scrollLineDown: "Ctrl+Alt+ArrowDown" }, "Win32");+ const view = new EditorView({ parent: document.createElement("div"), state: EditorState.create({ doc: "SELECT 1;", extensions: [keymap.of([{ key: shortcutToCodeMirrorKey(shortcuts.scrollLineDown), run: (currentView) => scrollEditorLine(currentView, "down") }])] }) });+ try {+ expect(runScopeHandlers(view, new KeyboardEvent("keydown", { key: "ArrowDown", ctrlKey: true, altKey: true }), "editor")).toBe(true);+ expect(view.state.selection.main.head).toBe(0);+ expect(view.scrollDOM.scrollTop).toBe(view.defaultLineHeight);+ } finally {+ view.destroy();+ }+ });+});diff --git a/apps/desktop/src/lib/dataGrid/dataGridColumnVisibility.ts b/apps/desktop/src/lib/dataGrid/dataGridColumnVisibility.tsindex a302ae2596..5d459df16d 100644--- a/apps/desktop/src/lib/dataGrid/dataGridColumnVisibility.ts+++ b/apps/desktop/src/lib/dataGrid/dataGridColumnVisibility.ts@@ -101,7 +101,7 @@ export function invertedHiddenColumnIndexes(availableIndexes: number[], hiddenInreturn next;}-export function allNullColumnIndexes(rows: ReadonlyArray<ReadonlyArray<unknown>>, availableIndexes: number[]): number[] {+export function allNullColumnIndexes(rows: ReadonlyArray<ReadonlyArray<unknown>>, availableIndexes: number[], includeEmptyStrings = false): number[] {if (rows.length === 0) return [];// 单遍行扫描 + 候选原地压缩:列一旦见到非 null 即永久剔除,候选清空提前// 返回。最坏复杂度同为 O(列×行)(全 null 时无法避免),改进在于常数项:@@ -112,7 +112,8 @@ export function allNullColumnIndexes(rows: ReadonlyArray<ReadonlyArray<unknown>>for (const row of rows) {let write = 0;for (let read = 0; read < count; read++) {- if (row[candidates[read]!] === null) candidates[write++] = candidates[read]!;+ const value = row[candidates[read]!];+ if (value === null || (includeEmptyStrings && value === "")) candidates[write++] = candidates[read]!;}count = write;if (count === 0) return [];diff --git a/apps/desktop/src/lib/editor/scrollEditorLine.ts b/apps/desktop/src/lib/editor/scrollEditorLine.tsnew file mode 100644index 0000000000..c6005320bf--- /dev/null+++ b/apps/desktop/src/lib/editor/scrollEditorLine.ts@@ -0,0 +1,6 @@+import type { EditorView } from "@codemirror/view";++export function scrollEditorLine(view: EditorView, direction: "up" | "down"): boolean {+ view.scrollDOM.scrollTop += (direction === "up" ? -1 : 1) * view.defaultLineHeight;+ return true;+}diff --git a/apps/desktop/src/lib/editor/shortcutRegistry.ts b/apps/desktop/src/lib/editor/shortcutRegistry.tsindex 29c109fe2e..16f13d9bdf 100644--- a/apps/desktop/src/lib/editor/shortcutRegistry.ts+++ b/apps/desktop/src/lib/editor/shortcutRegistry.ts@@ -20,6 +20,8 @@ export type ShortcutActionId =| "deleteLine"| "moveLineUp"| "moveLineDown"+ | "scrollLineUp"+ | "scrollLineDown"| "copyLineUp"| "copyLineDown"| "undo"@@ -178,6 +180,18 @@ const EDIT_TABLE_STRUCTURE_DEFAULT = "Mod+Shift+D";const TAB_NAVIGATION_HISTORY_ACTIONS: ShortcutActionId[] = ["navigateTabHistoryBack", "navigateTabHistoryForward"];export const SHORTCUT_DEFINITIONS: ShortcutDefinition[] = [+ {+ id: "scrollLineUp",+ labelKey: "settings.shortcutScrollLineUp",+ scope: "editor",+ defaultShortcut: "Ctrl+ArrowUp",+ },+ {+ id: "scrollLineDown",+ labelKey: "settings.shortcutScrollLineDown",+ scope: "editor",+ defaultShortcut: "Ctrl+ArrowDown",+ },{id: "executeSql",labelKey: "settings.shortcutExecuteSql",@@ -763,6 +777,7 @@ function shortcutsUseSameKeys(first: string, second: string, platform = globalTh}function shortcutDefaultForPlatform(definition: ShortcutDefinition, platform: string): string {+ if ((definition.id === "scrollLineUp" || definition.id === "scrollLineDown") && isMacShortcutPlatform(platform)) return definition.defaultShortcut.replace("Ctrl+", "Ctrl+Alt+");if (definition.id === "addNextSelectionOccurrence") return selectionOccurrenceDefaultShortcut("addNextSelectionOccurrence", platform);if (definition.id === "selectAllSelectionOccurrences") return selectionOccurrenceDefaultShortcut("selectAllSelectionOccurrences", platform);if (definition.id === "selectLineEnds") return selectLineEndsDefaultShortcut(platform);diff --git a/apps/desktop/src/stores/__tests__/settingsStore.spec.ts b/apps/desktop/src/stores/__tests__/settingsStore.spec.tsindex aa0abdc10d..991a124523 100644--- a/apps/desktop/src/stores/__tests__/settingsStore.spec.ts+++ b/apps/desktop/src/stores/__tests__/settingsStore.spec.ts@@ -28,6 +28,12 @@ import { DATA_GRID_EXTRACTOR_OPTIONS_MIGRATION_VERSION } from "@/lib/dataGrid/daimport { DEFAULT_MONO_FONT_FAMILY } from "@/lib/app/appFonts";describe("normalizeEditorSettings", () => {+ it("keeps empty-column hiding opt-in and independent from NULL-only hiding", () => {+ expect(normalizeEditorSettings({})).toMatchObject({ dataGridHideNullColumns: false, dataGridHideEmptyColumns: false });+ expect(normalizeEditorSettings({ dataGridHideNullColumns: true })).toMatchObject({ dataGridHideNullColumns: true, dataGridHideEmptyColumns: false });+ expect(normalizeEditorSettings({ dataGridHideEmptyColumns: true })).toMatchObject({ dataGridHideNullColumns: false, dataGridHideEmptyColumns: true });+ expect(normalizeEditorSettings({ dataGridHideEmptyColumns: "true" } as any).dataGridHideEmptyColumns).toBe(false);+ });it("preserves comment-first naming for existing settings and permits opting out", () => {expect(DEFAULT_EDITOR_SETTINGS.resultTabPreferComments).toBe(true);expect(normalizeEditorSettings({}).resultTabPreferComments).toBe(true);diff --git a/apps/desktop/src/stores/settingsStore.ts b/apps/desktop/src/stores/settingsStore.tsindex a91d98872b..a3c7e3fe57 100644--- a/apps/desktop/src/stores/settingsStore.ts+++ b/apps/desktop/src/stores/settingsStore.ts@@ -1056,6 +1056,7 @@ export interface EditorSettings {dataGridZebraRowBg: string;dataGridMultiRowTranspose: boolean;dataGridHideNullColumns: boolean;+ dataGridHideEmptyColumns: boolean;dataGridBooleanDisplayMode: "dropdown" | "checkbox";numericColumnRightAlign: boolean;tableFontFamily: string;@@ -1384,6 +1385,7 @@ export const DEFAULT_EDITOR_SETTINGS: EditorSettings = {dataGridZebraRowBg: "",dataGridMultiRowTranspose: false,dataGridHideNullColumns: false,+ dataGridHideEmptyColumns: false,dataGridBooleanDisplayMode: "dropdown",numericColumnRightAlign: true,tableFontFamily: DEFAULT_DATA_GRID_FONT_FAMILY,@@ -2030,6 +2032,7 @@ export function normalizeEditorSettings(settings: Partial<EditorSettings>, existdataGridZebraRowBg: typeof settings.dataGridZebraRowBg === "string" ? settings.dataGridZebraRowBg.trim() : DEFAULT_EDITOR_SETTINGS.dataGridZebraRowBg,dataGridMultiRowTranspose: settings.dataGridMultiRowTranspose === true,dataGridHideNullColumns: settings.dataGridHideNullColumns === true,+ dataGridHideEmptyColumns: settings.dataGridHideEmptyColumns === 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),@@ -2916,6 +2919,7 @@ export const useSettingsStore = defineStore("settings", () => {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;if (partial.dataGridHideNullColumns !== undefined) editorSettings.value.dataGridHideNullColumns = partial.dataGridHideNullColumns === true;+ if (partial.dataGridHideEmptyColumns !== undefined) editorSettings.value.dataGridHideEmptyColumns = partial.dataGridHideEmptyColumns === 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);diff --git a/docs/content/docs/data-grid.cn.mdx b/docs/content/docs/data-grid.cn.mdxindex faef1567ad..33c0f03bcf 100644--- a/docs/content/docs/data-grid.cn.mdx+++ b/docs/content/docs/data-grid.cn.mdx@@ -9,6 +9,8 @@ description: 在 DBX 中浏览、筛选、编辑、校验、复制和导出查## 浏览与布局+视图选项提供独立的“隐藏 NULL 列”和“隐藏 NULL / 空字符串列”开关。后者隐藏当前已加载数据中全部为 `NULL` 或 `""` 的列,也支持两者混合;不会将 `0`、`false`、空格视为空值,也不会根据空结果隐藏列。两个开关默认关闭,关闭自动隐藏时仍保留手动隐藏的列。+DBX 使用虚拟滚动,只渲染当前可视区域。常用浏览操作包括:- 拖拽列边缘调整宽度,或双击按内容自适应diff --git a/docs/content/docs/data-grid.mdx b/docs/content/docs/data-grid.mdxindex f7c64f98ae..526e04d95e 100644--- a/docs/content/docs/data-grid.mdx+++ b/docs/content/docs/data-grid.mdx@@ -9,6 +9,8 @@ The data grid displays query results and table data. It covers both read-only an## Browsing and Layout+The view options provide independent **Hide NULL** and **Hide NULL / empty-string columns** switches. The latter hides columns whose currently loaded values are all `NULL` or `""`, including mixtures of both. It does not hide zero, `false`, whitespace, or columns based on an empty result. Both switches default to off and preserve manually hidden columns when disabled.+DBX uses virtual scrolling and renders only the visible area. Common browsing operations include:- Dragging column edges to resize, or double-clicking to fit contentdiff --git a/docs/content/docs/keyboard-shortcuts.cn.mdx b/docs/content/docs/keyboard-shortcuts.cn.mdxindex 99cb56ca03..071c92ecea 100644--- a/docs/content/docs/keyboard-shortcuts.cn.mdx+++ b/docs/content/docs/keyboard-shortcuts.cn.mdx@@ -23,6 +23,7 @@ DBX 的快捷键来自同一份可配置 action registry。**设置 → 快捷| `Mod+D` | 复制当前行 || `Shift+Mod+K` | 删除当前行 || `Alt+↑` / `Alt+↓` | 上下移动当前行 |+| `Ctrl+↑` / `Ctrl+↓`(Windows/Linux),`Ctrl+Alt+↑` / `Ctrl+Alt+↓`(macOS) | 编辑器上下滚动一行,不移动光标或选区 || `Shift+Alt+↑` / `Shift+Alt+↓` | 向上/下复制当前行 || `Mod+Shift+U` | 切换选中内容大小写(首次默认转为大写) || `Shift+Alt+U` / `Shift+Alt+L` | 选中内容转大写/小写 |diff --git a/docs/content/docs/keyboard-shortcuts.mdx b/docs/content/docs/keyboard-shortcuts.mdxindex 84420296a9..f4e33bb31c 100644--- a/docs/content/docs/keyboard-shortcuts.mdx+++ b/docs/content/docs/keyboard-shortcuts.mdx@@ -23,6 +23,7 @@ DBX shortcuts come from one configurable action registry. **Settings → Shortcu| `Mod+D` | Duplicate current line || `Shift+Mod+K` | Delete current line || `Alt+↑` / `Alt+↓` | Move current line up/down |+| `Ctrl+↑` / `Ctrl+↓` (Windows/Linux), `Ctrl+Alt+↑` / `Ctrl+Alt+↓` (macOS) | Scroll the editor one line without moving the cursor or selection || `Shift+Alt+↑` / `Shift+Alt+↓` | Copy current line up/down || `Mod+Shift+U` | Toggle selection case (defaults to uppercase first) || `Shift+Alt+U` / `Shift+Alt+L` | Convert selection to uppercase/lowercase |