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。

fix(grid): improve filter rule actions

t8y22b38509768af
diff --git a/apps/desktop/src/components/grid/DataGridFilterBuilder.vue b/apps/desktop/src/components/grid/DataGridFilterBuilder.vue
index 63f31f6d5b..f4251118c0 100644
--- a/apps/desktop/src/components/grid/DataGridFilterBuilder.vue
+++ b/apps/desktop/src/components/grid/DataGridFilterBuilder.vue
@@ -3,6 +3,7 @@ import { computed, nextTick, onBeforeUnmount, ref, watch } from "vue";
import { Check, Eye, EyeOff, Focus, GripVertical, Plus, Search, Trash2, X } from "@lucide/vue";
import { useI18n } from "vue-i18n";
import { Button } from "@/components/ui/button";
+import LightTooltip from "@/components/ui/LightTooltip.vue";
import { Input } from "@/components/ui/input";
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
import { filterModeNeedsValue, filterModeUsesList, filterModeUsesRange } from "@/lib/dataGrid/dataGridColumnFilter";
@@ -710,16 +711,25 @@ function blurValueRule(id: string) {
{{ t("grid.filterBuilderValueShortcutHint") }}
</div>
<div class="flex items-center gap-0.5" :class="props.layout === 'text' ? 'col-start-6 row-start-1' : usesExpandedLayout(rule.mode) ? 'col-start-5 row-start-1 row-span-2' : 'col-start-5 row-start-1'">
- <Button v-if="props.showApplyOnly" variant="ghost" size="icon" class="h-7 w-7" :disabled="props.disabled || props.applyOnlyBusy" :title="t('grid.filterBuilderApplyOnly')" :aria-label="t('grid.filterBuilderApplyOnly')" @click="emit('applyOnly', rule.id)"
- ><Focus class="h-3.5 w-3.5" />
- </Button>
+ <LightTooltip v-if="props.showApplyOnly" :text="t('grid.filterBuilderApplyOnly')" side="top" :side-offset="4">
+ <Button variant="ghost" size="icon" class="h-7 w-7" :disabled="props.disabled || props.applyOnlyBusy" :aria-label="t('grid.filterBuilderApplyOnly')" @click="emit('applyOnly', rule.id)">
+ <Focus class="h-3.5 w-3.5" />
+ </Button>
+ </LightTooltip>
<template v-if="props.layout === 'text'">
<Button variant="ghost" size="icon" class="h-6 w-6" :aria-label="t('grid.filterBuilderAddRule')" @click="emit('add')"><Plus class="h-3.5 w-3.5" /></Button>
- <Button variant="ghost" size="icon" class="h-6 w-6" :disabled="props.rules.length === 1" @click="emit('remove', rule.id)"><X class="h-3.5 w-3.5" /></Button>
+ <Button variant="ghost" size="icon" class="h-6 w-6" :disabled="props.disabled" :aria-label="t('common.remove')" @click="emit('remove', rule.id)"><X class="h-3.5 w-3.5" /></Button>
</template>
<template v-else>
- <Button variant="ghost" size="icon" class="h-7 w-7" @click="emit('updateRule', rule.id, { disabled: !rule.disabled })"><EyeOff v-if="rule.disabled" class="h-3.5 w-3.5" /><Eye v-else class="h-3.5 w-3.5" /></Button>
- <Button variant="ghost" size="icon" class="h-7 w-7" :disabled="props.rules.length === 1" @click="emit('remove', rule.id)"><X class="h-3.5 w-3.5" /></Button>
+ <LightTooltip :text="t(rule.disabled ? 'grid.filterBuilderEnableRule' : 'grid.filterBuilderDisableRule')" side="top" :side-offset="4">
+ <Button variant="ghost" size="icon" class="h-7 w-7" :disabled="props.disabled" :aria-label="t(rule.disabled ? 'grid.filterBuilderEnableRule' : 'grid.filterBuilderDisableRule')" @click="emit('updateRule', rule.id, { disabled: !rule.disabled })">
+ <EyeOff v-if="rule.disabled" class="h-3.5 w-3.5" />
+ <Eye v-else class="h-3.5 w-3.5" />
+ </Button>
+ </LightTooltip>
+ <LightTooltip :text="t('common.remove')" side="top" :side-offset="4">
+ <Button variant="ghost" size="icon" class="h-7 w-7" :disabled="props.disabled" :aria-label="t('common.remove')" @click="emit('remove', rule.id)"><X class="h-3.5 w-3.5" /></Button>
+ </LightTooltip>
</template>
</div>
</div>
diff --git a/apps/desktop/src/components/grid/__tests__/DataGridSurfaces.spec.ts b/apps/desktop/src/components/grid/__tests__/DataGridSurfaces.spec.ts
index c538c05e8c..5d22c6a2c4 100644
--- a/apps/desktop/src/components/grid/__tests__/DataGridSurfaces.spec.ts
+++ b/apps/desktop/src/components/grid/__tests__/DataGridSurfaces.spec.ts
@@ -621,6 +621,41 @@ describe("DataGridFilterBuilder", () => {
expect(buttons()[0].props.disabled).toBe(true);
});
+ it("labels panel rule actions and allows removing the final rule", async () => {
+ const updateRule = vi.fn();
+ const remove = vi.fn();
+ const mounted = mountComponent(DataGridFilterBuilder, {
+ rules: [{ id: "r1", columnName: "id", mode: "equals", rawValue: "7", rawEndValue: "", conjunction: "AND" }],
+ columns: ["id"],
+ filteredColumns: ["id"],
+ modeOptions: [{ value: "equals", labelKey: "equals" }],
+ columnSearch: "",
+ layout: "panel",
+ showApplyOnly: true,
+ onUpdateRule: updateRule,
+ onRemove: remove,
+ });
+
+ const tooltips = () => findAll(mounted.root, (node) => node.props["data-stub"] === "LightTooltip");
+ const tooltipTexts = () => tooltips().map((node) => node.props.text);
+ const applyOnlyButton = findOne(mounted.root, (node) => node.props["aria-label"] === "grid.filterBuilderApplyOnly");
+ const toggleButton = findOne(mounted.root, (node) => node.props["aria-label"] === "grid.filterBuilderDisableRule");
+ const removeButton = findOne(mounted.root, (node) => node.props["aria-label"] === "common.remove");
+
+ expect(tooltipTexts()).toEqual(["grid.filterBuilderApplyOnly", "grid.filterBuilderDisableRule", "common.remove"]);
+ expect(tooltips().every((tooltip) => tooltip.props.side === "top")).toBe(true);
+ expect(removeButton.props.disabled).toBeFalsy();
+ dispatch(toggleButton, "click");
+ dispatch(removeButton, "click");
+ expect(updateRule).toHaveBeenCalledWith("r1", { disabled: true });
+ expect(remove).toHaveBeenCalledWith("r1");
+
+ await mounted.setProps({ rules: [{ id: "r1", columnName: "id", mode: "equals", rawValue: "7", rawEndValue: "", conjunction: "AND", disabled: true }] });
+ expect(findOne(mounted.root, (node) => node.props["aria-label"] === "grid.filterBuilderEnableRule")).toBeTruthy();
+ expect(tooltipTexts()).toEqual(["grid.filterBuilderApplyOnly", "grid.filterBuilderEnableRule", "common.remove"]);
+ expect(applyOnlyButton.props["aria-label"]).toBe("grid.filterBuilderApplyOnly");
+ });
+
it("renders a compact text rule without framed form controls", async () => {
const updateRule = vi.fn();
const add = vi.fn();
diff --git a/apps/desktop/src/composables/__tests__/useDataGridFilterBuilder.spec.ts b/apps/desktop/src/composables/__tests__/useDataGridFilterBuilder.spec.ts
index 1895852b6c..9273294fde 100644
--- a/apps/desktop/src/composables/__tests__/useDataGridFilterBuilder.spec.ts
+++ b/apps/desktop/src/composables/__tests__/useDataGridFilterBuilder.spec.ts
@@ -27,6 +27,17 @@ describe("useDataGridFilterBuilder", () => {
expect(builder.rules.value[0]?.columnName).toBe("");
});
+ it("adds one rule after the final rule is removed", () => {
+ let nextId = 0;
+ const builder = useDataGridFilterBuilder({ columns: ["id"], createId: () => `rule-${++nextId}`, isComplete: () => true, buildCondition: async () => "" });
+
+ builder.ensureRule();
+ builder.removeRule("rule-1");
+ builder.addRule();
+
+ expect(builder.rules.value.map((rule) => rule.id)).toEqual(["rule-2"]);
+ });
+
it("skips disabled rules and applies conjunctions", async () => {
let nextId = 0;
const builder = useDataGridFilterBuilder({
diff --git a/apps/desktop/src/composables/useDataGridFilterBuilder.ts b/apps/desktop/src/composables/useDataGridFilterBuilder.ts
index 8221b15d63..573fdcebff 100644
--- a/apps/desktop/src/composables/useDataGridFilterBuilder.ts
+++ b/apps/desktop/src/composables/useDataGridFilterBuilder.ts
@@ -87,7 +87,6 @@ export function useDataGridFilterBuilder(options: UseDataGridFilterBuilderOption
if (!rules.value.length && toValue(options.columns).length) rules.value = [defaultRule()];
}
function addRule() {
- ensureRule();
rules.value = [...rules.value, defaultRule()];
}
function removeRule(id: string) {