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): support count-based filtering in local distinct value filter (#11980) (#12628)

lxk955c02cdbfe6ab0
diff --git a/apps/desktop/src/components/grid/DataGridColumnFilterPopover.vue b/apps/desktop/src/components/grid/DataGridColumnFilterPopover.vue
index 81b7ba2c50..ec264e3fb1 100644
--- a/apps/desktop/src/components/grid/DataGridColumnFilterPopover.vue
+++ b/apps/desktop/src/components/grid/DataGridColumnFilterPopover.vue
@@ -1,5 +1,5 @@
<script setup lang="ts">
-import { ArrowDown, ArrowUp, ArrowUpDown, Check, Database, Filter, Loader2, Search } from "@lucide/vue";
+import { ArrowDown, ArrowUp, ArrowUpDown, Check, Database, Filter, Loader2, Search, X } from "@lucide/vue";
import { useI18n } from "vue-i18n";
import { Button } from "@/components/ui/button";
import LightTooltip from "@/components/ui/LightTooltip.vue";
@@ -75,8 +75,38 @@ const { t } = useI18n();
spellcheck="false"
class="h-7 min-w-0 flex-1 bg-transparent text-xs outline-none placeholder:text-muted-foreground"
:placeholder="t('grid.searchValues')"
+ :title="props.draftMode === 'local' ? t('grid.searchValuesOrCountTooltip') : undefined"
@input="emit('update:search', ($event.target as HTMLInputElement).value)"
/>
+ <template v-if="props.draftMode === 'local'">
+ <div class="flex items-center gap-1 shrink-0">
+ <button
+ type="button"
+ class="h-5 px-1.5 rounded text-[10px] font-mono border transition-colors"
+ :class="props.search === '>1' ? 'border-primary bg-primary text-primary-foreground font-semibold shadow-xs' : 'border-border/60 bg-muted/40 hover:bg-muted text-muted-foreground hover:text-foreground'"
+ :title="t('grid.filterDuplicates')"
+ :aria-label="t('grid.filterDuplicates')"
+ :aria-pressed="props.search === '>1'"
+ @click="emit('update:search', props.search === '>1' ? '' : '>1')"
+ >
+ &gt;1
+ </button>
+ <button
+ type="button"
+ class="h-5 px-1.5 rounded text-[10px] font-mono border transition-colors"
+ :class="props.search === '=1' ? 'border-primary bg-primary text-primary-foreground font-semibold shadow-xs' : 'border-border/60 bg-muted/40 hover:bg-muted text-muted-foreground hover:text-foreground'"
+ :title="t('grid.filterUniques')"
+ :aria-label="t('grid.filterUniques')"
+ :aria-pressed="props.search === '=1'"
+ @click="emit('update:search', props.search === '=1' ? '' : '=1')"
+ >
+ =1
+ </button>
+ </div>
+ </template>
+ <button v-if="props.search" type="button" class="flex h-4 w-4 shrink-0 items-center justify-center rounded text-muted-foreground hover:text-foreground hover:bg-muted/60" :aria-label="t('grid.clearFilter')" @click="emit('update:search', '')">
+ <X class="h-3 w-3" />
+ </button>
</div>
<div class="grid grid-cols-[1.75rem_minmax(0,1fr)_3.5rem] border-b bg-muted/40 px-2 py-1 text-xs font-medium text-muted-foreground">
<button
diff --git a/apps/desktop/src/components/grid/__tests__/DataGridColumnFilterPopover.sort.spec.ts b/apps/desktop/src/components/grid/__tests__/DataGridColumnFilterPopover.sort.spec.ts
index 648768a563..da1eaa4826 100644
--- a/apps/desktop/src/components/grid/__tests__/DataGridColumnFilterPopover.sort.spec.ts
+++ b/apps/desktop/src/components/grid/__tests__/DataGridColumnFilterPopover.sort.spec.ts
@@ -8,7 +8,7 @@ vi.mock("vue-i18n", () => ({ useI18n: () => ({ t: (key: string) => key }) }));
vi.mock("@lucide/vue", async () => {
const { createPassthroughStub } = await import("./vueHostHarness");
const icon = createPassthroughStub("Icon", "i");
- return { ArrowDown: icon, ArrowUp: icon, ArrowUpDown: icon, Check: icon, Database: icon, Filter: icon, Loader2: icon, Search: icon };
+ return { ArrowDown: icon, ArrowUp: icon, ArrowUpDown: icon, Check: icon, Database: icon, Filter: icon, Loader2: icon, Search: icon, X: icon };
});
vi.mock("@/components/ui/button", async () => ({ Button: (await import("./vueHostHarness")).createPassthroughStub("Button", "button") }));
vi.mock("@/components/ui/LightTooltip.vue", async () => ({ default: (await import("./vueHostHarness")).createPassthroughStub("LightTooltip") }));
@@ -84,4 +84,87 @@ describe("DataGridColumnFilterPopover sort toggles", () => {
expect(onSort).not.toHaveBeenCalled();
mounted.unmount();
});
+
+ it("toggles >1 and =1 quick count filter shortcuts and clears search on clear click", async () => {
+ const onSearch = vi.fn();
+ const mounted = mountComponent(DataGridColumnFilterPopover, {
+ open: true,
+ compactHeaderActions: false,
+ canUseServerFilter: false,
+ active: false,
+ serverModeActive: false,
+ panelTitle: "status",
+ search: "",
+ popoverWidth: 280,
+ popoverOffsetX: 0,
+ draftMode: "local",
+ draftValues: new Set(options.map((option) => option.key)),
+ options,
+ sort: { field: "value", direction: "asc" },
+ allOptionsCount: options.length,
+ canApplyTypedValue: false,
+ typedValue: "",
+ serverLoading: false,
+ serverError: "",
+ serverLimited: false,
+ serverValueLimit: 1000,
+ "onUpdate:search": onSearch,
+ });
+
+ const duplicateButton = findOne(mounted.root, (node) => node.props["aria-label"] === "grid.filterDuplicates");
+ const uniqueButton = findOne(mounted.root, (node) => node.props["aria-label"] === "grid.filterUniques");
+ expect(duplicateButton).toBeTruthy();
+ expect(uniqueButton).toBeTruthy();
+
+ dispatch(duplicateButton, "click");
+ expect(onSearch).toHaveBeenCalledWith(">1");
+
+ await mounted.setProps({ search: ">1" });
+ expect(duplicateButton.props["aria-pressed"]).toBe(true);
+
+ // Clicking active >1 toggles it back to empty
+ dispatch(duplicateButton, "click");
+ expect(onSearch).toHaveBeenLastCalledWith("");
+
+ // Clicking =1 emits =1
+ dispatch(uniqueButton, "click");
+ expect(onSearch).toHaveBeenLastCalledWith("=1");
+
+ // Clear button appears when search is non-empty
+ await mounted.setProps({ search: "=1" });
+ const clearButton = findOne(mounted.root, (node) => node.props["aria-label"] === "grid.clearFilter");
+ expect(clearButton).toBeTruthy();
+ dispatch(clearButton, "click");
+ expect(onSearch).toHaveBeenLastCalledWith("");
+
+ mounted.unmount();
+ });
+
+ it("omits quick count filter buttons outside local draft mode", async () => {
+ const mounted = mountComponent(DataGridColumnFilterPopover, {
+ open: true,
+ compactHeaderActions: false,
+ canUseServerFilter: false,
+ active: false,
+ serverModeActive: false,
+ panelTitle: "status",
+ search: "",
+ popoverWidth: 280,
+ popoverOffsetX: 0,
+ draftMode: "server",
+ draftValues: new Set(),
+ options,
+ allOptionsCount: options.length,
+ canApplyTypedValue: false,
+ typedValue: "",
+ serverLoading: false,
+ serverError: "",
+ serverLimited: false,
+ serverValueLimit: 1000,
+ });
+
+ expect(findAll(mounted.root, (node) => node.props["aria-label"] === "grid.filterDuplicates")).toHaveLength(0);
+ expect(findAll(mounted.root, (node) => node.props["aria-label"] === "grid.filterUniques")).toHaveLength(0);
+ mounted.unmount();
+ });
});
diff --git a/apps/desktop/src/composables/__tests__/useDataGridColumnFilters.sort.spec.ts b/apps/desktop/src/composables/__tests__/useDataGridColumnFilters.sort.spec.ts
index 2bc9947831..fb5b08f683 100644
--- a/apps/desktop/src/composables/__tests__/useDataGridColumnFilters.sort.spec.ts
+++ b/apps/desktop/src/composables/__tests__/useDataGridColumnFilters.sort.spec.ts
@@ -55,7 +55,7 @@ function mountColumnFilters(rows: CellValue[][]) {
app.mount(document.createElement("div"));
disposers.push(() => app.unmount());
if (!filters) throw new Error("useDataGridColumnFilters was not mounted");
- return filters;
+ return Object.assign(filters, { state });
}
afterEach(() => {
@@ -109,4 +109,47 @@ describe("useDataGridColumnFilters local filter sort", () => {
expect(filters.localFilterSort.value).toEqual({ field: "value", direction: "asc" });
});
+
+ it("filters local filter options by count query (>1, =1, count>1)", () => {
+ const filters = mountColumnFilters([["beta"], ["beta"], ["beta"], ["alpha"], ["alpha"], ["zulu"]]);
+
+ filters.openLocalFilter(0);
+ expect(filters.localFilterOptions.value.map((opt) => [opt.label, opt.count])).toEqual([
+ ["alpha", 2],
+ ["beta", 3],
+ ["zulu", 1],
+ ]);
+
+ // Filter duplicates (>1)
+ filters.state.localFilterSearch.value = ">1";
+ expect(filters.localFilterOptions.value.map((opt) => opt.label)).toEqual(["alpha", "beta"]);
+
+ // Filter unique (=1)
+ filters.state.localFilterSearch.value = "=1";
+ expect(filters.localFilterOptions.value.map((opt) => opt.label)).toEqual(["zulu"]);
+
+ // Filter by count with prefix: count >= 3
+ filters.state.localFilterSearch.value = "count >= 3";
+ expect(filters.localFilterOptions.value.map((opt) => opt.label)).toEqual(["beta"]);
+
+ // Clear draft values, then toggle to select only visible filtered options
+ filters.state.localFilterDraft.value!.values.clear();
+ filters.toggleAllLocalFilterOptions();
+ expect([...filters.state.localFilterDraft.value!.values]).toEqual(["str:beta"]);
+
+ // Bare number searches by label substring, not count
+ filters.state.localFilterSearch.value = "bet";
+ expect(filters.localFilterOptions.value.map((opt) => opt.label)).toEqual(["beta"]);
+ });
+
+ it("treats count queries as non-typeable where filter values", () => {
+ const filters = mountColumnFilters([["beta"]]);
+ filters.openLocalFilter(0);
+
+ filters.state.localFilterSearch.value = ">1";
+ expect(filters.canApplyTypedLocalFilterValue.value).toBe(false);
+
+ filters.state.localFilterSearch.value = "count>1";
+ expect(filters.canApplyTypedLocalFilterValue.value).toBe(false);
+ });
});
diff --git a/apps/desktop/src/composables/useDataGridColumnFilters.ts b/apps/desktop/src/composables/useDataGridColumnFilters.ts
index eac8726f9c..7651a52fc2 100644
--- a/apps/desktop/src/composables/useDataGridColumnFilters.ts
+++ b/apps/desktop/src/composables/useDataGridColumnFilters.ts
@@ -1,6 +1,16 @@
import { computed, ref, watch, type ComputedRef, type Ref } from "vue";
import { buildColumnValueFilterCondition, buildColumnValuesFilterCondition, parseFilterValue, removeColumnValueFilterCondition, replaceColumnValueFilterCondition, appendColumnValueFilterCondition } from "@/lib/dataGrid/dataGridColumnFilter";
-import { buildDataGridLocalFilterOptions, sortDataGridLocalFilterOptions, type DataGridLocalFilterSort, dataGridLocalFilterKey, dataGridLocalFilterLabel, rowMatchesDataGridLocalColumnFilters, type DataGridLocalFilterOption } from "@/lib/dataGrid/dataGridLocalColumnFilterState";
+import {
+ buildDataGridLocalFilterOptions,
+ filterDataGridLocalFilterOptions,
+ parseDataGridLocalFilterCountQuery,
+ sortDataGridLocalFilterOptions,
+ type DataGridLocalFilterSort,
+ dataGridLocalFilterKey,
+ dataGridLocalFilterLabel,
+ rowMatchesDataGridLocalColumnFilters,
+ type DataGridLocalFilterOption,
+} from "@/lib/dataGrid/dataGridLocalColumnFilterState";
import type { DataGridCachedServerColumnFilter } from "@/lib/dataGrid/dataGridFilterBuilderPersistence";
import type { CellValue } from "@/lib/dataGrid/cellValue";
import { DATA_GRID_DISTINCT_VALUE_DEFAULT_LIMIT, useDataGridDistinctValueLoader } from "@/composables/useDataGridDistinctValueLoader";
@@ -169,8 +179,7 @@ export function useDataGridColumnFilters(options: UseDataGridColumnFiltersOption
});
const localFilterOptions = computed(() => {
if (state.localFilterDraft.value?.mode === "server") return serverFilterOptions.value;
- const query = state.localFilterSearch.value.trim().toLowerCase();
- const matchingOptions = localFilterAllOptions.value.filter((option) => !query || option.label.toLowerCase().includes(query));
+ const matchingOptions = filterDataGridLocalFilterOptions(localFilterAllOptions.value, state.localFilterSearch.value);
// Sort before limiting so frequent values outside the default first 500 remain discoverable.
// buildDataGridLocalFilterOptions already returns value-ascending options, so the default
// sort state skips the re-sort instead of re-running it on every search keystroke.
@@ -191,6 +200,7 @@ export function useDataGridColumnFilters(options: UseDataGridColumnFiltersOption
const canApplyTypedLocalFilterValue = computed(() => {
const typed = localFilterTypedValue.value;
if (!state.localFilterDraft.value || !typed || !options.canUseWhereSearch.value) return false;
+ if (parseDataGridLocalFilterCountQuery(typed)) return false;
const normalized = typed.toLowerCase();
return !localFilterAllOptions.value.some((option) => option.label.toLowerCase() === normalized);
});
diff --git a/apps/desktop/src/i18n/locales/en.ts b/apps/desktop/src/i18n/locales/en.ts
index 8c16e98cc2..b704bd5e12 100644
--- a/apps/desktop/src/i18n/locales/en.ts
+++ b/apps/desktop/src/i18n/locales/en.ts
@@ -2942,6 +2942,9 @@ export default {
saveFormatter: "Save",
clearFormatter: "Clear",
searchValues: "Search values...",
+ searchValuesOrCountTooltip: "Search values or filter by count (e.g. >1, >=2, =1, count>1)",
+ filterDuplicates: "Filter duplicate values (>1)",
+ filterUniques: "Filter unique values (=1)",
loadingValues: "Loading values...",
serverValuesLimited: "Showing first {count} values",
filterTypedValue: "Use '{value}'",
diff --git a/apps/desktop/src/i18n/locales/es.ts b/apps/desktop/src/i18n/locales/es.ts
index be9791fb2f..8a4a3cd59b 100644
--- a/apps/desktop/src/i18n/locales/es.ts
+++ b/apps/desktop/src/i18n/locales/es.ts
@@ -3216,6 +3216,9 @@ export default withEnglishFallback({
tableDataPreviewDismiss: "No volver a mostrar",
tableDataPreviewLoaded: "Se cargaron {count} celdas con texto completo de la página actual",
tableDataPreviewLoadFailed: "Error al cargar el texto completo: {message}",
+ searchValuesOrCountTooltip: "Buscar valores o filtrar por cantidad (p. ej., >1, >=2, =1, count>1)",
+ filterDuplicates: "Filtrar duplicados por cantidad (>1)",
+ filterUniques: "Filtrar elementos únicos por cantidad (=1)",
currentPageSql: "SQL de la página actual",
actualExecutionSql: "SQL realmente ejecutado",
copyCurrentPageSql: "Copiar SQL de la página actual",
diff --git a/apps/desktop/src/i18n/locales/it.ts b/apps/desktop/src/i18n/locales/it.ts
index 205c7ec596..66df418c00 100644
--- a/apps/desktop/src/i18n/locales/it.ts
+++ b/apps/desktop/src/i18n/locales/it.ts
@@ -3089,6 +3089,9 @@ export default withEnglishFallback({
tableDataPreviewDismiss: "Non mostrare più",
tableDataPreviewLoaded: "Caricate {count} celle con testo completo nella pagina corrente",
tableDataPreviewLoadFailed: "Impossibile caricare il testo completo: {message}",
+ searchValuesOrCountTooltip: "Cerca valori o filtra per conteggio (ad es. >1, >=2, =1, count>1)",
+ filterDuplicates: "Filtra i duplicati per conteggio (>1)",
+ filterUniques: "Filtra gli unici per conteggio (=1)",
currentPageSql: "SQL della pagina corrente",
actualExecutionSql: "SQL effettivamente eseguito",
copyCurrentPageSql: "Copia SQL della pagina corrente",
diff --git a/apps/desktop/src/i18n/locales/ja.ts b/apps/desktop/src/i18n/locales/ja.ts
index 5cbccc55d9..46479a5415 100644
--- a/apps/desktop/src/i18n/locales/ja.ts
+++ b/apps/desktop/src/i18n/locales/ja.ts
@@ -3113,6 +3113,9 @@ export default withEnglishFallback({
tableDataPreviewDismiss: "今後表示しない",
tableDataPreviewLoaded: "現在のページの完全なテキストセルを {count} 個読み込みました",
tableDataPreviewLoadFailed: "完全なテキストの読み込みに失敗しました:{message}",
+ searchValuesOrCountTooltip: "値の検索または件数による絞り込み(例: >1, >=2, =1, count>1)",
+ filterDuplicates: "件数による重複項目の絞り込み(>1)",
+ filterUniques: "件数による一意項目の絞り込み(=1)",
currentPageSql: "現在のページの SQL",
actualExecutionSql: "実際に実行された SQL",
copyCurrentPageSql: "現在のページの SQL をコピー",
diff --git a/apps/desktop/src/i18n/locales/ko.ts b/apps/desktop/src/i18n/locales/ko.ts
index bb222ea2ce..a4c3afd021 100644
--- a/apps/desktop/src/i18n/locales/ko.ts
+++ b/apps/desktop/src/i18n/locales/ko.ts
@@ -3038,6 +3038,9 @@ export default withEnglishFallback({
tableDataPreviewDismiss: "다시 표시하지 않음",
tableDataPreviewLoaded: "현재 페이지의 전체 텍스트 셀 {count}개를 불러왔습니다",
tableDataPreviewLoadFailed: "전체 텍스트를 불러오지 못했습니다: {message}",
+ searchValuesOrCountTooltip: "값 검색 또는 개수로 필터링(예: >1, >=2, =1, count>1)",
+ filterDuplicates: "개수로 중복 항목 필터링(>1)",
+ filterUniques: "개수로 고유 항목 필터링(=1)",
currentPageSql: "현재 페이지 SQL",
actualExecutionSql: "실제 실행 SQL",
copyCurrentPageSql: "현재 페이지 SQL 복사",
diff --git a/apps/desktop/src/i18n/locales/pt-BR.ts b/apps/desktop/src/i18n/locales/pt-BR.ts
index 935480cfff..e04d8c22b0 100644
--- a/apps/desktop/src/i18n/locales/pt-BR.ts
+++ b/apps/desktop/src/i18n/locales/pt-BR.ts
@@ -3089,6 +3089,9 @@ export default withEnglishFallback({
tableDataPreviewDismiss: "Não mostrar novamente",
tableDataPreviewLoaded: "Carregadas {count} células de texto completo na página atual",
tableDataPreviewLoadFailed: "Falha ao carregar o texto completo: {message}",
+ searchValuesOrCountTooltip: "Pesquisar valores ou filtrar por quantidade (ex.: >1, >=2, =1, count>1)",
+ filterDuplicates: "Filtrar duplicados por quantidade (>1)",
+ filterUniques: "Filtrar únicos por quantidade (=1)",
currentPageSql: "SQL da página atual",
actualExecutionSql: "SQL de execução real",
copyCurrentPageSql: "Copiar SQL da página atual",
diff --git a/apps/desktop/src/i18n/locales/ru.ts b/apps/desktop/src/i18n/locales/ru.ts
index 6508451a02..29ad6cbd14 100644
--- a/apps/desktop/src/i18n/locales/ru.ts
+++ b/apps/desktop/src/i18n/locales/ru.ts
@@ -3173,6 +3173,9 @@ export default withEnglishFallback({
tableDataPreviewDismiss: "Больше не показывать",
tableDataPreviewLoaded: "Загружено {count} ячеек с полным текстом на текущей странице",
tableDataPreviewLoadFailed: "Не удалось загрузить полный текст: {message}",
+ searchValuesOrCountTooltip: "Поиск значений или фильтрация по количеству (например, >1, >=2, =1, count>1)",
+ filterDuplicates: "Фильтровать дубликаты по количеству (>1)",
+ filterUniques: "Фильтровать уникальные элементы по количеству (=1)",
currentPageSql: "SQL текущей страницы",
actualExecutionSql: "Фактически выполненный SQL",
copyCurrentPageSql: "Копировать SQL текущей страницы",
diff --git a/apps/desktop/src/i18n/locales/th.ts b/apps/desktop/src/i18n/locales/th.ts
index 659c6a7752..516c79f0c4 100644
--- a/apps/desktop/src/i18n/locales/th.ts
+++ b/apps/desktop/src/i18n/locales/th.ts
@@ -3396,6 +3396,9 @@ export default withEnglishFallback({
tableDataPreviewDismiss: "ไม่แสดงอีก",
tableDataPreviewLoaded: "โหลดเซลล์ข้อความฉบับเต็มในหน้าปัจจุบันแล้ว {count} เซลล์",
tableDataPreviewLoadFailed: "โหลดข้อความฉบับเต็มไม่สำเร็จ: {message}",
+ searchValuesOrCountTooltip: "ค้นหาค่าหรือกรองตามจำนวน (เช่น >1, >=2, =1, count>1)",
+ filterDuplicates: "กรองรายการที่ซ้ำกันตามจำนวน (>1)",
+ filterUniques: "กรองรายการที่ไม่ซ้ำกันตามจำนวน (=1)",
currentPageSql: "SQL ของหน้าปัจจุบัน",
actualExecutionSql: "SQL ที่ดำเนินการจริง",
copyCurrentPageSql: "คัดลอก SQL ของหน้าปัจจุบัน",
diff --git a/apps/desktop/src/i18n/locales/zh-CN.ts b/apps/desktop/src/i18n/locales/zh-CN.ts
index ba49a7ae35..fe5fcf0c0b 100644
--- a/apps/desktop/src/i18n/locales/zh-CN.ts
+++ b/apps/desktop/src/i18n/locales/zh-CN.ts
@@ -2875,6 +2875,9 @@ export default withEnglishFallback({
saveFormatter: "保存",
clearFormatter: "清除",
searchValues: "搜索值...",
+ searchValuesOrCountTooltip: "搜索值或按数量筛选(如 >1, >=2, =1, count>1)",
+ filterDuplicates: "按数量筛选重复项(>1)",
+ filterUniques: "按数量筛选唯一项(=1)",
loadingValues: "正在加载值...",
serverValuesLimited: "仅显示前 {count} 个值",
filterTypedValue: "使用“{value}”筛选",
diff --git a/apps/desktop/src/i18n/locales/zh-TW.ts b/apps/desktop/src/i18n/locales/zh-TW.ts
index 745f2a1b31..1972f28c97 100644
--- a/apps/desktop/src/i18n/locales/zh-TW.ts
+++ b/apps/desktop/src/i18n/locales/zh-TW.ts
@@ -2532,6 +2532,9 @@ export default withEnglishFallback({
saveFormatter: "儲存",
clearFormatter: "清除",
searchValues: "搜尋值……",
+ searchValuesOrCountTooltip: "搜尋值或按數量篩選(如 >1, >=2, =1, count>1)",
+ filterDuplicates: "按數量篩選重複項(>1)",
+ filterUniques: "按數量篩選唯一項(=1)",
loadingValues: "正在載入值...",
serverValuesLimited: "僅顯示前 {count} 個值",
filterTypedValue: "使用「{value}」篩選",
diff --git a/apps/desktop/src/lib/__tests__/dataGrid/dataGridLocalColumnFilterState.spec.ts b/apps/desktop/src/lib/__tests__/dataGrid/dataGridLocalColumnFilterState.spec.ts
index fd75f13368..d77ef1aa6a 100644
--- a/apps/desktop/src/lib/__tests__/dataGrid/dataGridLocalColumnFilterState.spec.ts
+++ b/apps/desktop/src/lib/__tests__/dataGrid/dataGridLocalColumnFilterState.spec.ts
@@ -1,5 +1,15 @@
import { describe, expect, it } from "vitest";
-import { buildDataGridLocalFilterOptions, dataGridLocalFilterKey, restoreDataGridLocalColumnFilters, rowMatchesDataGridLocalColumnFilters, serializeDataGridLocalColumnFilters, sortDataGridLocalFilterOptions, type DataGridLocalFilterOption } from "@/lib/dataGrid/dataGridLocalColumnFilterState";
+import {
+ buildDataGridLocalFilterOptions,
+ dataGridLocalFilterKey,
+ filterDataGridLocalFilterOptions,
+ parseDataGridLocalFilterCountQuery,
+ restoreDataGridLocalColumnFilters,
+ rowMatchesDataGridLocalColumnFilters,
+ serializeDataGridLocalColumnFilters,
+ sortDataGridLocalFilterOptions,
+ type DataGridLocalFilterOption,
+} from "@/lib/dataGrid/dataGridLocalColumnFilterState";
function filterOption(label: string, count: number | null): DataGridLocalFilterOption {
return { key: `str:${label}`, label, count, value: label };
@@ -103,4 +113,100 @@ describe("data grid local column filter state", () => {
expect(sorted.map((option) => option.label)).toEqual(["alpha", "beta"]);
expect(options).toEqual(snapshot);
});
+
+ it("parses count comparison queries with all supported operators", () => {
+ const gt = parseDataGridLocalFilterCountQuery(">1");
+ expect(gt).not.toBeNull();
+ expect(gt!(2)).toBe(true);
+ expect(gt!(1)).toBe(false);
+ expect(gt!(null)).toBe(false);
+
+ const gte = parseDataGridLocalFilterCountQuery(">= 2");
+ expect(gte).not.toBeNull();
+ expect(gte!(2)).toBe(true);
+ expect(gte!(1)).toBe(false);
+
+ const lt = parseDataGridLocalFilterCountQuery("< 3");
+ expect(lt).not.toBeNull();
+ expect(lt!(2)).toBe(true);
+ expect(lt!(3)).toBe(false);
+ expect(lt!(null)).toBe(true);
+
+ const lte = parseDataGridLocalFilterCountQuery("<= 2");
+ expect(lte).not.toBeNull();
+ expect(lte!(2)).toBe(true);
+ expect(lte!(3)).toBe(false);
+
+ const eq = parseDataGridLocalFilterCountQuery("=1");
+ expect(eq).not.toBeNull();
+ expect(eq!(1)).toBe(true);
+ expect(eq!(2)).toBe(false);
+
+ const eqDouble = parseDataGridLocalFilterCountQuery("== 1");
+ expect(eqDouble).not.toBeNull();
+ expect(eqDouble!(1)).toBe(true);
+
+ const ne = parseDataGridLocalFilterCountQuery("!= 1");
+ expect(ne).not.toBeNull();
+ expect(ne!(2)).toBe(true);
+ expect(ne!(1)).toBe(false);
+
+ const neDiamond = parseDataGridLocalFilterCountQuery("<>1");
+ expect(neDiamond).not.toBeNull();
+ expect(neDiamond!(2)).toBe(true);
+ expect(neDiamond!(1)).toBe(false);
+ });
+
+ it("parses count queries with count and 数量 prefixes", () => {
+ const countPrefix = parseDataGridLocalFilterCountQuery("count: >1");
+ expect(countPrefix).not.toBeNull();
+ expect(countPrefix!(2)).toBe(true);
+ expect(countPrefix!(1)).toBe(false);
+
+ const countColon = parseDataGridLocalFilterCountQuery("count: 3");
+ expect(countColon).not.toBeNull();
+ expect(countColon!(3)).toBe(true);
+ expect(countColon!(2)).toBe(false);
+
+ const countEq = parseDataGridLocalFilterCountQuery("count=2");
+ expect(countEq).not.toBeNull();
+ expect(countEq!(2)).toBe(true);
+
+ const zhGt = parseDataGridLocalFilterCountQuery("数量 > 2");
+ expect(zhGt).not.toBeNull();
+ expect(zhGt!(3)).toBe(true);
+ expect(zhGt!(2)).toBe(false);
+
+ const zhColon = parseDataGridLocalFilterCountQuery("数量: 1");
+ expect(zhColon).not.toBeNull();
+ expect(zhColon!(1)).toBe(true);
+ });
+
+ it("does not treat bare numbers or invalid queries as count filters", () => {
+ expect(parseDataGridLocalFilterCountQuery("1")).toBeNull();
+ expect(parseDataGridLocalFilterCountQuery("100")).toBeNull();
+ expect(parseDataGridLocalFilterCountQuery("alpha")).toBeNull();
+ expect(parseDataGridLocalFilterCountQuery("")).toBeNull();
+ expect(parseDataGridLocalFilterCountQuery(" ")).toBeNull();
+ expect(parseDataGridLocalFilterCountQuery(">abc")).toBeNull();
+ });
+
+ it("filters options by count while preserving literal label matches", () => {
+ const options = [filterOption("apple", 5), filterOption("banana", 1), filterOption("orange", 2), filterOption(">1 special", 1)];
+
+ // Filter duplicates (>1): matches apple (5), orange (2), and ">1 special" (label match)
+ const duplicates = filterDataGridLocalFilterOptions(options, ">1");
+ expect(duplicates.map((opt) => opt.label)).toEqual(["apple", "orange", ">1 special"]);
+
+ // Filter unique (=1): matches banana (1) and ">1 special" (1)
+ const uniques = filterDataGridLocalFilterOptions(options, "=1");
+ expect(uniques.map((opt) => opt.label)).toEqual(["banana", ">1 special"]);
+
+ // Normal text query: matches "an" -> banana, orange
+ const textFiltered = filterDataGridLocalFilterOptions(options, "an");
+ expect(textFiltered.map((opt) => opt.label)).toEqual(["banana", "orange"]);
+
+ // Empty query returns all options
+ expect(filterDataGridLocalFilterOptions(options, "")).toEqual(options);
+ });
});
diff --git a/apps/desktop/src/lib/dataGrid/dataGridLocalColumnFilterState.ts b/apps/desktop/src/lib/dataGrid/dataGridLocalColumnFilterState.ts
index 190fd1e28e..57a95a282a 100644
--- a/apps/desktop/src/lib/dataGrid/dataGridLocalColumnFilterState.ts
+++ b/apps/desktop/src/lib/dataGrid/dataGridLocalColumnFilterState.ts
@@ -14,6 +14,62 @@ export type DataGridLocalFilterSort = {
direction: "asc" | "desc";
};
+export type DataGridLocalFilterCountPredicate = (count: number | null) => boolean;
+
+function createCountPredicate(operator: string, target: number): DataGridLocalFilterCountPredicate {
+ switch (operator) {
+ case ">":
+ return (count) => (count ?? 0) > target;
+ case ">=":
+ return (count) => (count ?? 0) >= target;
+ case "<":
+ return (count) => (count ?? 0) < target;
+ case "<=":
+ return (count) => (count ?? 0) <= target;
+ case "!=":
+ case "<>":
+ return (count) => (count ?? 0) !== target;
+ case "=":
+ case "==":
+ default:
+ return (count) => (count ?? 0) === target;
+ }
+}
+
+export function parseDataGridLocalFilterCountQuery(query: string): DataGridLocalFilterCountPredicate | null {
+ const trimmed = query.trim();
+ if (!trimmed) return null;
+
+ const prefixMatch = /^(?:count|数量)\s*(?::\s*|\s*=\s*|\s*)?(>=|<=|>|<|==|=|!=|<>)?\s*(\d+)$/i.exec(trimmed);
+ if (prefixMatch) {
+ const op = prefixMatch[1] ?? "=";
+ const target = Number(prefixMatch[2]);
+ return createCountPredicate(op, target);
+ }
+
+ const opMatch = /^(>=|<=|>|<|==|=|!=|<>)\s*(\d+)$/.exec(trimmed);
+ if (opMatch) {
+ const op = opMatch[1];
+ const target = Number(opMatch[2]);
+ return createCountPredicate(op, target);
+ }
+
+ return null;
+}
+
+export function filterDataGridLocalFilterOptions(options: readonly DataGridLocalFilterOption[], query: string): DataGridLocalFilterOption[] {
+ const trimmed = query.trim();
+ if (!trimmed) return [...options];
+
+ const countPredicate = parseDataGridLocalFilterCountQuery(trimmed);
+ const normalizedQuery = trimmed.toLowerCase();
+
+ return options.filter((option) => {
+ if (countPredicate && countPredicate(option.count)) return true;
+ return option.label.toLowerCase().includes(normalizedQuery);
+ });
+}
+
function compareLocalFilterValues(a: DataGridLocalFilterOption, b: DataGridLocalFilterOption): number {
if (a.value === null && b.value !== null) return -1;
if (a.value !== null && b.value === null) return 1;