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(grid): show only searched columns (#13367)
二丫讲梵4e54fc38a8da
diff --git a/apps/desktop/src/components/grid/DataGrid.vue b/apps/desktop/src/components/grid/DataGrid.vueindex 7ee61ef709..5fa509cd04 100644--- a/apps/desktop/src/components/grid/DataGrid.vue+++ b/apps/desktop/src/components/grid/DataGrid.vue@@ -2496,6 +2496,7 @@ const {toggleColumnVisibility,hideColumns: hideColumnsInLayout,showAllColumns: showAllColumnsInLayout,+ showOnlyColumns: showOnlyColumnsInLayout,invertColumnVisibility,showColumn,persistColumnOrder,@@ -2998,6 +2999,16 @@ function showAllColumns() {void nextTick(scheduleColumnLayoutRefresh);}+function showOnlyColumns(columnIndexes: number[]) {+ if (columnIndexes.length === 0) return;+ applyColumnOrderChange(() => showOnlyColumnsInLayout(columnIndexes));+ clearCellSelection();+ void nextTick(() => {+ scheduleColumnLayoutRefresh();+ clampGridHorizontalScroll();+ });+}+function getComparisonRows(): ReadonlyArray<ReadonlyArray<unknown>> {// 比较行必须取全宽 data:identicalValueColumnIndexes 的候选索引是原始列索引,// 不能用经过可见列投影(visibleRowData 重排)后的行。@@ -14583,6 +14594,7 @@ defineExpose({toggleColumnVisibility,hideColumns,showAllColumns,+ showOnlyColumns,invertColumnVisibility,hasCustomColumnOrder,moveDisplayableColumn,diff --git a/apps/desktop/src/components/grid/DataGridColumnLayoutPopover.vue b/apps/desktop/src/components/grid/DataGridColumnLayoutPopover.vueindex 4b02ee8951..502e877ba1 100644--- a/apps/desktop/src/components/grid/DataGridColumnLayoutPopover.vue+++ b/apps/desktop/src/components/grid/DataGridColumnLayoutPopover.vue@@ -1,6 +1,6 @@<script setup lang="ts">import { computed, nextTick, onBeforeUnmount, ref, watch, type CSSProperties } from "vue";-import { Check, GripVertical, ListChecks, Search } from "@lucide/vue";+import { Check, GripVertical, ListChecks, Search, X } from "@lucide/vue";import { useI18n } from "vue-i18n";import { Button } from "@/components/ui/button";import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";@@ -59,6 +59,7 @@ interface ColumnDragState {let columnDragState: ColumnDragState | null = null;const columnLayoutOptions = computed(() => props.grid?.filteredColumnLayoutOptions(columnSearch.value) ?? []);+const hasColumnSearch = computed(() => columnSearch.value.trim().length > 0);const columnReorderEnabled = computed(() => columnSearch.value.trim() === "");const virtualized = computed(() => columnLayoutOptions.value.length > DATA_GRID_COLUMN_LAYOUT_VIRTUAL_THRESHOLD);const virtualWindow = computed(() =>@@ -109,6 +110,10 @@ function onListScroll(event: Event) {listScrollTop.value = (event.currentTarget as HTMLElement).scrollTop;}+function clearColumnSearch() {+ columnSearch.value = "";+}+function removeColumnDragListeners() {window.removeEventListener("pointermove", onWindowPointerMove, true);window.removeEventListener("pointerup", onWindowPointerUp, true);@@ -320,7 +325,12 @@ onBeforeUnmount(resetColumnDragState);</div><div class="flex items-center gap-1.5 border-b px-2 py-1.5"><Search class="h-3.5 w-3.5 shrink-0 text-muted-foreground" />- <input v-model="columnSearch" autocapitalize="off" autocorrect="off" spellcheck="false" class="h-6 min-w-0 flex-1 bg-transparent text-xs outline-none placeholder:text-muted-foreground" :placeholder="t('grid.searchColumns')" />+ <div class="relative min-w-0 flex-1">+ <input v-model="columnSearch" autocapitalize="off" autocorrect="off" spellcheck="false" class="h-6 w-full bg-transparent pr-7 text-xs outline-none placeholder:text-muted-foreground" :placeholder="t('grid.searchColumns')" />+ <button v-if="hasColumnSearch" type="button" class="absolute right-0 top-1/2 flex h-5 w-5 -translate-y-1/2 items-center justify-center rounded text-muted-foreground hover:bg-muted hover:text-foreground" :aria-label="t('common.clear')" :title="t('common.clear')" @click="clearColumnSearch">+ <X class="h-3.5 w-3.5" />+ </button>+ </div></div><div ref="listRef" data-column-layout-list class="max-h-72 overflow-auto" :style="{ maxHeight: `${DATA_GRID_COLUMN_LAYOUT_VIEWPORT_HEIGHT}px` }" @scroll="onListScroll"><div class="relative" :style="listContentStyle">@@ -386,7 +396,7 @@ onBeforeUnmount(resetColumnDragState);{{ t("grid.columnVisibilityHint") }}{{ columnReorderEnabled ? t("grid.columnReorderHint") : t("grid.columnReorderSearchHint") }}</span>- <div class="flex items-center justify-end gap-1">+ <div class="flex flex-wrap items-center justify-end gap-1"><Button variant="ghost" size="sm" class="h-7 px-2 text-xs" :disabled="(grid?.displayableColumnCount ?? 0) <= 1" @click="grid?.invertColumnVisibility()">{{ t("grid.invertColumnVisibility") }}</Button>@@ -396,6 +406,17 @@ onBeforeUnmount(resetColumnDragState);<Button variant="ghost" size="sm" class="h-7 px-2 text-xs" :disabled="(grid?.hiddenColumnCount ?? 0) === 0" @click="grid?.showAllColumns()">{{ t("grid.showAllColumns") }}</Button>+ <Button+ variant="ghost"+ size="sm"+ class="h-7 px-2 text-xs"+ data-column-show-selected+ :disabled="!grid?.showOnlyColumns || !hasColumnSearch || columnLayoutOptions.length === 0"+ :title="t('grid.showSelectedColumnsHint')"+ @click="grid?.showOnlyColumns?.(columnLayoutOptions.map((option) => option.index))"+ >+ {{ t("grid.showSelectedColumns") }}+ </Button></div></div></PopoverContent>diff --git a/apps/desktop/src/components/grid/dataGridColumnLayoutPopover.ts b/apps/desktop/src/components/grid/dataGridColumnLayoutPopover.tsindex 66093585a3..145f5a5d4c 100644--- a/apps/desktop/src/components/grid/dataGridColumnLayoutPopover.ts+++ b/apps/desktop/src/components/grid/dataGridColumnLayoutPopover.ts@@ -15,6 +15,7 @@ export interface DataGridColumnLayoutHandle {toggleColumnVisibility: (columnIndex: number) => void;hideColumns: (columnIndexes: number[]) => void;showAllColumns: () => void;+ showOnlyColumns?: (columnIndexes: number[]) => void;invertColumnVisibility: () => void;hasCustomColumnOrder: boolean;moveDisplayableColumn: (fromDisplayableIndex: number, toDisplayableIndex: number) => void;diff --git a/apps/desktop/src/composables/__tests__/useDataGridColumnLayout.spec.ts b/apps/desktop/src/composables/__tests__/useDataGridColumnLayout.spec.tsindex 258e27da9e..66d6a82dc1 100644--- a/apps/desktop/src/composables/__tests__/useDataGridColumnLayout.spec.ts+++ b/apps/desktop/src/composables/__tests__/useDataGridColumnLayout.spec.ts@@ -61,6 +61,41 @@ describe("useDataGridColumnLayout", () => {document.querySelectorAll("[data-column-header-drag-preview]").forEach((element) => element.remove());vi.unstubAllGlobals();});+ it("shows only valid requested columns, persists the selection, and restores all columns", async () => {+ vi.useFakeTimers();+ const scope = effectScope();+ const keys = ["id", "internal", "email", "created"];+ const state = scope.run(() =>+ useDataGridColumnLayoutState({+ columns: ref(keys),+ displayableColumnIndexes: ref([0, 2, 3]),+ allNullColumnIndexes: ref([]),+ columnOrderKeys: ref(keys),+ layoutScopeKey: ref("show-only-regression"),+ tableScopeKey: ref(""),+ hideNullColumns: ref(false),+ onHideNullColumnsChange: vi.fn(),+ }),+ )!;+ try {+ state.hideColumns([2]);+ state.showOnlyColumns([2, 2, 1, -1, 999, NaN]);+ expect(state.visibleColumnIndexes.value).toEqual([2]);+ state.showOnlyColumns([]);+ state.showOnlyColumns([999]);+ expect(state.visibleColumnIndexes.value).toEqual([2]);+ await vi.advanceTimersByTimeAsync(101);+ expect(loadDataGridColumnLayout("show-only-regression", keys)?.hiddenKeys).toEqual(["id", "created"]);+ state.showAllColumns();+ expect(state.visibleColumnIndexes.value).toEqual([0, 2, 3]);+ await vi.advanceTimersByTimeAsync(101);+ expect(loadDataGridColumnLayout("show-only-regression", keys)?.hiddenKeys).toEqual([]);+ } finally {+ scope.stop();+ vi.useRealTimers();+ }+ });+it("builds cumulative offsets", () => {expect(dataGridColumnOffsets([80, 120, 60])).toEqual([0, 80, 200, 260]);});diff --git a/apps/desktop/src/composables/useDataGridColumnLayout.ts b/apps/desktop/src/composables/useDataGridColumnLayout.tsindex 3b79d0418a..85bbcc54d7 100644--- a/apps/desktop/src/composables/useDataGridColumnLayout.ts+++ b/apps/desktop/src/composables/useDataGridColumnLayout.ts@@ -249,6 +249,18 @@ export function useDataGridColumnLayoutState(options: {schedulePersistColumnLayout();}+ function showOnlyColumns(columnIndexes: Iterable<number>) {+ const availableIndexes = toValue(options.displayableColumnIndexes);+ const available = new Set(availableIndexes);+ const requestedIndexes = [...new Set(columnIndexes)].filter((index) => Number.isInteger(index) && available.has(index));+ if (requestedIndexes.length === 0) return;++ const requested = new Set(requestedIndexes);+ hiddenColumnIndexes.value = new Set(availableIndexes.filter((index) => !requested.has(index)));+ autoHiddenNullColumnIndexes.value = new Set();+ persistHiddenColumnKeys();+ }+function invertColumnVisibility() {hiddenColumnIndexes.value = invertedHiddenColumnIndexes([...toValue(options.displayableColumnIndexes)], hiddenColumnIndexes.value);autoHiddenNullColumnIndexes.value = new Set();@@ -474,6 +486,7 @@ export function useDataGridColumnLayoutState(options: {toggleColumnVisibility,hideColumns,showAllColumns,+ showOnlyColumns,invertColumnVisibility,showColumn,persistColumnOrder,diff --git a/apps/desktop/src/i18n/locales/az.ts b/apps/desktop/src/i18n/locales/az.tsindex 5af0b9d993..be1941957f 100644--- a/apps/desktop/src/i18n/locales/az.ts+++ b/apps/desktop/src/i18n/locales/az.ts@@ -2294,6 +2294,8 @@ export default withEnglishFallback({invertColumnVisibility: "Tərsinə çevir",resetColumnOrder: "Sıranı sıfırla",showAllColumns: "Hamısını göstər",+ showSelectedColumns: "Seçilənləri göstər",+ showSelectedColumnsHint: "Yalnız cari axtarışa uyğun sahələri göstər.",viewOptions: "Görünüş seçimləri",resultRunDisplayMode: "Nəticə vərəqləri",resultRunDisplayList: "Siyahı",diff --git a/apps/desktop/src/i18n/locales/en.ts b/apps/desktop/src/i18n/locales/en.tsindex 85512c223d..4902dd7ecd 100644--- a/apps/desktop/src/i18n/locales/en.ts+++ b/apps/desktop/src/i18n/locales/en.ts@@ -3454,6 +3454,8 @@ export default {invertColumnVisibility: "Invert",resetColumnOrder: "Reset order",showAllColumns: "Show all",+ showSelectedColumns: "Show selected",+ showSelectedColumnsHint: "Show only fields matching the current search.",viewOptions: "View options",resultRunDisplayMode: "Result tabs",resultRunDisplayList: "List",diff --git a/apps/desktop/src/i18n/locales/es.ts b/apps/desktop/src/i18n/locales/es.tsindex 4dfcf11bf1..9f5d188b60 100644--- a/apps/desktop/src/i18n/locales/es.ts+++ b/apps/desktop/src/i18n/locales/es.ts@@ -3040,6 +3040,8 @@ export default withEnglishFallback({invertColumnVisibility: "Invertir",resetColumnOrder: "Restablecer orden",showAllColumns: "Mostrar todo",+ showSelectedColumns: "Mostrar seleccionadas",+ showSelectedColumnsHint: "Mostrar solo los campos que coinciden con la búsqueda actual.",viewOptions: "Opciones de vista",resultRunDisplayMode: "Pestañas de resultados",resultRunDisplayList: "Lista",diff --git a/apps/desktop/src/i18n/locales/id.ts b/apps/desktop/src/i18n/locales/id.tsindex d0f9fe263e..7f113eed70 100644--- a/apps/desktop/src/i18n/locales/id.ts+++ b/apps/desktop/src/i18n/locales/id.ts@@ -2594,6 +2594,8 @@ export default withEnglishFallback({invertColumnVisibility: "Balikkan",resetColumnOrder: "Atur ulang urutan",showAllColumns: "Tampilkan semua",+ showSelectedColumns: "Tampilkan yang dipilih",+ showSelectedColumnsHint: "Tampilkan hanya bidang yang cocok dengan pencarian saat ini.",viewOptions: "Opsi tampilan",resultRunDisplayMode: "Tab hasil",resultRunDisplayList: "Daftar",diff --git a/apps/desktop/src/i18n/locales/it.ts b/apps/desktop/src/i18n/locales/it.tsindex 39fa66af0f..d22e1ac12a 100644--- a/apps/desktop/src/i18n/locales/it.ts+++ b/apps/desktop/src/i18n/locales/it.ts@@ -2938,6 +2938,8 @@ export default withEnglishFallback({invertColumnVisibility: "Inverti",resetColumnOrder: "Reimposta ordine",showAllColumns: "Mostra tutte",+ showSelectedColumns: "Mostra selezionate",+ showSelectedColumnsHint: "Mostra solo i campi che corrispondono alla ricerca corrente.",viewOptions: "Opzioni visualizzazione",resultRunDisplayMode: "Schede risultati",resultRunDisplayList: "Elenco",diff --git a/apps/desktop/src/i18n/locales/ja.ts b/apps/desktop/src/i18n/locales/ja.tsindex f040bedac6..568130bc0f 100644--- a/apps/desktop/src/i18n/locales/ja.ts+++ b/apps/desktop/src/i18n/locales/ja.ts@@ -2940,6 +2940,8 @@ export default withEnglishFallback({invertColumnVisibility: "反転",resetColumnOrder: "順序をリセット",showAllColumns: "すべて表示",+ showSelectedColumns: "選択項目を表示",+ showSelectedColumnsHint: "現在の検索に一致するフィールドのみを表示します。",viewOptions: "表示オプション",resultRunDisplayMode: "実行結果",resultRunDisplayList: "リスト",diff --git a/apps/desktop/src/i18n/locales/ko.ts b/apps/desktop/src/i18n/locales/ko.tsindex b9447f6833..972747669c 100644--- a/apps/desktop/src/i18n/locales/ko.ts+++ b/apps/desktop/src/i18n/locales/ko.ts@@ -3030,6 +3030,8 @@ export default withEnglishFallback({invertColumnVisibility: "반전",resetColumnOrder: "순서 초기화",showAllColumns: "모두 표시",+ showSelectedColumns: "선택 항목 표시",+ showSelectedColumnsHint: "현재 검색과 일치하는 필드만 표시합니다.",viewOptions: "보기 옵션",resultRunDisplayMode: "결과 탭",resultRunDisplayList: "목록",diff --git a/apps/desktop/src/i18n/locales/pl.ts b/apps/desktop/src/i18n/locales/pl.tsindex b96a6f5d17..5cb2ae9c6c 100644--- a/apps/desktop/src/i18n/locales/pl.ts+++ b/apps/desktop/src/i18n/locales/pl.ts@@ -2659,6 +2659,8 @@ export default withEnglishFallback({invertColumnVisibility: "Odwróć widoczność",resetColumnOrder: "Przywróć kolejność",showAllColumns: "Pokaż wszystko",+ showSelectedColumns: "Pokaż wybrane",+ showSelectedColumnsHint: "Pokaż tylko pola pasujące do bieżącego wyszukiwania.",viewOptions: "Opcje widoku",resultRunDisplayMode: "Karty wyników",resultRunDisplayList: "Lista",diff --git a/apps/desktop/src/i18n/locales/pt-BR.ts b/apps/desktop/src/i18n/locales/pt-BR.tsindex 1a181c218d..9fc55f18ad 100644--- a/apps/desktop/src/i18n/locales/pt-BR.ts+++ b/apps/desktop/src/i18n/locales/pt-BR.ts@@ -2937,6 +2937,8 @@ export default withEnglishFallback({invertColumnVisibility: "Inverter",resetColumnOrder: "Redefinir ordem",showAllColumns: "Mostrar todas",+ showSelectedColumns: "Mostrar selecionadas",+ showSelectedColumnsHint: "Mostrar apenas os campos correspondentes à pesquisa atual.",viewOptions: "Opções de visualização",resultRunDisplayMode: "Abas de resultados",resultRunDisplayList: "Lista",diff --git a/apps/desktop/src/i18n/locales/ru.ts b/apps/desktop/src/i18n/locales/ru.tsindex 61baf1e3c5..1733dbbd73 100644--- a/apps/desktop/src/i18n/locales/ru.ts+++ b/apps/desktop/src/i18n/locales/ru.ts@@ -3148,6 +3148,8 @@ export default withEnglishFallback({invertColumnVisibility: "Инвертировать",resetColumnOrder: "Сбросить порядок",showAllColumns: "Показать все",+ showSelectedColumns: "Показать выбранные",+ showSelectedColumnsHint: "Показывать только поля, соответствующие текущему поиску.",viewOptions: "Параметры вида",resultRunDisplayMode: "Вкладки результатов",resultRunDisplayList: "Список",diff --git a/apps/desktop/src/i18n/locales/th.ts b/apps/desktop/src/i18n/locales/th.tsindex 9365fe67f9..68dc80d025 100644--- a/apps/desktop/src/i18n/locales/th.ts+++ b/apps/desktop/src/i18n/locales/th.ts@@ -3297,6 +3297,8 @@ export default withEnglishFallback({invertColumnVisibility: "กลับด้าน",resetColumnOrder: "รีเซ็ตลำดับ",showAllColumns: "แสดงทั้งหมด",+ showSelectedColumns: "แสดงที่เลือก",+ showSelectedColumnsHint: "แสดงเฉพาะฟิลด์ที่ตรงกับการค้นหาปัจจุบัน",viewOptions: "ตัวเลือกมุมมอง",resultRunDisplayMode: "แท็บผลลัพธ์",resultRunDisplayList: "List",diff --git a/apps/desktop/src/i18n/locales/tr.ts b/apps/desktop/src/i18n/locales/tr.tsindex 94f46d04ca..199ba28153 100644--- a/apps/desktop/src/i18n/locales/tr.ts+++ b/apps/desktop/src/i18n/locales/tr.ts@@ -2286,6 +2286,8 @@ export default withEnglishFallback({invertColumnVisibility: "Tersine çevir",resetColumnOrder: "Sıralamayı sıfırla",showAllColumns: "Tümünü göster",+ showSelectedColumns: "Seçilenleri göster",+ showSelectedColumnsHint: "Yalnızca mevcut aramayla eşleşen alanları göster.",viewOptions: "Görünüm seçenekleri",resultRunDisplayMode: "Sonuç sekmeleri",resultRunDisplayList: "Liste",diff --git a/apps/desktop/src/i18n/locales/zh-CN.ts b/apps/desktop/src/i18n/locales/zh-CN.tsindex 53fc4d52e6..1567fc0b67 100644--- a/apps/desktop/src/i18n/locales/zh-CN.ts+++ b/apps/desktop/src/i18n/locales/zh-CN.ts@@ -3385,6 +3385,8 @@ export default withEnglishFallback({invertColumnVisibility: "反选",resetColumnOrder: "重置顺序",showAllColumns: "显示全部",+ showSelectedColumns: "显示选中",+ showSelectedColumnsHint: "仅显示当前搜索匹配的字段。",viewOptions: "视图选项",resultRunDisplayMode: "结果标签",resultRunDisplayList: "列表",diff --git a/apps/desktop/src/i18n/locales/zh-TW.ts b/apps/desktop/src/i18n/locales/zh-TW.tsindex e72f757ada..b6b5e55527 100644--- a/apps/desktop/src/i18n/locales/zh-TW.ts+++ b/apps/desktop/src/i18n/locales/zh-TW.ts@@ -2909,6 +2909,8 @@ export default withEnglishFallback({invertColumnVisibility: "反選",resetColumnOrder: "重設順序",showAllColumns: "顯示全部",+ showSelectedColumns: "顯示選中",+ showSelectedColumnsHint: "僅顯示目前搜尋符合的欄位。",viewOptions: "檢視選項",resultRunDisplayMode: "結果標籤",resultRunDisplayList: "清單",