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): customize filter operator order

zipgc9d93b6a4eb4
diff --git a/apps/desktop/src/components/grid/DataGrid.vue b/apps/desktop/src/components/grid/DataGrid.vue
index ddde11e475..58aa88fe51 100644
--- a/apps/desktop/src/components/grid/DataGrid.vue
+++ b/apps/desktop/src/components/grid/DataGrid.vue
@@ -91,6 +91,7 @@ import DataGridExtractorDialog from "@/components/grid/DataGridExtractorDialog.v
import DataGridColumnHeader from "@/components/grid/DataGridColumnHeader.vue";
import DataGridQueryControls from "@/components/grid/DataGridQueryControls.vue";
import DataGridFilterBuilder from "@/components/grid/DataGridFilterBuilder.vue";
+import DataGridFilterModeOrderDialog from "@/components/grid/DataGridFilterModeOrderDialog.vue";
import DataGridFilterWorkbench from "@/components/grid/DataGridFilterWorkbench.vue";
import DataGridTextFilterWorkbench from "@/components/grid/DataGridTextFilterWorkbench.vue";
import DataGridSortWorkbench from "@/components/grid/DataGridSortWorkbench.vue";
@@ -405,6 +406,7 @@ import { isSchemaAware, supportsTableStructureEditing } from "@/lib/database/dat
import { rememberDataGridConditionHistory } from "@/lib/dataGrid/dataGridConditionHistory";
import { buildDataGridLocalFilterOptions, restoreDataGridLocalColumnFilters, type DataGridLocalFilterOption } from "@/lib/dataGrid/dataGridLocalColumnFilterState";
import { effectiveDatabaseTypeForConnection, gaussdbCountQueryDopHint } from "@/lib/database/jdbcDialect";
+import { orderDataGridFilterModeOptions } from "@/lib/dataGrid/dataGridFilterModeOrder";
import { mongoCollectionSupportsIndexes, supportsMongoIndexMutations } from "@/lib/mongo/mongoCapabilities";
import { isProtectedMongoIndex, mongoDropAllIndexesPreview, mongoDropIndexFailureCount, mongoDropIndexPreview } from "@/lib/sidebar/mongoCollectionMutation";
import { runMongoMutation } from "@/lib/sidebar/runMongoSidebarMutation";
@@ -1274,7 +1276,19 @@ const allFilterModeOptions: Array<{ value: FilterMode; labelKey: string }> = [
{ value: "is-blank", labelKey: "grid.filterBuilderIsBlank" },
{ value: "is-not-blank", labelKey: "grid.filterBuilderIsNotBlank" },
];
-const filterModeOptions = computed(() => allFilterModeOptions.filter((option) => filterModeIsSupportedForDatabase(option.value, resolvedDatabaseType.value)));
+const supportedFilterModeOptions = computed(() => allFilterModeOptions.filter((option) => filterModeIsSupportedForDatabase(option.value, resolvedDatabaseType.value)));
+const filterModeOrderVersion = ref(0);
+const filterModeOptions = computed(() => {
+ void filterModeOrderVersion.value;
+ return orderDataGridFilterModeOptions(resolvedDatabaseType.value, supportedFilterModeOptions.value);
+});
+const filterModeOrderDialogOpen = ref(false);
+function openFilterModeOrderDialog() {
+ filterModeOrderDialogOpen.value = true;
+}
+function onFilterModeOrderSaved() {
+ filterModeOrderVersion.value += 1;
+}
const filterBuilderColumnOptions = computed(() => filterBuilderColumns.value.map((column) => column.name));
const structuredFilterCacheKey = computed(() => props.cacheKey || [props.connectionId ?? "", props.database ?? "", props.context ?? "", props.tableMeta?.schema ?? "", props.tableMeta?.tableName ?? ""].join("\u0001"));
const structuredFilterScopeKey = computed(() => [props.connectionId ?? "", props.database ?? "", props.schema ?? "", props.context ?? "", props.tableMeta?.schema ?? "", props.tableMeta?.tableName ?? "", props.tableMeta?.columns.map((column) => column.name).join("\0") ?? ""].join("\u0001"));
@@ -14095,6 +14109,7 @@ useUpdateBlocker(() => (hasPendingChanges.value || hasPendingDataEditorDraft.val
@toggle-value-suggestion="toggleFilterValueSuggestion"
@toggle-all-value-suggestions="toggleAllFilterValueSuggestions"
@apply-value-suggestions="applyFilterValueSuggestions"
+ @custom-mode-order="openFilterModeOrderDialog"
/>
</template>
@@ -14203,6 +14218,7 @@ useUpdateBlocker(() => (hasPendingChanges.value || hasPendingDataEditorDraft.val
@toggle-value-suggestion="toggleFilterValueSuggestion"
@toggle-all-value-suggestions="toggleAllFilterValueSuggestions"
@apply-value-suggestions="applyFilterValueSuggestions"
+ @custom-mode-order="openFilterModeOrderDialog"
/>
<DataGridTextFilterWorkbench
v-if="canUseWhereSearch && filterEditorView === 'text' && filterBuilderOpen"
@@ -14236,6 +14252,7 @@ useUpdateBlocker(() => (hasPendingChanges.value || hasPendingDataEditorDraft.val
@toggle-value-suggestion="toggleFilterValueSuggestion"
@toggle-all-value-suggestions="toggleAllFilterValueSuggestions"
@apply-value-suggestions="applyFilterValueSuggestions"
+ @custom-mode-order="openFilterModeOrderDialog"
/>
<DataGridSortWorkbench
v-if="canUseWhereSearch && filterEditorView === 'conditions' && sortBuilderOpen"
@@ -16105,6 +16122,7 @@ useUpdateBlocker(() => (hasPendingChanges.value || hasPendingDataEditorDraft.val
@move="(id, targetIndex) => conditionalBulkEditFilterBuilder.moveRule(id, targetIndex)"
@update-rule="(id, patch) => conditionalBulkEditFilterBuilder.updateRule(id, patch)"
@update:column-search="conditionalBulkEditColumnSearch = $event"
+ @custom-mode-order="openFilterModeOrderDialog"
/>
<Button variant="outline" size="sm" :disabled="!filterBuilderColumnOptions.length" @click="addConditionalBulkEditRule">{{ t("grid.filterBuilderAddRule") }}</Button>
</div>
@@ -16140,6 +16158,7 @@ useUpdateBlocker(() => (hasPendingChanges.value || hasPendingDataEditorDraft.val
<DataGridExtractorDialog v-model:open="extractorConfigOpen" :preference="selectedCopyPreference" :options="settingsStore.editorSettings.dataGridExtractorOptions" :items="copyPreferenceMenuItems" :preview="previewWithPreference" @save="saveExtractorConfiguration" />
<DataGridCopyColumnNamesDialog v-if="copyColumnNamesDialogMounted" v-model:open="copyColumnNamesDialogOpen" :column-names="copyColumnNamesDialogColumns" :database-type="resolvedDatabaseType" :column-comments="columnCommentMap" @copy="copyText" />
<GridSnapshotDialog v-model:open="gridSnapshotOpen" :source="gridSnapshotSource" />
+ <DataGridFilterModeOrderDialog v-model:open="filterModeOrderDialogOpen" :database-type="resolvedDatabaseType" :options="supportedFilterModeOptions" @saved="onFilterModeOrderSaved" />
<Dialog v-model:open="esDeepPageJumpConfirmOpen">
<DialogContent class="sm:max-w-[480px]">
diff --git a/apps/desktop/src/components/grid/DataGridFilterBuilder.vue b/apps/desktop/src/components/grid/DataGridFilterBuilder.vue
index 15da812dc4..a73a1db66b 100644
--- a/apps/desktop/src/components/grid/DataGridFilterBuilder.vue
+++ b/apps/desktop/src/components/grid/DataGridFilterBuilder.vue
@@ -63,6 +63,7 @@ const emit = defineEmits<{
toggleValueSuggestion: [option: DataGridLocalFilterOption];
toggleAllValueSuggestions: [];
applyValueSuggestions: [];
+ customModeOrder: [];
}>();
const columnSearchInputs = new Map<string, HTMLInputElement>();
const filterRuleElements = new Map<string, HTMLElement>();
@@ -70,6 +71,7 @@ const filterBuilderRootRef = ref<HTMLElement>();
const pendingValueFocus = new Set<string>();
const pendingKeyboardAddFocus = new Set<string>();
const openColumnSelectIds = ref(new Set<string>());
+const openModeSelectIds = ref(new Set<string>());
const activeColumnIndexes = ref<Record<string, number>>({});
const focusedValueRuleId = ref<string>();
const valueShortcutHintRuleId = ref<string>();
@@ -361,6 +363,22 @@ function setColumnSelectOpen(id: string, open: boolean) {
openColumnSelectIds.value = next;
}
+function setModeSelectOpen(id: string, open: boolean) {
+ const next = new Set(openModeSelectIds.value);
+ if (open) {
+ next.clear();
+ next.add(id);
+ } else {
+ next.delete(id);
+ }
+ openModeSelectIds.value = next;
+}
+
+function openCustomModeOrder(id: string) {
+ setModeSelectOpen(id, false);
+ emit("customModeOrder");
+}
+
async function handleColumnSelectOpen(rule: DataGridStructuredFilterRule, open: boolean) {
setColumnSelectOpen(rule.id, open);
if (!open) return;
@@ -627,13 +645,15 @@ function blurValueRule(id: string) {
</template>
</SelectContent>
</Select>
- <Select :model-value="rule.mode" :disabled="rule.disabled" @update:model-value="(value: any) => emit('updateRule', rule.id, { mode: value as DataGridContextFilterMode })">
+ <Select :model-value="rule.mode" :open="openModeSelectIds.has(rule.id)" :disabled="rule.disabled" @update:model-value="(value: any) => emit('updateRule', rule.id, { mode: value as DataGridContextFilterMode })" @update:open="(open: boolean) => setModeSelectOpen(rule.id, open)">
<SelectTrigger size="sm" class="w-full min-w-0 overflow-hidden text-xs [&_[data-slot=select-value]]:min-w-0 [&_[data-slot=select-value]]:truncate" :class="props.layout === 'text' ? 'h-6 rounded-none border-0 bg-transparent px-1 shadow-none focus-visible:ring-0' : 'h-7'"
><SelectValue
/></SelectTrigger>
<SelectContent
- ><SelectItem v-for="option in props.modeOptions" :key="option.value" :value="option.value" class="rounded-none">{{ t(option.labelKey) }}</SelectItem></SelectContent
- >
+ ><SelectItem v-for="option in props.modeOptions" :key="option.value" :value="option.value" class="rounded-none">{{ t(option.labelKey) }}</SelectItem>
+ <div class="my-1 border-t" />
+ <button type="button" class="flex w-full cursor-pointer items-center px-2 py-1.5 text-left text-xs text-muted-foreground outline-none hover:bg-accent hover:text-accent-foreground" @pointerdown.stop @click="openCustomModeOrder(rule.id)">{{ t("grid.filterModeOrderCustom") }}</button>
+ </SelectContent>
</Select>
<div v-if="props.layout === 'text'" class="flex min-w-0 items-center gap-1" :class="rule.disabled ? 'text-muted-foreground' : ''">
<template v-if="filterModeUsesRange(rule.mode)">
diff --git a/apps/desktop/src/components/grid/DataGridFilterModeOrderDialog.vue b/apps/desktop/src/components/grid/DataGridFilterModeOrderDialog.vue
new file mode 100644
index 0000000000..c3ef25be59
--- /dev/null
+++ b/apps/desktop/src/components/grid/DataGridFilterModeOrderDialog.vue
@@ -0,0 +1,76 @@
+<script setup lang="ts">
+import { computed, ref, watch } from "vue";
+import { ArrowDown, ArrowUp, RotateCcw } from "@lucide/vue";
+import { useI18n } from "vue-i18n";
+import { Button } from "@/components/ui/button";
+import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
+import { orderDataGridFilterModeOptions, resetDataGridFilterModeOrder, saveDataGridFilterModeOrder, type DataGridFilterModeOption } from "@/lib/dataGrid/dataGridFilterModeOrder";
+
+const props = defineProps<{
+ open: boolean;
+ databaseType?: string;
+ options: readonly DataGridFilterModeOption[];
+}>();
+const emit = defineEmits<{ "update:open": [value: boolean]; saved: [] }>();
+const { t } = useI18n();
+const draft = ref<DataGridFilterModeOption[]>([]);
+
+const databaseLabel = computed(() => {
+ const labels: Record<string, string> = { mysql: "MySQL", postgresql: "PostgreSQL", oracle: "Oracle", sqlserver: "SQL Server", sqlite: "SQLite", mongodb: "MongoDB", redis: "Redis", clickhouse: "ClickHouse" };
+ return labels[props.databaseType || ""] || props.databaseType || t("grid.filterModeOrderUnknownDatabase");
+});
+
+watch(
+ () => [props.open, props.databaseType, props.options] as const,
+ () => {
+ if (props.open) draft.value = orderDataGridFilterModeOptions(props.databaseType, props.options);
+ },
+ { immediate: true },
+);
+
+function move(index: number, offset: -1 | 1) {
+ const target = index + offset;
+ if (target < 0 || target >= draft.value.length) return;
+ const next = [...draft.value];
+ const [item] = next.splice(index, 1);
+ next.splice(target, 0, item!);
+ draft.value = next;
+}
+
+function reset() {
+ resetDataGridFilterModeOrder(props.databaseType);
+ draft.value = [...props.options];
+}
+
+function save() {
+ saveDataGridFilterModeOrder(
+ props.databaseType,
+ draft.value.map((item) => item.value),
+ );
+ emit("saved");
+ emit("update:open", false);
+}
+</script>
+
+<template>
+ <Dialog :open="open" @update:open="emit('update:open', $event)">
+ <DialogContent class="max-w-md">
+ <DialogHeader>
+ <DialogTitle>{{ t("grid.filterModeOrderTitle") }}</DialogTitle>
+ <DialogDescription>{{ t("grid.filterModeOrderDescription", { database: databaseLabel }) }}</DialogDescription>
+ </DialogHeader>
+ <div class="rounded border bg-muted/20 px-2 py-1.5 text-xs text-muted-foreground">{{ t("grid.filterModeOrderDatabase", { database: databaseLabel }) }}</div>
+ <div class="max-h-[min(55vh,420px)] space-y-1 overflow-auto py-1">
+ <div v-for="(option, index) in draft" :key="option.value" class="flex items-center gap-2 rounded border bg-background px-2 py-1.5 text-sm">
+ <span class="min-w-0 flex-1 truncate">{{ t(option.labelKey) }}</span>
+ <Button variant="ghost" size="icon" class="h-6 w-6" :disabled="index === 0" :aria-label="t('grid.filterModeOrderMoveUp')" @click="move(index, -1)"><ArrowUp class="h-3.5 w-3.5" /></Button>
+ <Button variant="ghost" size="icon" class="h-6 w-6" :disabled="index === draft.length - 1" :aria-label="t('grid.filterModeOrderMoveDown')" @click="move(index, 1)"><ArrowDown class="h-3.5 w-3.5" /></Button>
+ </div>
+ </div>
+ <DialogFooter>
+ <Button variant="ghost" size="sm" @click="reset"><RotateCcw class="mr-1 h-3.5 w-3.5" />{{ t("grid.filterModeOrderReset") }}</Button>
+ <Button size="sm" @click="save">{{ t("common.save") }}</Button>
+ </DialogFooter>
+ </DialogContent>
+ </Dialog>
+</template>
diff --git a/apps/desktop/src/components/grid/DataGridFilterWorkbench.vue b/apps/desktop/src/components/grid/DataGridFilterWorkbench.vue
index 02505d56d7..d77349380a 100644
--- a/apps/desktop/src/components/grid/DataGridFilterWorkbench.vue
+++ b/apps/desktop/src/components/grid/DataGridFilterWorkbench.vue
@@ -41,6 +41,7 @@ const emit = defineEmits<{
toggleValueSuggestion: [option: DataGridLocalFilterOption];
toggleAllValueSuggestions: [];
applyValueSuggestions: [];
+ customModeOrder: [];
}>();
const { t } = useI18n();
@@ -104,6 +105,7 @@ watch(
@toggle-value-suggestion="emit('toggleValueSuggestion', $event)"
@toggle-all-value-suggestions="emit('toggleAllValueSuggestions')"
@apply-value-suggestions="emit('applyValueSuggestions')"
+ @custom-mode-order="emit('customModeOrder')"
/>
</div>
diff --git a/apps/desktop/src/components/grid/DataGridQueryControls.vue b/apps/desktop/src/components/grid/DataGridQueryControls.vue
index aa71e43e63..0183c5ecf8 100644
--- a/apps/desktop/src/components/grid/DataGridQueryControls.vue
+++ b/apps/desktop/src/components/grid/DataGridQueryControls.vue
@@ -85,6 +85,7 @@ const emit = defineEmits<{
toggleValueSuggestion: [option: DataGridLocalFilterOption];
toggleAllValueSuggestions: [];
applyValueSuggestions: [];
+ customModeOrder: [];
addSortRule: [];
removeSortRule: [id: string];
moveSortRule: [id: string, targetIndex: number];
@@ -294,6 +295,7 @@ onUnmounted(onResizeEnd);
@toggle-value-suggestion="emit('toggleValueSuggestion', $event)"
@toggle-all-value-suggestions="emit('toggleAllValueSuggestions')"
@apply-value-suggestions="emit('applyValueSuggestions')"
+ @custom-mode-order="emit('customModeOrder')"
/>
</PopoverContent>
</Popover>
diff --git a/apps/desktop/src/components/grid/DataGridTextFilterWorkbench.vue b/apps/desktop/src/components/grid/DataGridTextFilterWorkbench.vue
index d82b2f45f8..3e2b1e2f7d 100644
--- a/apps/desktop/src/components/grid/DataGridTextFilterWorkbench.vue
+++ b/apps/desktop/src/components/grid/DataGridTextFilterWorkbench.vue
@@ -45,6 +45,7 @@ const emit = defineEmits<{
toggleValueSuggestion: [option: DataGridLocalFilterOption];
toggleAllValueSuggestions: [];
applyValueSuggestions: [];
+ customModeOrder: [];
}>();
const { t } = useI18n();
@@ -186,6 +187,7 @@ watch(
@toggle-value-suggestion="emit('toggleValueSuggestion', $event)"
@toggle-all-value-suggestions="emit('toggleAllValueSuggestions')"
@apply-value-suggestions="emit('applyValueSuggestions')"
+ @custom-mode-order="emit('customModeOrder')"
/>
</div>
diff --git a/apps/desktop/src/i18n/locales/en.ts b/apps/desktop/src/i18n/locales/en.ts
index 45a56b54af..b61fed4832 100644
--- a/apps/desktop/src/i18n/locales/en.ts
+++ b/apps/desktop/src/i18n/locales/en.ts
@@ -2794,6 +2794,14 @@ export default {
filterBuilderEnableRule: "Enable rule",
filterBuilderDisableRule: "Disable rule",
filterBuilderReorderRule: "Drag or use arrow keys to reorder condition",
+ filterModeOrderCustom: "Customize operator order…",
+ filterModeOrderTitle: "Customize operator order",
+ filterModeOrderDescription: "Choose the order of operators for this database type.",
+ filterModeOrderDatabase: "Database type: {database}",
+ filterModeOrderUnknownDatabase: "Unknown database",
+ filterModeOrderMoveUp: "Move operator up",
+ filterModeOrderMoveDown: "Move operator down",
+ filterModeOrderReset: "Reset order",
filterBuilderColumn: "Column",
filterBuilderSearchColumns: "Search columns...",
filterBuilderNoMatchingColumns: "No matching columns",
diff --git a/apps/desktop/src/i18n/locales/es.ts b/apps/desktop/src/i18n/locales/es.ts
index bc6f413953..a83921ae8d 100644
--- a/apps/desktop/src/i18n/locales/es.ts
+++ b/apps/desktop/src/i18n/locales/es.ts
@@ -2498,6 +2498,14 @@ export default withEnglishFallback({
filterBuilderEnableRule: "Activar regla",
filterBuilderDisableRule: "Desactivar regla",
filterBuilderReorderRule: "Arrastra o usa las flechas para reordenar la condición",
+ filterModeOrderCustom: "Customize operator order…",
+ filterModeOrderTitle: "Customize operator order",
+ filterModeOrderDescription: "Choose the order of operators for this database type.",
+ filterModeOrderDatabase: "Database type: {database}",
+ filterModeOrderUnknownDatabase: "Unknown database",
+ filterModeOrderMoveUp: "Move operator up",
+ filterModeOrderMoveDown: "Move operator down",
+ filterModeOrderReset: "Reset order",
filterBuilderColumn: "Columna",
filterBuilderValue: "Valor",
filterBuilderTextValue: "<?>",
diff --git a/apps/desktop/src/i18n/locales/it.ts b/apps/desktop/src/i18n/locales/it.ts
index 45ba72036b..9ca96b258a 100644
--- a/apps/desktop/src/i18n/locales/it.ts
+++ b/apps/desktop/src/i18n/locales/it.ts
@@ -2396,6 +2396,14 @@ export default withEnglishFallback({
filterBuilderEnableRule: "Abilita regola",
filterBuilderDisableRule: "Disabilita regola",
filterBuilderReorderRule: "Trascina o usa i tasti freccia per riordinare la condizione",
+ filterModeOrderCustom: "Personalizza l’ordine degli operatori…",
+ filterModeOrderTitle: "Personalizza l’ordine degli operatori",
+ filterModeOrderDescription: "Scegli l’ordine degli operatori per questo tipo di database.",
+ filterModeOrderDatabase: "Tipo di database: {database}",
+ filterModeOrderUnknownDatabase: "Database sconosciuto",
+ filterModeOrderMoveUp: "Sposta operatore su",
+ filterModeOrderMoveDown: "Sposta operatore giù",
+ filterModeOrderReset: "Ripristina ordine",
filterBuilderColumn: "Colonna",
filterBuilderValue: "Valore",
filterBuilderTextValue: "<?>",
diff --git a/apps/desktop/src/i18n/locales/ja.ts b/apps/desktop/src/i18n/locales/ja.ts
index 810bfe1f6a..521db3f232 100644
--- a/apps/desktop/src/i18n/locales/ja.ts
+++ b/apps/desktop/src/i18n/locales/ja.ts
@@ -2401,6 +2401,14 @@ export default withEnglishFallback({
filterBuilderEnableRule: "条件を有効化",
filterBuilderDisableRule: "条件を無効化",
filterBuilderReorderRule: "ドラッグまたは矢印キーで条件を並べ替え",
+ filterModeOrderCustom: "演算子の順序をカスタマイズ…",
+ filterModeOrderTitle: "演算子の順序をカスタマイズ",
+ filterModeOrderDescription: "このデータベース種別の演算子の表示順を選択します。",
+ filterModeOrderDatabase: "データベース種別:{database}",
+ filterModeOrderUnknownDatabase: "不明なデータベース",
+ filterModeOrderMoveUp: "演算子を上へ移動",
+ filterModeOrderMoveDown: "演算子を下へ移動",
+ filterModeOrderReset: "順序をリセット",
filterBuilderColumn: "列",
filterBuilderValue: "値",
filterBuilderTextValue: "<?>",
diff --git a/apps/desktop/src/i18n/locales/ko.ts b/apps/desktop/src/i18n/locales/ko.ts
index df6b9ea753..5f95cecd20 100644
--- a/apps/desktop/src/i18n/locales/ko.ts
+++ b/apps/desktop/src/i18n/locales/ko.ts
@@ -2448,6 +2448,14 @@ export default withEnglishFallback({
filterBuilderEnableRule: "조건 활성화",
filterBuilderDisableRule: "조건 비활성화",
filterBuilderReorderRule: "드래그하거나 방향키로 조건 순서 변경",
+ filterModeOrderCustom: "연산자 순서 사용자 지정…",
+ filterModeOrderTitle: "연산자 순서 사용자 지정",
+ filterModeOrderDescription: "이 데이터베이스 유형의 연산자 표시 순서를 선택합니다.",
+ filterModeOrderDatabase: "데이터베이스 유형: {database}",
+ filterModeOrderUnknownDatabase: "알 수 없는 데이터베이스",
+ filterModeOrderMoveUp: "연산자 위로 이동",
+ filterModeOrderMoveDown: "연산자 아래로 이동",
+ filterModeOrderReset: "순서 재설정",
filterBuilderColumn: "컬럼",
filterBuilderSearchColumns: "컬럼 검색...",
filterBuilderNoMatchingColumns: "일치하는 컬럼이 없습니다",
diff --git a/apps/desktop/src/i18n/locales/pt-BR.ts b/apps/desktop/src/i18n/locales/pt-BR.ts
index 62340ca47f..fda1f6e204 100644
--- a/apps/desktop/src/i18n/locales/pt-BR.ts
+++ b/apps/desktop/src/i18n/locales/pt-BR.ts
@@ -2397,6 +2397,14 @@ export default withEnglishFallback({
filterBuilderEnableRule: "Ativar regra",
filterBuilderDisableRule: "Desativar regra",
filterBuilderReorderRule: "Arraste ou use as setas para reordenar a condição",
+ filterModeOrderCustom: "Personalizar ordem dos operadores…",
+ filterModeOrderTitle: "Personalizar ordem dos operadores",
+ filterModeOrderDescription: "Escolha a ordem dos operadores para este tipo de banco de dados.",
+ filterModeOrderDatabase: "Tipo de banco de dados: {database}",
+ filterModeOrderUnknownDatabase: "Banco de dados desconhecido",
+ filterModeOrderMoveUp: "Mover operador para cima",
+ filterModeOrderMoveDown: "Mover operador para baixo",
+ filterModeOrderReset: "Redefinir ordem",
filterBuilderColumn: "Coluna",
filterBuilderValue: "Valor",
filterBuilderTextValue: "<?>",
diff --git a/apps/desktop/src/i18n/locales/ru.ts b/apps/desktop/src/i18n/locales/ru.ts
index 72375615a2..08007ae279 100644
--- a/apps/desktop/src/i18n/locales/ru.ts
+++ b/apps/desktop/src/i18n/locales/ru.ts
@@ -2546,6 +2546,14 @@ export default withEnglishFallback({
filterBuilderEnableRule: "Включить правило",
filterBuilderDisableRule: "Отключить правило",
filterBuilderReorderRule: "Перетащите или используйте стрелки для изменения порядка условия",
+ filterModeOrderCustom: "Настроить порядок операторов…",
+ filterModeOrderTitle: "Настроить порядок операторов",
+ filterModeOrderDescription: "Выберите порядок операторов для этого типа базы данных.",
+ filterModeOrderDatabase: "Тип базы данных: {database}",
+ filterModeOrderUnknownDatabase: "Неизвестная база данных",
+ filterModeOrderMoveUp: "Переместить оператор вверх",
+ filterModeOrderMoveDown: "Переместить оператор вниз",
+ filterModeOrderReset: "Сбросить порядок",
filterBuilderColumn: "Столбец",
filterBuilderSearchColumns: "Поиск столбцов...",
filterBuilderNoMatchingColumns: "Нет подходящих столбцов",
diff --git a/apps/desktop/src/i18n/locales/th.ts b/apps/desktop/src/i18n/locales/th.ts
index f41de28307..558ca178be 100644
--- a/apps/desktop/src/i18n/locales/th.ts
+++ b/apps/desktop/src/i18n/locales/th.ts
@@ -3337,6 +3337,14 @@ export default withEnglishFallback({
truncatedHint: "ผลลัพธ์ถูกตัดหลังโหลด {count} แถว ใช้การแบ่งหน้าที่ส่วนท้ายเพื่อเรียกดูข้อมูลที่โหลด การส่งออกผลลัพธ์เต็มจะเรียกใช้ Query ฐานข้อมูลใหม่",
victoriaMetricsTruncatedHint: "ผลลัพธ์เกินขีดจำกัดการโหลด จึงโหลดเฉพาะ {count} แถวแรก แถวต่อหน้าจะแบ่งเฉพาะข้อมูลที่โหลด ลดช่วงเวลาหรือเพิ่มตัวกรองเพื่อดึงผลลัพธ์ให้ครบ",
cut: "ตัด",
+ filterModeOrderCustom: "จัดเรียงตัวดำเนินการแบบกำหนดเอง…",
+ filterModeOrderTitle: "จัดเรียงตัวดำเนินการแบบกำหนดเอง",
+ filterModeOrderDescription: "ตั้งค่าลำดับการแสดงผลของตัวดำเนินการสำหรับประเภทฐานข้อมูลปัจจุบัน",
+ filterModeOrderDatabase: "ประเภทฐานข้อมูล: {database}",
+ filterModeOrderUnknownDatabase: "ฐานข้อมูลที่ไม่รู้จัก",
+ filterModeOrderMoveUp: "เลื่อนตัวดำเนินการขึ้น",
+ filterModeOrderMoveDown: "เลื่อนตัวดำเนินการลง",
+ filterModeOrderReset: "คืนค่าลำดับเริ่มต้น",
uncommittedBlankRow: "แถวใหม่ที่ยังไม่ได้กรอกจะถูกละเว้นเมื่อบันทึก",
},
exportProgress: {
diff --git a/apps/desktop/src/i18n/locales/zh-CN.ts b/apps/desktop/src/i18n/locales/zh-CN.ts
index bdbc8a13c0..afd712648e 100644
--- a/apps/desktop/src/i18n/locales/zh-CN.ts
+++ b/apps/desktop/src/i18n/locales/zh-CN.ts
@@ -2728,6 +2728,14 @@ export default withEnglishFallback({
filterBuilderEnableRule: "启用条件",
filterBuilderDisableRule: "禁用条件",
filterBuilderReorderRule: "拖拽或使用方向键排序条件",
+ filterModeOrderCustom: "自定义运算符排序…",
+ filterModeOrderTitle: "自定义运算符排序",
+ filterModeOrderDescription: "设置当前数据库类型下运算符的显示顺序。",
+ filterModeOrderDatabase: "数据库类型:{database}",
+ filterModeOrderUnknownDatabase: "未知数据库",
+ filterModeOrderMoveUp: "上移运算符",
+ filterModeOrderMoveDown: "下移运算符",
+ filterModeOrderReset: "恢复默认顺序",
filterBuilderColumn: "字段",
filterBuilderSearchColumns: "搜索字段...",
filterBuilderNoMatchingColumns: "没有匹配的字段",
diff --git a/apps/desktop/src/i18n/locales/zh-TW.ts b/apps/desktop/src/i18n/locales/zh-TW.ts
index 1583c0ceb0..8d99b61259 100644
--- a/apps/desktop/src/i18n/locales/zh-TW.ts
+++ b/apps/desktop/src/i18n/locales/zh-TW.ts
@@ -3032,6 +3032,14 @@ export default withEnglishFallback({
xlsxFilterPrompt: "請選擇匯出的 Excel 是否包含篩選:",
xlsxIncludeAutoFilter: "包含篩選",
cut: "已剪下",
+ filterModeOrderCustom: "自訂運算子排序…",
+ filterModeOrderTitle: "自訂運算子排序",
+ filterModeOrderDescription: "設定目前資料庫類型下運算子的顯示順序。",
+ filterModeOrderDatabase: "資料庫類型:{database}",
+ filterModeOrderUnknownDatabase: "未知資料庫",
+ filterModeOrderMoveUp: "上移運算子",
+ filterModeOrderMoveDown: "下移運算子",
+ filterModeOrderReset: "恢復預設順序",
uncommittedBlankRow: "未填寫的新行,儲存時會被忽略",
},
exportProgress: {
diff --git a/apps/desktop/src/lib/dataGrid/__tests__/dataGridFilterModeOrder.spec.ts b/apps/desktop/src/lib/dataGrid/__tests__/dataGridFilterModeOrder.spec.ts
new file mode 100644
index 0000000000..66f607f04d
--- /dev/null
+++ b/apps/desktop/src/lib/dataGrid/__tests__/dataGridFilterModeOrder.spec.ts
@@ -0,0 +1,43 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { orderDataGridFilterModeOptions, resetDataGridFilterModeOrder, saveDataGridFilterModeOrder } from "@/lib/dataGrid/dataGridFilterModeOrder";
+
+const options = [
+ { value: "equals", labelKey: "grid.filterBuilderEquals" },
+ { value: "like", labelKey: "grid.filterBuilderContains" },
+ { value: "is-null", labelKey: "grid.filterBuilderIsNull" },
+] as const;
+
+describe("data grid filter mode order", () => {
+ const storage = new Map<string, string>();
+
+ beforeEach(() => {
+ storage.clear();
+ vi.stubGlobal("localStorage", {
+ getItem: (key: string) => storage.get(key) ?? null,
+ setItem: (key: string, value: string) => storage.set(key, value),
+ removeItem: (key: string) => storage.delete(key),
+ });
+ vi.restoreAllMocks();
+ });
+
+ it("stores independent orders for each database type", () => {
+ saveDataGridFilterModeOrder("mysql", ["like", "equals", "is-null"]);
+ saveDataGridFilterModeOrder("postgresql", ["is-null", "equals", "like"]);
+
+ expect(orderDataGridFilterModeOptions("mysql", options).map((item) => item.value)).toEqual(["like", "equals", "is-null"]);
+ expect(orderDataGridFilterModeOptions("postgresql", options).map((item) => item.value)).toEqual(["is-null", "equals", "like"]);
+ });
+
+ it("keeps newly added operators at the end and restores the default order", () => {
+ saveDataGridFilterModeOrder("mysql", ["like"]);
+ expect(orderDataGridFilterModeOptions("mysql", options).map((item) => item.value)).toEqual(["like", "equals", "is-null"]);
+
+ resetDataGridFilterModeOrder("mysql");
+ expect(orderDataGridFilterModeOptions("mysql", options).map((item) => item.value)).toEqual(["equals", "like", "is-null"]);
+ });
+
+ it("ignores malformed persisted data", () => {
+ storage.set("dbx-data-grid-filter-mode-order-v1", "not-json");
+ expect(orderDataGridFilterModeOptions("mysql", options).map((item) => item.value)).toEqual(["equals", "like", "is-null"]);
+ });
+});
diff --git a/apps/desktop/src/lib/dataGrid/dataGridFilterModeOrder.ts b/apps/desktop/src/lib/dataGrid/dataGridFilterModeOrder.ts
new file mode 100644
index 0000000000..f6953c58c0
--- /dev/null
+++ b/apps/desktop/src/lib/dataGrid/dataGridFilterModeOrder.ts
@@ -0,0 +1,35 @@
+import { safeLocalStorageGet, safeLocalStorageSet } from "@/lib/backend/safeStorage";
+import type { DataGridContextFilterMode } from "@/lib/dataGrid/dataGridSql";
+
+export type DataGridFilterModeOption = { value: DataGridContextFilterMode; labelKey: string };
+
+const STORAGE_KEY = "dbx-data-grid-filter-mode-order-v1";
+
+function readOrders(): Record<string, DataGridContextFilterMode[]> {
+ try {
+ const parsed = JSON.parse(safeLocalStorageGet(STORAGE_KEY) ?? "{}");
+ if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return {};
+ return Object.fromEntries(Object.entries(parsed).filter(([, value]) => Array.isArray(value) && value.every((item) => typeof item === "string")) as [string, DataGridContextFilterMode[]][]);
+ } catch {
+ return {};
+ }
+}
+
+export function orderDataGridFilterModeOptions(databaseType: string | undefined, options: readonly DataGridFilterModeOption[]): DataGridFilterModeOption[] {
+ const order = readOrders()[databaseType || "unknown"] ?? [];
+ const rank = new Map(order.map((value, index) => [value, index]));
+ return [...options].sort((left, right) => (rank.get(left.value) ?? options.length) - (rank.get(right.value) ?? options.length));
+}
+
+export function saveDataGridFilterModeOrder(databaseType: string | undefined, values: readonly DataGridContextFilterMode[]): void {
+ const key = databaseType || "unknown";
+ const orders = readOrders();
+ orders[key] = [...new Set(values)];
+ safeLocalStorageSet(STORAGE_KEY, JSON.stringify(orders));
+}
+
+export function resetDataGridFilterModeOrder(databaseType: string | undefined): void {
+ const orders = readOrders();
+ delete orders[databaseType || "unknown"];
+ safeLocalStorageSet(STORAGE_KEY, JSON.stringify(orders));
+}