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): support fetching filter distinct values from current page
lxk9557dea1ede4f48
diff --git a/apps/desktop/src/components/grid/DataGrid.vue b/apps/desktop/src/components/grid/DataGrid.vueindex 53fc890e16..539f3db97a 100644--- a/apps/desktop/src/components/grid/DataGrid.vue+++ b/apps/desktop/src/components/grid/DataGrid.vue@@ -364,7 +364,7 @@ import { useDataGridAutoRefresh } from "@/composables/useDataGridAutoRefresh";import { useDataGridAsyncSurface } from "@/composables/useDataGridAsyncSurface";import { createDataGridFilterConditionCache, useDataGridFilterBuilder, type DataGridStructuredFilterRule } from "@/composables/useDataGridFilterBuilder";import { DATA_GRID_DISTINCT_VALUE_DEFAULT_LIMIT, useDataGridDistinctValueLoader } from "@/composables/useDataGridDistinctValueLoader";-import { dataGridDistinctValueKey, dataGridNullSuggestionFilterMode, toggleAllDataGridDistinctValueOptions, type DataGridDistinctValueSuggestionState, type DataGridDistinctValueSuggestionTarget } from "@/lib/dataGrid/dataGridDistinctValueSuggestions";+import { dataGridDistinctValueKey, dataGridNullSuggestionFilterMode, toggleAllDataGridDistinctValueOptions, type DataGridDistinctValueSource, type DataGridDistinctValueSuggestionState, type DataGridDistinctValueSuggestionTarget } from "@/lib/dataGrid/dataGridDistinctValueSuggestions";import { cloneDataGridStructuredFilterRules, loadDataGridStructuredFilterState, saveDataGridStructuredFilterState, type DataGridCachedServerColumnFilter, type DataGridStructuredFilterCacheState } from "@/lib/dataGrid/dataGridFilterBuilderPersistence";import { createDataGridSearchScopeKey } from "@/lib/dataGrid/dataGridSearchStatePersistence";import { useSqlHighlighter } from "@/composables/useSqlHighlighter";@@ -399,7 +399,7 @@ import { reserveDataGridHeaderLine } from "@/lib/dataGrid/dataGridHeaderLayout";import { buildColumnIndexMap, columnIndexColorClass, columnIndexNameKey, type ColumnIndexKind } from "@/lib/dataGrid/dataGridColumnIndexIcon";import { isSchemaAware, supportsTableStructureEditing } from "@/lib/database/databaseCapabilities";import { rememberDataGridConditionHistory } from "@/lib/dataGrid/dataGridConditionHistory";-import { restoreDataGridLocalColumnFilters, type DataGridLocalFilterOption } from "@/lib/dataGrid/dataGridLocalColumnFilterState";+import { buildDataGridLocalFilterOptions, restoreDataGridLocalColumnFilters, type DataGridLocalFilterOption } from "@/lib/dataGrid/dataGridLocalColumnFilterState";import { effectiveDatabaseTypeForConnection, gaussdbCountQueryDopHint } from "@/lib/database/jdbcDialect";import { mongoCollectionSupportsIndexes, supportsMongoIndexMutations } from "@/lib/mongo/mongoCapabilities";import { isProtectedMongoIndex, mongoDropAllIndexesPreview, mongoDropIndexFailureCount, mongoDropIndexPreview } from "@/lib/sidebar/mongoCollectionMutation";@@ -1358,17 +1358,67 @@ const filterValueSuggestionLoader = useDataGridDistinctValueLoader({formatValue: (value, columnIndex) => formatCellCached(value, columnIndex),keyForValue: dataGridDistinctValueKey,});-const filterValueSuggestionState = computed<DataGridDistinctValueSuggestionState>(() => ({- ruleId: filterValueSuggestionRuleId.value,- target: filterValueSuggestionTarget.value,- search: filterValueSuggestionSearch.value,- options: filterValueSuggestionLoader.options.value,- loading: filterValueSuggestionLoader.loading.value,- error: filterValueSuggestionLoader.error.value,- limited: filterValueSuggestionLoader.limited.value,- limit: DATA_GRID_DISTINCT_VALUE_DEFAULT_LIMIT,- selectedKeys: new Set(filterValueSuggestionDraftValues.value.keys()),-}));+const FILTER_VALUE_SOURCE_STORAGE_KEY = "dbx-filter-distinct-value-source";++function readFilterValueSuggestionSource(): DataGridDistinctValueSource {+ return safeLocalStorageGet(FILTER_VALUE_SOURCE_STORAGE_KEY) === "page" ? "page" : "database";+}++const filterValueSuggestionSource = ref<DataGridDistinctValueSource>(readFilterValueSuggestionSource());+const effectiveFilterValueSuggestionSource = computed<DataGridDistinctValueSource>(() => {+ if (!canUseServerColumnFilter.value) return "page";+ return filterValueSuggestionSource.value;+});++const pageFilterValueSuggestions = computed(() => {+ if (effectiveFilterValueSuggestionSource.value !== "page" || !filterValueSuggestionRuleId.value) {+ return { options: [] as DataGridLocalFilterOption[], limited: false };+ }+ const rule = filterValueSuggestionRule();+ if (!rule || !rule.columnName) return { options: [] as DataGridLocalFilterOption[], limited: false };+ const columnIndex = filterValueSuggestionColumnIndex(rule.columnName);+ if (columnIndex < 0) return { options: [] as DataGridLocalFilterOption[], limited: false };+ const columnInfo = filterBuilderColumns.value.find((c) => c.name === rule.columnName)?.columnInfo;++ const rawOptions = buildDataGridLocalFilterOptions({+ rows: props.result.rows,+ newRows: getGridNewRows(),+ columnIndex,+ getRowData: (row, sourceIndex) => getGridRowData(row, sourceIndex),+ formatValue: (value, colIdx) => formatCell(value, colIdx, undefined, false),+ });++ const query = filterValueSuggestionSearch.value.trim().toLowerCase();+ const optionsWithKey = rawOptions.map((opt) => ({+ ...opt,+ key: dataGridDistinctValueKey(opt.value, columnInfo),+ }));++ const filtered = query ? optionsWithKey.filter((opt) => opt.label.toLowerCase().includes(query)) : optionsWithKey;++ const limit = DATA_GRID_DISTINCT_VALUE_DEFAULT_LIMIT;+ return {+ options: filtered.slice(0, limit),+ limited: filtered.length > limit,+ };+});++const filterValueSuggestionState = computed<DataGridDistinctValueSuggestionState>(() => {+ const isPage = effectiveFilterValueSuggestionSource.value === "page";+ return {+ ruleId: filterValueSuggestionRuleId.value,+ target: filterValueSuggestionTarget.value,+ source: effectiveFilterValueSuggestionSource.value,+ search: filterValueSuggestionSearch.value,+ options: isPage ? pageFilterValueSuggestions.value.options : filterValueSuggestionLoader.options.value,+ loading: isPage ? false : filterValueSuggestionLoader.loading.value,+ error: isPage ? "" : filterValueSuggestionLoader.error.value,+ limited: isPage ? pageFilterValueSuggestions.value.limited : filterValueSuggestionLoader.limited.value,+ limit: DATA_GRID_DISTINCT_VALUE_DEFAULT_LIMIT,+ selectedKeys: new Set(filterValueSuggestionDraftValues.value.keys()),+ canUseServerFilter: canUseServerColumnFilter.value,+ };+});// Structured filter rules are restored asynchronously. A tab-switch snapshot's// probe includes the applied condition, so restoring before this hydration// settles would reject an otherwise valid snapshot and never retry it.@@ -1668,15 +1718,33 @@ async function openFilterValueSuggestions(ruleId: string, target: DataGridDistinfilterValueSuggestionTarget.value = target;filterValueSuggestionSearch.value = "";filterValueSuggestionDraftValues.value = new Map(currentValues.filter((value) => value === null || typeof value !== "object").map((value): [string, CellValue] => [dataGridDistinctValueKey(value, columnInfo), value]));- filterValueSuggestionLoader.reset();- const request = filterValueSuggestionRequest();- if (request) await filterValueSuggestionLoader.load(request);+ if (effectiveFilterValueSuggestionSource.value === "database") {+ filterValueSuggestionLoader.reset();+ const request = filterValueSuggestionRequest();+ if (request) await filterValueSuggestionLoader.load(request);+ } else {+ filterValueSuggestionLoader.reset();+ }}function updateFilterValueSuggestionSearch(value: string) {filterValueSuggestionSearch.value = value;- const request = filterValueSuggestionRequest(value);- if (request) filterValueSuggestionLoader.schedule(request);+ if (effectiveFilterValueSuggestionSource.value === "database") {+ const request = filterValueSuggestionRequest(value);+ if (request) filterValueSuggestionLoader.schedule(request);+ }+}++async function updateFilterValueSuggestionSource(source: DataGridDistinctValueSource) {+ filterValueSuggestionSource.value = source;+ safeLocalStorageSet(FILTER_VALUE_SOURCE_STORAGE_KEY, source);+ if (source === "database") {+ filterValueSuggestionLoader.reset();+ const request = filterValueSuggestionRequest();+ if (request) await filterValueSuggestionLoader.load(request);+ } else {+ filterValueSuggestionLoader.reset();+ }}function selectFilterValueSuggestion(option: DataGridLocalFilterOption) {@@ -1699,7 +1767,7 @@ function toggleFilterValueSuggestion(option: DataGridLocalFilterOption) {}function toggleAllFilterValueSuggestions() {- filterValueSuggestionDraftValues.value = toggleAllDataGridDistinctValueOptions(filterValueSuggestionDraftValues.value, filterValueSuggestionLoader.options.value);+ filterValueSuggestionDraftValues.value = toggleAllDataGridDistinctValueOptions(filterValueSuggestionDraftValues.value, filterValueSuggestionState.value.options);}function applyFilterValueSuggestions() {@@ -13698,7 +13766,7 @@ useUpdateBlocker(() => (hasPendingChanges.value || hasPendingDataEditorDraft.val:filtered-columns="filteredFilterBuilderColumnOptions":mode-options="filterModeOptions":column-search="filterBuilderColumnSearch"- :value-suggestions="canUseServerColumnFilter ? filterValueSuggestionState : undefined"+ :value-suggestions="canUseWhereSearch ? filterValueSuggestionState : undefined":apply-where="applyWhereFilter":apply-order-by="applyOrderBySearch":clear-order-by="clearOrderByInput"@@ -13726,6 +13794,7 @@ useUpdateBlocker(() => (hasPendingChanges.value || hasPendingDataEditorDraft.val@open-value-suggestions="openFilterValueSuggestions"@close-value-suggestions="closeFilterValueSuggestions"@update-value-suggestion-search="updateFilterValueSuggestionSearch"+ @update-value-suggestion-source="updateFilterValueSuggestionSource"@select-value-suggestion="selectFilterValueSuggestion"@toggle-value-suggestion="toggleFilterValueSuggestion"@toggle-all-value-suggestions="toggleAllFilterValueSuggestions"@@ -13821,7 +13890,7 @@ useUpdateBlocker(() => (hasPendingChanges.value || hasPendingDataEditorDraft.val@add-rule="addStructuredFilterRule"@apply="applyStructuredFilters":apply-only-busy="applyingOnlyStructuredFilter || isApplyingWhere"- :value-suggestions="canUseServerColumnFilter ? filterValueSuggestionState : undefined"+ :value-suggestions="canUseWhereSearch ? filterValueSuggestionState : undefined"@apply-only="applyOnlyStructuredFilter"@reset="resetStructuredFilters"@clear="clearAllFilters"@@ -13832,6 +13901,7 @@ useUpdateBlocker(() => (hasPendingChanges.value || hasPendingDataEditorDraft.val@open-value-suggestions="openFilterValueSuggestions"@close-value-suggestions="closeFilterValueSuggestions"@update-value-suggestion-search="updateFilterValueSuggestionSearch"+ @update-value-suggestion-source="updateFilterValueSuggestionSource"@select-value-suggestion="selectFilterValueSuggestion"@toggle-value-suggestion="toggleFilterValueSuggestion"@toggle-all-value-suggestions="toggleAllFilterValueSuggestions"@@ -13847,7 +13917,7 @@ useUpdateBlocker(() => (hasPendingChanges.value || hasPendingDataEditorDraft.val:mode-options="filterModeOptions":column-search="filterBuilderColumnSearch":disabled="!canUseWhereSearch"- :value-suggestions="canUseServerColumnFilter ? filterValueSuggestionState : undefined"+ :value-suggestions="canUseWhereSearch ? filterValueSuggestionState : undefined"@update:height="updateTextFilterPanelHeight"@update:column-search="filterBuilderColumnSearch = $event"@ensure-rule="ensureStructuredFilterRule"@@ -13864,6 +13934,7 @@ useUpdateBlocker(() => (hasPendingChanges.value || hasPendingDataEditorDraft.val@open-value-suggestions="openFilterValueSuggestions"@close-value-suggestions="closeFilterValueSuggestions"@update-value-suggestion-search="updateFilterValueSuggestionSearch"+ @update-value-suggestion-source="updateFilterValueSuggestionSource"@select-value-suggestion="selectFilterValueSuggestion"@toggle-value-suggestion="toggleFilterValueSuggestion"@toggle-all-value-suggestions="toggleAllFilterValueSuggestions"diff --git a/apps/desktop/src/components/grid/DataGridDistinctValuePopover.vue b/apps/desktop/src/components/grid/DataGridDistinctValuePopover.vueindex d630fd5bd6..b5a4a5f7d3 100644--- a/apps/desktop/src/components/grid/DataGridDistinctValuePopover.vue+++ b/apps/desktop/src/components/grid/DataGridDistinctValuePopover.vue@@ -4,25 +4,36 @@ import { Check, Database, Loader2, Search } from "@lucide/vue";import { useI18n } from "vue-i18n";import { Button } from "@/components/ui/button";import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";+import { Switch } from "@/components/ui/switch";import type { DataGridLocalFilterOption } from "@/lib/dataGrid/dataGridLocalColumnFilterState";+import type { DataGridDistinctValueSource } from "@/lib/dataGrid/dataGridDistinctValueSuggestions";-const props = defineProps<{- open: boolean;- search: string;- options: DataGridLocalFilterOption[];- loading: boolean;- error: string;- limited: boolean;- limit: number;- multiple?: boolean;- selectedKeys?: Set<string>;- disabled?: boolean;- compact?: boolean;-}>();+const props = withDefaults(+ defineProps<{+ open: boolean;+ search: string;+ options: DataGridLocalFilterOption[];+ loading: boolean;+ error: string;+ limited: boolean;+ limit: number;+ source?: DataGridDistinctValueSource;+ canUseServerFilter?: boolean;+ multiple?: boolean;+ selectedKeys?: Set<string>;+ disabled?: boolean;+ compact?: boolean;+ }>(),+ {+ source: "database",+ canUseServerFilter: true,+ },+);const emit = defineEmits<{"update:open": [open: boolean];"update:search": [search: string];+ "update:source": [source: DataGridDistinctValueSource];select: [option: DataGridLocalFilterOption];toggle: [option: DataGridLocalFilterOption];toggleAll: [];@@ -41,6 +52,12 @@ const allOptionsSelected = computed(() => props.options.length > 0 && props.opti</Button></PopoverTrigger><PopoverContent align="end" side="bottom" class="w-80 gap-0 overflow-hidden p-0" @keydown.stop>+ <div class="flex items-center justify-between border-b bg-muted/40 px-2.5 py-1.5 text-xs">+ <label for="distinct-value-page-switch" class="cursor-pointer select-none text-muted-foreground">+ {{ t("grid.filterFromCurrentPage") }}+ </label>+ <Switch id="distinct-value-page-switch" data-distinct-value-page-switch size="sm" :disabled="props.canUseServerFilter === false" :model-value="props.source === 'page' || props.canUseServerFilter === false" @update:model-value="emit('update:source', $event ? 'page' : 'database')" />+ </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" /><inputdiff --git a/apps/desktop/src/components/grid/DataGridFilterBuilder.vue b/apps/desktop/src/components/grid/DataGridFilterBuilder.vueindex 0f20467ec9..298998adc8 100644--- a/apps/desktop/src/components/grid/DataGridFilterBuilder.vue+++ b/apps/desktop/src/components/grid/DataGridFilterBuilder.vue@@ -12,7 +12,7 @@ import { safeLocalStorageGet, safeLocalStorageSet } from "@/lib/backend/safeStorimport { resolveDataGridFilterRuleDropPlacement } from "@/lib/dataGrid/dataGridFilterRuleDrag";import type { DataGridContextFilterMode } from "@/lib/dataGrid/dataGridSql";import type { DataGridStructuredFilterRule } from "@/composables/useDataGridFilterBuilder";-import type { DataGridDistinctValueSuggestionState, DataGridDistinctValueSuggestionTarget } from "@/lib/dataGrid/dataGridDistinctValueSuggestions";+import type { DataGridDistinctValueSource, DataGridDistinctValueSuggestionState, DataGridDistinctValueSuggestionTarget } from "@/lib/dataGrid/dataGridDistinctValueSuggestions";import type { DataGridLocalFilterOption } from "@/lib/dataGrid/dataGridLocalColumnFilterState";const { t } = useI18n();@@ -58,6 +58,7 @@ const emit = defineEmits<{openValueSuggestions: [id: string, target: DataGridDistinctValueSuggestionTarget];closeValueSuggestions: [];updateValueSuggestionSearch: [value: string];+ updateValueSuggestionSource: [source: DataGridDistinctValueSource];selectValueSuggestion: [option: DataGridLocalFilterOption];toggleValueSuggestion: [option: DataGridLocalFilterOption];toggleAllValueSuggestions: [];@@ -655,8 +656,11 @@ function blurValueRule(id: string) {:error="props.valueSuggestions.error":limited="props.valueSuggestions.limited":limit="props.valueSuggestions.limit"+ :source="props.valueSuggestions.source"+ :can-use-server-filter="props.valueSuggestions.canUseServerFilter"@update:open="updateValueSuggestionsOpen(rule, 'value', $event)"@update:search="emit('updateValueSuggestionSearch', $event)"+ @update:source="emit('updateValueSuggestionSource', $event)"@select="emit('selectValueSuggestion', $event)"/><span class="shrink-0 text-[10px] text-muted-foreground">—</span>@@ -678,8 +682,11 @@ function blurValueRule(id: string) {:error="props.valueSuggestions.error":limited="props.valueSuggestions.limited":limit="props.valueSuggestions.limit"+ :source="props.valueSuggestions.source"+ :can-use-server-filter="props.valueSuggestions.canUseServerFilter"@update:open="updateValueSuggestionsOpen(rule, 'end', $event)"@update:search="emit('updateValueSuggestionSearch', $event)"+ @update:source="emit('updateValueSuggestionSource', $event)"@select="emit('selectValueSuggestion', $event)"/></template>@@ -703,10 +710,13 @@ function blurValueRule(id: string) {:error="props.valueSuggestions.error":limited="props.valueSuggestions.limited":limit="props.valueSuggestions.limit"+ :source="props.valueSuggestions.source"+ :can-use-server-filter="props.valueSuggestions.canUseServerFilter":multiple="true":selected-keys="props.valueSuggestions.selectedKeys"@update:open="updateValueSuggestionsOpen(rule, 'value', $event)"@update:search="emit('updateValueSuggestionSearch', $event)"+ @update:source="emit('updateValueSuggestionSource', $event)"@toggle="emit('toggleValueSuggestion', $event)"@toggle-all="emit('toggleAllValueSuggestions')"@apply="emit('applyValueSuggestions')"@@ -732,8 +742,11 @@ function blurValueRule(id: string) {:error="props.valueSuggestions.error":limited="props.valueSuggestions.limited":limit="props.valueSuggestions.limit"+ :source="props.valueSuggestions.source"+ :can-use-server-filter="props.valueSuggestions.canUseServerFilter"@update:open="updateValueSuggestionsOpen(rule, 'value', $event)"@update:search="emit('updateValueSuggestionSearch', $event)"+ @update:source="emit('updateValueSuggestionSource', $event)"@select="emit('selectValueSuggestion', $event)"/></template>@@ -762,8 +775,11 @@ function blurValueRule(id: string) {:error="props.valueSuggestions.error":limited="props.valueSuggestions.limited":limit="props.valueSuggestions.limit"+ :source="props.valueSuggestions.source"+ :can-use-server-filter="props.valueSuggestions.canUseServerFilter"@update:open="updateValueSuggestionsOpen(rule, 'value', $event)"@update:search="emit('updateValueSuggestionSearch', $event)"+ @update:source="emit('updateValueSuggestionSource', $event)"@select="emit('selectValueSuggestion', $event)"/><Input@@ -787,8 +803,11 @@ function blurValueRule(id: string) {:error="props.valueSuggestions.error":limited="props.valueSuggestions.limited":limit="props.valueSuggestions.limit"+ :source="props.valueSuggestions.source"+ :can-use-server-filter="props.valueSuggestions.canUseServerFilter"@update:open="updateValueSuggestionsOpen(rule, 'end', $event)"@update:search="emit('updateValueSuggestionSearch', $event)"+ @update:source="emit('updateValueSuggestionSource', $event)"@select="emit('selectValueSuggestion', $event)"/></div>@@ -813,10 +832,13 @@ function blurValueRule(id: string) {:error="props.valueSuggestions.error":limited="props.valueSuggestions.limited":limit="props.valueSuggestions.limit"+ :source="props.valueSuggestions.source"+ :can-use-server-filter="props.valueSuggestions.canUseServerFilter":multiple="true":selected-keys="props.valueSuggestions.selectedKeys"@update:open="updateValueSuggestionsOpen(rule, 'value', $event)"@update:search="emit('updateValueSuggestionSearch', $event)"+ @update:source="emit('updateValueSuggestionSource', $event)"@toggle="emit('toggleValueSuggestion', $event)"@toggle-all="emit('toggleAllValueSuggestions')"@apply="emit('applyValueSuggestions')"@@ -845,8 +867,11 @@ function blurValueRule(id: string) {:error="props.valueSuggestions.error":limited="props.valueSuggestions.limited":limit="props.valueSuggestions.limit"+ :source="props.valueSuggestions.source"+ :can-use-server-filter="props.valueSuggestions.canUseServerFilter"@update:open="updateValueSuggestionsOpen(rule, 'value', $event)"@update:search="emit('updateValueSuggestionSearch', $event)"+ @update:source="emit('updateValueSuggestionSource', $event)"@select="emit('selectValueSuggestion', $event)"/></div>diff --git a/apps/desktop/src/components/grid/DataGridFilterWorkbench.vue b/apps/desktop/src/components/grid/DataGridFilterWorkbench.vueindex 4557656a8f..bfb7d634bd 100644--- a/apps/desktop/src/components/grid/DataGridFilterWorkbench.vue+++ b/apps/desktop/src/components/grid/DataGridFilterWorkbench.vue@@ -6,7 +6,7 @@ import { Button } from "@/components/ui/button";import DataGridFilterBuilder from "@/components/grid/DataGridFilterBuilder.vue";import type { DataGridStructuredFilterRule } from "@/composables/useDataGridFilterBuilder";import type { DataGridContextFilterMode } from "@/lib/dataGrid/dataGridSql";-import type { DataGridDistinctValueSuggestionState, DataGridDistinctValueSuggestionTarget } from "@/lib/dataGrid/dataGridDistinctValueSuggestions";+import type { DataGridDistinctValueSource, DataGridDistinctValueSuggestionState, DataGridDistinctValueSuggestionTarget } from "@/lib/dataGrid/dataGridDistinctValueSuggestions";import type { DataGridLocalFilterOption } from "@/lib/dataGrid/dataGridLocalColumnFilterState";const props = defineProps<{@@ -36,6 +36,7 @@ const emit = defineEmits<{openValueSuggestions: [id: string, target: DataGridDistinctValueSuggestionTarget];closeValueSuggestions: [];updateValueSuggestionSearch: [value: string];+ updateValueSuggestionSource: [source: DataGridDistinctValueSource];selectValueSuggestion: [option: DataGridLocalFilterOption];toggleValueSuggestion: [option: DataGridLocalFilterOption];toggleAllValueSuggestions: [];@@ -90,6 +91,7 @@ watch(@open-value-suggestions="(id, target) => emit('openValueSuggestions', id, target)"@close-value-suggestions="emit('closeValueSuggestions')"@update-value-suggestion-search="emit('updateValueSuggestionSearch', $event)"+ @update-value-suggestion-source="emit('updateValueSuggestionSource', $event)"@select-value-suggestion="emit('selectValueSuggestion', $event)"@toggle-value-suggestion="emit('toggleValueSuggestion', $event)"@toggle-all-value-suggestions="emit('toggleAllValueSuggestions')"diff --git a/apps/desktop/src/components/grid/DataGridQueryControls.vue b/apps/desktop/src/components/grid/DataGridQueryControls.vueindex 99441d70d6..b7ebb29bcf 100644--- a/apps/desktop/src/components/grid/DataGridQueryControls.vue+++ b/apps/desktop/src/components/grid/DataGridQueryControls.vue@@ -12,7 +12,7 @@ import type { DataGridStructuredFilterRule } from "@/composables/useDataGridFiltimport type { DataGridStructuredSortRule } from "@/composables/useDataGridSortBuilder";import type { DataGridConditionHistoryScope } from "@/lib/dataGrid/dataGridConditionHistory";import type { DataGridContextFilterMode } from "@/lib/dataGrid/dataGridSql";-import type { DataGridDistinctValueSuggestionState, DataGridDistinctValueSuggestionTarget } from "@/lib/dataGrid/dataGridDistinctValueSuggestions";+import type { DataGridDistinctValueSource, DataGridDistinctValueSuggestionState, DataGridDistinctValueSuggestionTarget } from "@/lib/dataGrid/dataGridDistinctValueSuggestions";import type { DataGridLocalFilterOption } from "@/lib/dataGrid/dataGridLocalColumnFilterState";import type { DataGridFilterEditorView } from "@/stores/settingsStore";import type { DatabaseType } from "@/types/database";@@ -80,6 +80,7 @@ const emit = defineEmits<{openValueSuggestions: [id: string, target: DataGridDistinctValueSuggestionTarget];closeValueSuggestions: [];updateValueSuggestionSearch: [value: string];+ updateValueSuggestionSource: [source: DataGridDistinctValueSource];selectValueSuggestion: [option: DataGridLocalFilterOption];toggleValueSuggestion: [option: DataGridLocalFilterOption];toggleAllValueSuggestions: [];@@ -280,6 +281,7 @@ onUnmounted(onResizeEnd);@open-value-suggestions="(id, target) => emit('openValueSuggestions', id, target)"@close-value-suggestions="emit('closeValueSuggestions')"@update-value-suggestion-search="emit('updateValueSuggestionSearch', $event)"+ @update-value-suggestion-source="emit('updateValueSuggestionSource', $event)"@select-value-suggestion="emit('selectValueSuggestion', $event)"@toggle-value-suggestion="emit('toggleValueSuggestion', $event)"@toggle-all-value-suggestions="emit('toggleAllValueSuggestions')"diff --git a/apps/desktop/src/components/grid/DataGridTextFilterWorkbench.vue b/apps/desktop/src/components/grid/DataGridTextFilterWorkbench.vueindex 81aee9dd40..d82b2f45f8 100644--- a/apps/desktop/src/components/grid/DataGridTextFilterWorkbench.vue+++ b/apps/desktop/src/components/grid/DataGridTextFilterWorkbench.vue@@ -7,7 +7,7 @@ import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltipimport DataGridFilterBuilder from "@/components/grid/DataGridFilterBuilder.vue";import type { DataGridStructuredFilterRule } from "@/composables/useDataGridFilterBuilder";import type { DataGridContextFilterMode } from "@/lib/dataGrid/dataGridSql";-import type { DataGridDistinctValueSuggestionState, DataGridDistinctValueSuggestionTarget } from "@/lib/dataGrid/dataGridDistinctValueSuggestions";+import type { DataGridDistinctValueSource, DataGridDistinctValueSuggestionState, DataGridDistinctValueSuggestionTarget } from "@/lib/dataGrid/dataGridDistinctValueSuggestions";import type { DataGridLocalFilterOption } from "@/lib/dataGrid/dataGridLocalColumnFilterState";import { DATA_GRID_TEXT_FILTER_PANEL_HEIGHT_MAX, DATA_GRID_TEXT_FILTER_PANEL_HEIGHT_MIN } from "@/lib/dataGrid/dataGridTextFilterPanel";@@ -40,6 +40,7 @@ const emit = defineEmits<{openValueSuggestions: [id: string, target: DataGridDistinctValueSuggestionTarget];closeValueSuggestions: [];updateValueSuggestionSearch: [value: string];+ updateValueSuggestionSource: [source: DataGridDistinctValueSource];selectValueSuggestion: [option: DataGridLocalFilterOption];toggleValueSuggestion: [option: DataGridLocalFilterOption];toggleAllValueSuggestions: [];@@ -180,6 +181,7 @@ watch(@open-value-suggestions="(id, target) => emit('openValueSuggestions', id, target)"@close-value-suggestions="emit('closeValueSuggestions')"@update-value-suggestion-search="emit('updateValueSuggestionSearch', $event)"+ @update-value-suggestion-source="emit('updateValueSuggestionSource', $event)"@select-value-suggestion="emit('selectValueSuggestion', $event)"@toggle-value-suggestion="emit('toggleValueSuggestion', $event)"@toggle-all-value-suggestions="emit('toggleAllValueSuggestions')"diff --git a/apps/desktop/src/components/grid/__tests__/DataGridSurfaces.spec.ts b/apps/desktop/src/components/grid/__tests__/DataGridSurfaces.spec.tsindex 990327a58c..50106cf9b3 100644--- a/apps/desktop/src/components/grid/__tests__/DataGridSurfaces.spec.ts+++ b/apps/desktop/src/components/grid/__tests__/DataGridSurfaces.spec.ts@@ -1691,6 +1691,51 @@ describe("DataGridDistinctValuePopover", () => {await mounted.setProps({ selectedKeys: new Set(options.map((option) => option.key)) });expect(findSelectAll().props["aria-checked"]).toBe(true);});++ it("renders the current page value switch and emits update:source", async () => {+ const updateSource = vi.fn();+ const mounted = mountComponent(DataGridDistinctValuePopover, {+ open: true,+ search: "",+ options: [{ key: "str:open", label: "open", count: 12, value: "open" }],+ loading: false,+ error: "",+ limited: false,+ limit: 1000,+ source: "database",+ "onUpdate:source": updateSource,+ });++ expect(hostText(mounted.root)).toContain("grid.filterFromCurrentPage");+ const switchEl = findOne(mounted.root, (node) => node.props["data-distinct-value-page-switch"] === "");+ expect(switchEl.props["model-value"] ?? switchEl.props.modelValue).toBe(false);++ (switchEl.props["onUpdate:model-value"] ?? switchEl.props["onUpdate:modelValue"])(true);+ expect(updateSource).toHaveBeenCalledWith("page");++ await mounted.setProps({ source: "page" });+ const switchElPage = findOne(mounted.root, (node) => node.props["data-distinct-value-page-switch"] === "");+ expect(switchElPage.props["model-value"] ?? switchElPage.props.modelValue).toBe(true);++ (switchElPage.props["onUpdate:model-value"] ?? switchElPage.props["onUpdate:modelValue"])(false);+ expect(updateSource).toHaveBeenCalledWith("database");+ });++ it("disables source switch when server filter is not supported", () => {+ const mounted = mountComponent(DataGridDistinctValuePopover, {+ open: true,+ search: "",+ options: [{ key: "str:open", label: "open", count: 12, value: "open" }],+ loading: false,+ error: "",+ limited: false,+ limit: 1000,+ canUseServerFilter: false,+ });+ const switchEl = findOne(mounted.root, (node) => node.props["data-distinct-value-page-switch"] === "");+ expect(switchEl.props.disabled).toBe(true);+ expect(switchEl.props["model-value"] ?? switchEl.props.modelValue).toBe(true);+ });});describe("DataGridFilterWorkbench", () => {@@ -1753,6 +1798,24 @@ describe("DataGridFilterWorkbench", () => {expect(findAll(mounted.root, (node) => node.type === "button" && node.props.title === "grid.databaseValueFilter")).toHaveLength(1);});+ it("forwards distinct value source updates in the conditions workbench", () => {+ const updateSource = vi.fn();+ const mounted = mountComponent(DataGridFilterWorkbench, {+ sqlPreview: "",+ rules: [{ id: "r1", columnName: "status", mode: "equals", rawValue: "", rawEndValue: "", conjunction: "AND" }],+ columns: ["status"],+ filteredColumns: ["status"],+ modeOptions: [{ value: "equals", labelKey: "equals" }],+ columnSearch: "",+ valueSuggestions: { ruleId: "r1", target: "value", source: "database", search: "", options: [], loading: false, error: "", limited: false, limit: 1000, selectedKeys: new Set<string>() },+ onUpdateValueSuggestionSource: updateSource,+ });++ const switchEl = findOne(mounted.root, (node) => node.props["data-distinct-value-page-switch"] === "");+ (switchEl.props["onUpdate:model-value"] ?? switchEl.props["onUpdate:modelValue"])(true);+ expect(updateSource).toHaveBeenCalledWith("page");+ });+it("scrolls to the newest rule when a condition is added", async () => {const requestAnimationFrame = vi.spyOn(window, "requestAnimationFrame").mockImplementation((callback) => {callback(0);diff --git a/apps/desktop/src/i18n/locales/az.ts b/apps/desktop/src/i18n/locales/az.tsindex e597615685..bcc4e731d4 100644--- a/apps/desktop/src/i18n/locales/az.ts+++ b/apps/desktop/src/i18n/locales/az.ts@@ -2070,6 +2070,7 @@ export default withEnglishFallback({localFilterFor: "'{column}' üçün yerli dəyərlər",databaseValueFilter: "Verilənlər bazası dəyərlərinin süzgəci",databaseValueFilterFor: "'{column}' üçün verilənlər bazası dəyərləri",+ filterFromCurrentPage: "Cari səhifədən dəyərləri al",columnFormatter: "Sütun formatlayıcısı",columnFormatterActive: "Formatlanmış göstərmə aktivdir",columnFormatterFor: "'{column}' üçün formatlayıcı",diff --git a/apps/desktop/src/i18n/locales/en.ts b/apps/desktop/src/i18n/locales/en.tsindex 974432ef88..6b04fbd921 100644--- a/apps/desktop/src/i18n/locales/en.ts+++ b/apps/desktop/src/i18n/locales/en.ts@@ -2507,6 +2507,7 @@ export default {localFilterFor: "Local Values For '{column}'",databaseValueFilter: "Database value filter",databaseValueFilterFor: "Database Values For '{column}'",+ filterFromCurrentPage: "Get values from current page",columnFormatter: "Column formatter",columnFormatterActive: "Formatted display is active",columnFormatterFor: "Formatter for '{column}'",diff --git a/apps/desktop/src/i18n/locales/es.ts b/apps/desktop/src/i18n/locales/es.tsindex 29d457b7ba..da6b0db3e3 100644--- a/apps/desktop/src/i18n/locales/es.ts+++ b/apps/desktop/src/i18n/locales/es.ts@@ -2354,6 +2354,7 @@ export default withEnglishFallback({localFilterFor: "Valores locales para '{column}'",databaseValueFilter: "Filtro de valores de base de datos",databaseValueFilterFor: "Valores de base de datos para '{column}'",+ filterFromCurrentPage: "Obtener valores de la página actual",columnFormatter: "Formateador de columna",columnFormatterActive: "La visualización con formato está activa",columnFormatterFor: "Formateador para '{column}'",diff --git a/apps/desktop/src/i18n/locales/id.ts b/apps/desktop/src/i18n/locales/id.tsindex 67640b2a68..060450506c 100644--- a/apps/desktop/src/i18n/locales/id.ts+++ b/apps/desktop/src/i18n/locales/id.ts@@ -2342,6 +2342,7 @@ export default withEnglishFallback({localFilterFor: "Nilai Lokal Untuk '{column}'",databaseValueFilter: "Filter nilai database",databaseValueFilterFor: "Nilai Database Untuk '{column}'",+ filterFromCurrentPage: "Ambil nilai dari halaman saat ini",columnFormatter: "Pemformat kolom",columnFormatterActive: "Tampilan terformat sedang aktif",columnFormatterFor: "Pemformat untuk '{column}'",diff --git a/apps/desktop/src/i18n/locales/it.ts b/apps/desktop/src/i18n/locales/it.tsindex d5ae8d2c7f..defed04ac9 100644--- a/apps/desktop/src/i18n/locales/it.ts+++ b/apps/desktop/src/i18n/locales/it.ts@@ -2252,6 +2252,7 @@ export default withEnglishFallback({localFilterFor: "Valori locali per '{column}'",databaseValueFilter: "Filtro valori database",databaseValueFilterFor: "Valori database per '{column}'",+ filterFromCurrentPage: "Ottieni valori dalla pagina corrente",columnFormatter: "Formattatore colonna",columnFormatterActive: "La visualizzazione formattata è attiva",columnFormatterFor: "Formattatore per '{column}'",diff --git a/apps/desktop/src/i18n/locales/ja.ts b/apps/desktop/src/i18n/locales/ja.tsindex 1718e50335..84d6151c5b 100644--- a/apps/desktop/src/i18n/locales/ja.ts+++ b/apps/desktop/src/i18n/locales/ja.ts@@ -2258,6 +2258,7 @@ export default withEnglishFallback({localFilterFor: "'{column}'のローカル値",databaseValueFilter: "データベース値フィルター",databaseValueFilterFor: "'{column}'のデータベース値",+ filterFromCurrentPage: "現在のページから値を取得",columnFormatter: "列フォーマッター",columnFormatterActive: "この列には表示形式が適用されています",columnFormatterFor: "'{column}'のフォーマッター",diff --git a/apps/desktop/src/i18n/locales/ko.ts b/apps/desktop/src/i18n/locales/ko.tsindex 7463c2bb95..dc572822a9 100644--- a/apps/desktop/src/i18n/locales/ko.ts+++ b/apps/desktop/src/i18n/locales/ko.ts@@ -2306,6 +2306,7 @@ export default withEnglishFallback({localFilterFor: "'{column}' 로컬 값",databaseValueFilter: "데이터베이스 값 필터",databaseValueFilterFor: "'{column}' 데이터베이스 값",+ filterFromCurrentPage: "현재 페이지에서 값 가져오기",columnFormatter: "컬럼 포매터",columnFormatterActive: "이 열에 서식이 적용되어 있습니다",columnFormatterFor: "'{column}' 포매터",diff --git a/apps/desktop/src/i18n/locales/pt-BR.ts b/apps/desktop/src/i18n/locales/pt-BR.tsindex e9de6555fa..4f044d1d58 100644--- a/apps/desktop/src/i18n/locales/pt-BR.ts+++ b/apps/desktop/src/i18n/locales/pt-BR.ts@@ -2253,6 +2253,7 @@ export default withEnglishFallback({localFilterFor: "Valores locais para '{column}'",databaseValueFilter: "Filtro de valores do banco de dados",databaseValueFilterFor: "Valores do banco de dados para '{column}'",+ filterFromCurrentPage: "Obter valores da página atual",columnFormatter: "Formatador de coluna",columnFormatterActive: "A exibição formatada está ativa",columnFormatterFor: "Formatador para '{column}'",diff --git a/apps/desktop/src/i18n/locales/ru.ts b/apps/desktop/src/i18n/locales/ru.tsindex c9279ca3a7..cd64449731 100644--- a/apps/desktop/src/i18n/locales/ru.ts+++ b/apps/desktop/src/i18n/locales/ru.ts@@ -2405,6 +2405,7 @@ export default withEnglishFallback({localFilterFor: "Локальные значения для «{column}»",databaseValueFilter: "Фильтр значений базы данных",databaseValueFilterFor: "Значения базы данных для «{column}»",+ filterFromCurrentPage: "Получать значения с текущей страницы",columnFormatter: "Форматирование столбца",columnFormatterActive: "Форматированный вывод включён",columnFormatterFor: "Форматирование для «{column}»",diff --git a/apps/desktop/src/i18n/locales/tr.ts b/apps/desktop/src/i18n/locales/tr.tsindex b871eb385d..a8cae2f98c 100644--- a/apps/desktop/src/i18n/locales/tr.ts+++ b/apps/desktop/src/i18n/locales/tr.ts@@ -2063,6 +2063,7 @@ export default withEnglishFallback({localFilterFor: "'{column}' İçin Yerel Değerler",databaseValueFilter: "Veritabanı değer filtresi",databaseValueFilterFor: "'{column}' İçin Veritabanı Değerleri",+ filterFromCurrentPage: "Geçerli sayfadan değerleri al",columnFormatter: "Sütun biçimlendirici",columnFormatterActive: "Biçimlendirilmiş görünüm etkin",columnFormatterFor: "'{column}' için biçimlendirici",diff --git a/apps/desktop/src/i18n/locales/zh-CN.ts b/apps/desktop/src/i18n/locales/zh-CN.tsindex 59d83a3b3f..c060952f37 100644--- a/apps/desktop/src/i18n/locales/zh-CN.ts+++ b/apps/desktop/src/i18n/locales/zh-CN.ts@@ -2442,6 +2442,7 @@ export default withEnglishFallback({localFilterFor: "本地值筛选“{column}”",databaseValueFilter: "数据库值筛选",databaseValueFilterFor: "数据库值筛选“{column}”",+ filterFromCurrentPage: "从当前页取值",columnFormatter: "列格式化",columnFormatterActive: "该列已应用格式化展示",columnFormatterFor: "格式化“{column}”",diff --git a/apps/desktop/src/i18n/locales/zh-TW.ts b/apps/desktop/src/i18n/locales/zh-TW.tsindex 983ef747a1..ea40d62968 100644--- a/apps/desktop/src/i18n/locales/zh-TW.ts+++ b/apps/desktop/src/i18n/locales/zh-TW.ts@@ -2253,6 +2253,7 @@ export default withEnglishFallback({localFilterFor: "本機值篩選「{column}」",databaseValueFilter: "資料庫值篩選",databaseValueFilterFor: "資料庫值篩選「{column}」",+ filterFromCurrentPage: "從目前頁取值",columnFormatter: "欄位格式設定",columnFormatterActive: "此欄位已套用格式化顯示",columnFormatterFor: "格式化「{column}」",diff --git a/apps/desktop/src/lib/dataGrid/dataGridDistinctValueSuggestions.ts b/apps/desktop/src/lib/dataGrid/dataGridDistinctValueSuggestions.tsindex 82f5ae1370..4e42e47d46 100644--- a/apps/desktop/src/lib/dataGrid/dataGridDistinctValueSuggestions.ts+++ b/apps/desktop/src/lib/dataGrid/dataGridDistinctValueSuggestions.ts@@ -5,10 +5,12 @@ import type { DataGridContextFilterMode } from "@/lib/dataGrid/dataGridSql";import type { ColumnInfo } from "@/types/database";export type DataGridDistinctValueSuggestionTarget = "value" | "end";+export type DataGridDistinctValueSource = "database" | "page";export interface DataGridDistinctValueSuggestionState {ruleId?: string;target?: DataGridDistinctValueSuggestionTarget;+ source?: DataGridDistinctValueSource;search: string;options: DataGridLocalFilterOption[];loading: boolean;@@ -16,6 +18,7 @@ export interface DataGridDistinctValueSuggestionState {limited: boolean;limit: number;selectedKeys: Set<string>;+ canUseServerFilter?: boolean;}export function dataGridDistinctValueKey(value: CellValue, columnInfo?: Pick<ColumnInfo, "data_type">): string {