Skip to content

armgit / dbx

Public Imported from GitHub
0

25 MB lightweight cross-platform database client for 100+ databases, including MySQL, PostgreSQL, SQLite, Redis, MongoDB, DuckDB, SQL Server, and Dameng. Built-in AI, MCP Server, CLI, desktop and Docker. | 轻量级跨平台数据库管理工具,支持 MySQL、PostgreSQL、SQLite、Redis、MongoDB、达梦等 100+ 数据库,提供桌面端、Docker、CLI、内置 AI 助手和 MCP。

feat(grid): link column filter values

二丫讲梵6565b1b94fbf
diff --git a/apps/desktop/src/components/grid/DataGrid.vue b/apps/desktop/src/components/grid/DataGrid.vue
index 58aa88fe51..297cbadc27 100644
--- a/apps/desktop/src/components/grid/DataGrid.vue
+++ b/apps/desktop/src/components/grid/DataGrid.vue
@@ -291,6 +291,7 @@ import {
filterModeUsesRange,
parseFilterValue,
parseFilterValues,
+ removeColumnValueFilterCondition,
} from "@/lib/dataGrid/dataGridColumnFilter";
import { normalizeResultPageSize, resultPageSizeMenuOptions } from "@/lib/dataGrid/paginationPageSize";
import { dataGridPageSizeSettingsPatch, preferredDataGridPageSize, resolveDataGridPageSizePreference, type DataGridPageSizePreference } from "@/lib/dataGrid/dataGridPageSizePreference";
@@ -1497,6 +1498,11 @@ const localColumnFilterRuntime = useDataGridColumnFilters({
getConnectionConfig: () => (props.connectionId ? connectionStore.getConfig(props.connectionId) : undefined),
getIdentifierQuote: () => connectionStore.connectionIdentifierQuote?.(props.connectionId),
getGlobalQueryTimeoutSecs: () => settingsStore.editorSettings.globalQueryTimeoutSecs,
+ getDistinctWhereInput: (columnIndex) => {
+ const current = serverColumnFilters.value[columnIndex]?.condition;
+ const manualWhere = current ? removeColumnValueFilterCondition(whereFilterInput.value, current) : whereFilterInput.value;
+ return combineWhereInputs(manualWhere, appliedStructuredWhereInput.value);
+ },
getNewRows: () => getGridNewRows(),
getRowData: (row, sourceIndex) => getGridRowData(row, sourceIndex),
formatValue: (value, columnIndex) => formatCell(value, columnIndex, undefined, false),
diff --git a/apps/desktop/src/composables/useDataGridColumnFilters.ts b/apps/desktop/src/composables/useDataGridColumnFilters.ts
index afee3225b5..eac8726f9c 100644
--- a/apps/desktop/src/composables/useDataGridColumnFilters.ts
+++ b/apps/desktop/src/composables/useDataGridColumnFilters.ts
@@ -48,6 +48,7 @@ export interface UseDataGridColumnFiltersOptions {
getConnectionConfig: () => Pick<ConnectionConfig, "driver_profile" | "query_timeout_secs" | "query_timeout_inherit"> | undefined;
getIdentifierQuote: () => string | undefined;
getGlobalQueryTimeoutSecs: () => number | undefined;
+ getDistinctWhereInput?: (columnIndex: number) => string | undefined;
getNewRows: () => readonly (readonly CellValue[])[];
getRowData: (row: CellValue[], sourceIndex: number) => readonly CellValue[];
formatValue: (value: CellValue, columnIndex: number) => string;
@@ -75,6 +76,7 @@ export function useDataGridColumnFilters(options: UseDataGridColumnFiltersOption
getGlobalQueryTimeoutSecs: options.getGlobalQueryTimeoutSecs,
waitForTableMeta: options.waitForTableMeta,
formatValue: options.formatValue,
+ getWhereInput: options.getDistinctWhereInput,
});
const serverFilterLoading = distinctValueLoader.loading;
const serverFilterError = distinctValueLoader.error;
@@ -105,13 +107,27 @@ export function useDataGridColumnFilters(options: UseDataGridColumnFiltersOption
function buildLocalFilterOptions(columnIndex: number): DataGridLocalFilterOption[] {
const result = options.getResult();
- return buildDataGridLocalFilterOptions({
+ const otherFilters = Object.fromEntries(Object.entries(state.localColumnFilters.value).filter(([index]) => Number(index) !== columnIndex));
+ const filteredOptions = buildDataGridLocalFilterOptions({
rows: result.rows,
newRows: options.getNewRows(),
columnIndex,
getRowData: options.getRowData,
formatValue: options.formatValue,
+ includeRow: (row, sourceIndex) => rowMatchesDataGridLocalColumnFilters(options.getRowData(row, sourceIndex), otherFilters),
+ includeNewRow: (row) => rowMatchesDataGridLocalColumnFilters(row, otherFilters),
});
+ const knownKeys = new Set(filteredOptions.map((option) => option.key));
+ const selectedKeys = state.localColumnFilters.value[columnIndex];
+ if (!selectedKeys?.size) return filteredOptions;
+ const selectedOptions = buildDataGridLocalFilterOptions({
+ rows: result.rows,
+ newRows: options.getNewRows(),
+ columnIndex,
+ getRowData: options.getRowData,
+ formatValue: options.formatValue,
+ }).filter((option) => selectedKeys.has(option.key) && !knownKeys.has(option.key));
+ return [...filteredOptions, ...selectedOptions.map((option) => ({ ...option, count: 0 }))].sort((a, b) => a.label.localeCompare(b.label, undefined, { numeric: true, sensitivity: "base" }));
}
const localFilterActive = (columnIndex: number) => !!state.localColumnFilters.value[columnIndex]?.size || !!state.serverColumnFilters.value[columnIndex];
@@ -193,7 +209,6 @@ export function useDataGridColumnFilters(options: UseDataGridColumnFiltersOption
};
state.localFilterOpenColumn.value = columnIndex;
distinctValueLoader.reset();
- if (mode === "server") void loadServerFilterValues(columnIndex, "");
}
function closeLocalFilter() {
@@ -244,6 +259,19 @@ export function useDataGridColumnFilters(options: UseDataGridColumnFiltersOption
});
});
+ watch(
+ () => {
+ const draft = state.localFilterDraft.value;
+ if (!draft || draft.mode !== "server" || state.localFilterOpenColumn.value !== draft.columnIndex) return "";
+ return `${draft.columnIndex}\u0000${options.getDistinctWhereInput?.(draft.columnIndex) ?? ""}`;
+ },
+ () => {
+ const draft = state.localFilterDraft.value;
+ if (!draft || draft.mode !== "server" || state.localFilterOpenColumn.value !== draft.columnIndex) return;
+ void loadServerFilterValues(draft.columnIndex, state.localFilterSearch.value);
+ },
+ );
+
function toggleLocalFilterValue(key: string) {
const draft = state.localFilterDraft.value;
if (!draft) return;
diff --git a/apps/desktop/src/composables/useDataGridDistinctValueLoader.ts b/apps/desktop/src/composables/useDataGridDistinctValueLoader.ts
index 0cd094fd4f..f4bcee62e8 100644
--- a/apps/desktop/src/composables/useDataGridDistinctValueLoader.ts
+++ b/apps/desktop/src/composables/useDataGridDistinctValueLoader.ts
@@ -39,6 +39,7 @@ export interface UseDataGridDistinctValueLoaderOptions {
waitForTableMeta: () => Promise<DataGridDistinctValueTableMeta | null>;
formatValue: (value: CellValue, columnIndex: number) => string;
keyForValue?: (value: CellValue, columnInfo?: ColumnInfo) => string;
+ getWhereInput?: (columnIndex: number) => string | undefined;
}
type CachedDistinctValues = {
@@ -130,6 +131,7 @@ export function useDataGridDistinctValueLoader(options: UseDataGridDistinctValue
tableMeta.tableName,
request.columnName,
request.searchValue?.trim() ?? "",
+ options.getWhereInput?.(request.columnIndex) ?? "",
displayLimit,
request.includeCounts !== false,
]);
@@ -158,6 +160,7 @@ export function useDataGridDistinctValueLoader(options: UseDataGridDistinctValue
const columnInfo = tableMeta.columns.find((column) => column.name === request.columnName);
const connection = options.getConnectionConfig();
+ const whereInput = options.getWhereInput?.(request.columnIndex);
const sql = await buildDataGridColumnDistinctValuesSql({
databaseType: options.getDatabaseType(),
driverProfile: connection?.driver_profile,
@@ -168,6 +171,7 @@ export function useDataGridDistinctValueLoader(options: UseDataGridDistinctValue
tableName: tableMeta.tableName,
columnName: request.columnName,
columnInfo,
+ ...(whereInput ? { whereInput } : {}),
searchValue: request.searchValue?.trim() || undefined,
limit: displayLimit,
includeCounts: request.includeCounts !== false,
diff --git a/apps/desktop/src/lib/dataGrid/dataGridLocalColumnFilterState.ts b/apps/desktop/src/lib/dataGrid/dataGridLocalColumnFilterState.ts
index 6e99e0aaf1..190fd1e28e 100644
--- a/apps/desktop/src/lib/dataGrid/dataGridLocalColumnFilterState.ts
+++ b/apps/desktop/src/lib/dataGrid/dataGridLocalColumnFilterState.ts
@@ -53,12 +53,16 @@ export function buildDataGridLocalFilterOptions<TRow>({
columnIndex,
getRowData,
formatValue,
+ includeRow,
+ includeNewRow,
}: {
rows: readonly TRow[];
newRows: readonly (readonly CellValue[])[];
columnIndex: number;
getRowData: (row: TRow, sourceIndex: number) => readonly CellValue[];
formatValue: (value: CellValue, columnIndex: number) => string;
+ includeRow?: (row: TRow, sourceIndex: number) => boolean;
+ includeNewRow?: (row: readonly CellValue[]) => boolean;
}): DataGridLocalFilterOption[] {
const byKey = new Map<string, DataGridLocalFilterOption>();
const addValue = (value: CellValue) => {
@@ -77,9 +81,11 @@ export function buildDataGridLocalFilterOptions<TRow>({
};
for (const [sourceIndex, row] of rows.entries()) {
+ if (includeRow && !includeRow(row, sourceIndex)) continue;
addValue(getRowData(row, sourceIndex)[columnIndex] ?? null);
}
for (const row of newRows) {
+ if (includeNewRow && !includeNewRow(row)) continue;
addValue(row[columnIndex] ?? null);
}