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(settings): use shared select components in SQL formatter settings

ezreald91cc864cfea
diff --git a/apps/desktop/src/components/editor/SqlFormatterSettingsPanel.vue b/apps/desktop/src/components/editor/SqlFormatterSettingsPanel.vue
index d85d5fb1fc..77c5f8e38f 100644
--- a/apps/desktop/src/components/editor/SqlFormatterSettingsPanel.vue
+++ b/apps/desktop/src/components/editor/SqlFormatterSettingsPanel.vue
@@ -813,52 +813,73 @@ onBeforeUnmount(() => {
<p class="text-sm text-muted-foreground">{{ t("settings.sqlFormatterCustomRulesHint") }}</p>
<div v-if="settings.customRulesEnabled" class="grid gap-4">
<div class="grid gap-3 md:grid-cols-3">
- <label class="space-y-1 text-sm"
- >{{ t("settings.sqlFormatterListLayout")
- }}<select class="h-9 w-full rounded-md border bg-background px-2" :value="settings.listLayout" @change="updateOption('listLayout', ($event.target as HTMLSelectElement).value as any)">
- <option v-for="value in ruleEnums.layout" :key="value" :value="value">{{ t(`settings.sqlFormatterRule_${value}`) }}</option>
- </select></label
- >
- <label class="space-y-1 text-sm"
- >{{ t("settings.sqlFormatterSelectListLayout")
- }}<select class="h-9 w-full rounded-md border bg-background px-2" :value="settings.selectListLayout" @change="updateOption('selectListLayout', ($event.target as HTMLSelectElement).value as any)">
- <option v-for="value in ruleEnums.layoutOverride" :key="value" :value="value">{{ t(`settings.sqlFormatterRule_${value}`) }}</option>
- </select></label
- >
- <label class="space-y-1 text-sm"
- >{{ t("settings.sqlFormatterInsertListLayout")
- }}<select class="h-9 w-full rounded-md border bg-background px-2" :value="settings.insertListLayout" @change="updateOption('insertListLayout', ($event.target as HTMLSelectElement).value as any)">
- <option v-for="value in ruleEnums.layoutOverride" :key="value" :value="value">{{ t(`settings.sqlFormatterRule_${value}`) }}</option>
- </select></label
- >
- <label class="space-y-1 text-sm"
- >{{ t("settings.sqlFormatterUpdateListLayout")
- }}<select class="h-9 w-full rounded-md border bg-background px-2" :value="settings.updateListLayout" @change="updateOption('updateListLayout', ($event.target as HTMLSelectElement).value as any)">
- <option v-for="value in ruleEnums.layoutOverride" :key="value" :value="value">{{ t(`settings.sqlFormatterRule_${value}`) }}</option>
- </select></label
- >
- <label class="space-y-1 text-sm"
- >{{ t("settings.sqlFormatterListItemAlignment")
- }}<select class="h-9 w-full rounded-md border bg-background px-2" :value="settings.listItemAlignment" @change="updateOption('listItemAlignment', ($event.target as HTMLSelectElement).value as any)">
- <option v-for="value in ruleEnums.alignment" :key="value" :value="value">{{ t(`settings.sqlFormatterRule_${value}`) }}</option>
- </select></label
- >
- <label class="space-y-1 text-sm"
- >{{ t("settings.sqlFormatterEmptyLineMode")
- }}<select class="h-9 w-full rounded-md border bg-background px-2" :value="settings.emptyLineMode" @change="updateOption('emptyLineMode', ($event.target as HTMLSelectElement).value as any)">
- <option v-for="value in ruleEnums.empty" :key="value" :value="value">{{ t(`settings.sqlFormatterRule_${value}`) }}</option>
- </select></label
- >
+ <div class="space-y-1">
+ <Label for="sql-formatter-list-layout">{{ t("settings.sqlFormatterListLayout") }}</Label>
+ <Select :model-value="settings.listLayout" @update:model-value="(value) => updateOption('listLayout', value as SqlFormatterSettings['listLayout'])">
+ <SelectTrigger id="sql-formatter-list-layout" class="w-full"><SelectValue /></SelectTrigger>
+ <SelectContent>
+ <SelectItem v-for="value in ruleEnums.layout" :key="value" :value="value">{{ t(`settings.sqlFormatterRule_${value}`) }}</SelectItem>
+ </SelectContent>
+ </Select>
+ </div>
+ <div class="space-y-1">
+ <Label for="sql-formatter-select-list-layout">{{ t("settings.sqlFormatterSelectListLayout") }}</Label>
+ <Select :model-value="settings.selectListLayout" @update:model-value="(value) => updateOption('selectListLayout', value as SqlFormatterSettings['selectListLayout'])">
+ <SelectTrigger id="sql-formatter-select-list-layout" class="w-full"><SelectValue /></SelectTrigger>
+ <SelectContent>
+ <SelectItem v-for="value in ruleEnums.layoutOverride" :key="value" :value="value">{{ t(`settings.sqlFormatterRule_${value}`) }}</SelectItem>
+ </SelectContent>
+ </Select>
+ </div>
+ <div class="space-y-1">
+ <Label for="sql-formatter-insert-list-layout">{{ t("settings.sqlFormatterInsertListLayout") }}</Label>
+ <Select :model-value="settings.insertListLayout" @update:model-value="(value) => updateOption('insertListLayout', value as SqlFormatterSettings['insertListLayout'])">
+ <SelectTrigger id="sql-formatter-insert-list-layout" class="w-full"><SelectValue /></SelectTrigger>
+ <SelectContent>
+ <SelectItem v-for="value in ruleEnums.layoutOverride" :key="value" :value="value">{{ t(`settings.sqlFormatterRule_${value}`) }}</SelectItem>
+ </SelectContent>
+ </Select>
+ </div>
+ <div class="space-y-1">
+ <Label for="sql-formatter-update-list-layout">{{ t("settings.sqlFormatterUpdateListLayout") }}</Label>
+ <Select :model-value="settings.updateListLayout" @update:model-value="(value) => updateOption('updateListLayout', value as SqlFormatterSettings['updateListLayout'])">
+ <SelectTrigger id="sql-formatter-update-list-layout" class="w-full"><SelectValue /></SelectTrigger>
+ <SelectContent>
+ <SelectItem v-for="value in ruleEnums.layoutOverride" :key="value" :value="value">{{ t(`settings.sqlFormatterRule_${value}`) }}</SelectItem>
+ </SelectContent>
+ </Select>
+ </div>
+ <div class="space-y-1">
+ <Label for="sql-formatter-list-item-alignment">{{ t("settings.sqlFormatterListItemAlignment") }}</Label>
+ <Select :model-value="settings.listItemAlignment" @update:model-value="(value) => updateOption('listItemAlignment', value as SqlFormatterSettings['listItemAlignment'])">
+ <SelectTrigger id="sql-formatter-list-item-alignment" class="w-full"><SelectValue /></SelectTrigger>
+ <SelectContent>
+ <SelectItem v-for="value in ruleEnums.alignment" :key="value" :value="value">{{ t(`settings.sqlFormatterRule_${value}`) }}</SelectItem>
+ </SelectContent>
+ </Select>
+ </div>
+ <div class="space-y-1">
+ <Label for="sql-formatter-empty-line-mode">{{ t("settings.sqlFormatterEmptyLineMode") }}</Label>
+ <Select :model-value="settings.emptyLineMode" @update:model-value="(value) => updateOption('emptyLineMode', value as SqlFormatterSettings['emptyLineMode'])">
+ <SelectTrigger id="sql-formatter-empty-line-mode" class="w-full"><SelectValue /></SelectTrigger>
+ <SelectContent>
+ <SelectItem v-for="value in ruleEnums.empty" :key="value" :value="value">{{ t(`settings.sqlFormatterRule_${value}`) }}</SelectItem>
+ </SelectContent>
+ </Select>
+ </div>
</div>
<details class="space-y-3">
<summary class="cursor-pointer text-sm font-medium">{{ t("settings.sqlFormatterDmlRules") }}</summary>
<div class="grid gap-3 pt-2 md:grid-cols-3">
- <label v-for="{ key, titleKey } in dmlCommaRules" :key="key" class="space-y-1 text-sm"
- >{{ t(`settings.${titleKey}`)
- }}<select class="h-9 w-full rounded-md border bg-background px-2" :value="settings[key]" @change="updateOption(key, ($event.target as HTMLSelectElement).value as any)">
- <option v-for="option in dmlCommaPositionOptions" :key="option.value" :value="option.value">{{ t(option.labelKey) }}</option>
- </select></label
- >
+ <div v-for="{ key, titleKey } in dmlCommaRules" :key="key" class="space-y-1">
+ <Label :for="`sql-formatter-${key}`">{{ t(`settings.${titleKey}`) }}</Label>
+ <Select :model-value="settings[key]" @update:model-value="(value) => updateOption(key, value as SqlFormatterSettings['selectCommaPosition'])">
+ <SelectTrigger :id="`sql-formatter-${key}`" class="w-full"><SelectValue /></SelectTrigger>
+ <SelectContent>
+ <SelectItem v-for="option in dmlCommaPositionOptions" :key="option.value" :value="option.value">{{ t(option.labelKey) }}</SelectItem>
+ </SelectContent>
+ </Select>
+ </div>
<div v-for="{ key, titleKey } in dmlToggleRules" :key="key" class="flex items-center justify-between gap-3 rounded border px-3 py-2">
<Label :for="`sql-formatter-${key}`">{{ t(`settings.${titleKey}`) }}</Label
><Switch :id="`sql-formatter-${key}`" :model-value="settings[key]" @update:model-value="(value: boolean) => updateOption(key, value as any)" />
@@ -868,12 +889,15 @@ onBeforeUnmount(() => {
<details class="space-y-3">
<summary class="cursor-pointer text-sm font-medium">{{ t("settings.sqlFormatterConditionRules") }}</summary>
<div class="grid gap-3 pt-2 md:grid-cols-2">
- <label v-for="{ key, titleKey } in conditionRules" :key="key" class="space-y-1 text-sm"
- >{{ t(`settings.${titleKey}`)
- }}<select class="h-9 w-full rounded-md border bg-background px-2" :value="settings[key]" @change="updateOption(key, ($event.target as HTMLSelectElement).value as any)">
- <option v-for="value in ruleEnums.logical" :key="value" :value="value">{{ t(`settings.sqlFormatterRule_${value}`) }}</option>
- </select></label
- >
+ <div v-for="{ key, titleKey } in conditionRules" :key="key" class="space-y-1">
+ <Label :for="`sql-formatter-${key}`">{{ t(`settings.${titleKey}`) }}</Label>
+ <Select :model-value="settings[key]" @update:model-value="(value) => updateOption(key, value as SqlFormatterSettings['whereLogicalOperatorNewline'])">
+ <SelectTrigger :id="`sql-formatter-${key}`" class="w-full"><SelectValue /></SelectTrigger>
+ <SelectContent>
+ <SelectItem v-for="value in ruleEnums.logical" :key="value" :value="value">{{ t(`settings.sqlFormatterRule_${value}`) }}</SelectItem>
+ </SelectContent>
+ </Select>
+ </div>
<div class="flex items-center justify-between gap-3 rounded border px-3 py-2">
<Label for="sql-formatter-newline-before-join-on">{{ t("settings.sqlFormatterNewlineBeforeJoinOn") }}</Label
><Switch id="sql-formatter-newline-before-join-on" :model-value="settings.newlineBeforeJoinOn" @update:model-value="(value: boolean) => updateOption('newlineBeforeJoinOn', value)" />
@@ -882,17 +906,20 @@ onBeforeUnmount(() => {
</details>
</div>
<div class="space-y-3 border-t pt-3">
- <div class="flex items-center justify-between">
+ <div class="flex flex-wrap items-center justify-between gap-3">
<h3 class="text-sm font-medium">{{ t("settings.sqlFormatterPreview") }}</h3>
- <label class="text-sm"
- >{{ t("settings.sqlFormatterPreviewDialect") }}
- <select v-model="previewDialect" class="h-8 rounded border bg-background px-2">
- <option value="oracle">Oracle</option>
- <option value="postgres">PostgreSQL</option>
- <option value="mysql">MySQL</option>
- <option value="sqlserver">SQL Server</option>
- </select></label
- >
+ <div class="flex items-center gap-2">
+ <Label for="sql-formatter-preview-dialect" class="whitespace-nowrap">{{ t("settings.sqlFormatterPreviewDialect") }}</Label>
+ <Select v-model="previewDialect">
+ <SelectTrigger id="sql-formatter-preview-dialect" class="w-36"><SelectValue /></SelectTrigger>
+ <SelectContent>
+ <SelectItem value="oracle">Oracle</SelectItem>
+ <SelectItem value="postgres">PostgreSQL</SelectItem>
+ <SelectItem value="mysql">MySQL</SelectItem>
+ <SelectItem value="sqlserver">SQL Server</SelectItem>
+ </SelectContent>
+ </Select>
+ </div>
</div>
<textarea v-model="previewSql" :aria-label="t('settings.sqlFormatterPreviewSource')" class="min-h-28 w-full resize-y rounded-md border bg-background p-3 font-mono text-sm" spellcheck="false" />
<p v-if="previewError" role="alert" class="text-sm text-destructive">{{ t("settings.sqlFormatterPreviewFailed", { message: previewError }) }}</p>
diff --git a/apps/desktop/src/components/editor/__tests__/SqlFormatterSettingsPanel.spec.ts b/apps/desktop/src/components/editor/__tests__/SqlFormatterSettingsPanel.spec.ts
index 244bbb58db..94b452ac20 100644
--- a/apps/desktop/src/components/editor/__tests__/SqlFormatterSettingsPanel.spec.ts
+++ b/apps/desktop/src/components/editor/__tests__/SqlFormatterSettingsPanel.spec.ts
@@ -1,6 +1,6 @@
// @vitest-environment happy-dom
-import { createApp, defineComponent, h, nextTick, type App } from "vue";
+import { createApp, defineComponent, h, nextTick, ref, type App } from "vue";
import { afterEach, describe, expect, it, vi } from "vitest";
import { DEFAULT_SQL_FORMATTER_SETTINGS, serializeSqlFormatterConfig } from "@/lib/sql/sqlFormatterConfig";
import { formatSqlText } from "@/lib/sql/sqlFormatter";
@@ -22,8 +22,8 @@ vi.mock("@/components/ui/select", async () => {
const Select = defineComponent({
props: { modelValue: { type: [String, Number], default: "" } },
emits: ["update:modelValue"],
- setup(_props, { emit, slots }) {
- return () => h("div", { onPick: (event: CustomEvent<{ value: string }>) => emit("update:modelValue", event.detail.value) }, [slots.default?.()]);
+ setup(props, { emit, slots }) {
+ return () => h("div", { "data-stub": "Select", "data-model-value": props.modelValue, onPick: (event: CustomEvent<{ value: string }>) => emit("update:modelValue", event.detail.value) }, [slots.default?.()]);
},
});
return { Select, SelectContent: createPassthroughStub("SelectContent"), SelectItem: createPassthroughStub("SelectItem", "button"), SelectTrigger: createPassthroughStub("SelectTrigger", "button"), SelectValue: createPassthroughStub("SelectValue", "span") };
@@ -68,13 +68,35 @@ describe("SQL formatter settings panel rules and preview", () => {
function mountPanel(value = DEFAULT_SQL_FORMATTER_SETTINGS) {
const update = vi.fn();
+ const current = ref(value);
host = document.createElement("div");
document.body.append(host);
- app = createApp(SqlFormatterSettingsPanel, { modelValue: value, "onUpdate:modelValue": update });
+ app = createApp({
+ setup: () => () =>
+ h(SqlFormatterSettingsPanel, {
+ modelValue: current.value,
+ "onUpdate:modelValue": (settings) => {
+ current.value = settings;
+ update(settings);
+ },
+ }),
+ });
app.mount(host);
return { root: host, update };
}
+ function selectForLabel(root: HTMLElement, labelKey: string): HTMLElement {
+ const label = Array.from(root.querySelectorAll("label")).find((item) => item.textContent?.trim() === labelKey);
+ expect(label?.htmlFor).toBeTruthy();
+ const select = root.querySelector(`#${label!.htmlFor}`)?.closest<HTMLElement>('[data-stub="Select"]');
+ expect(select).toBeTruthy();
+ return select!;
+ }
+
+ function pick(select: HTMLElement, value: string) {
+ select.dispatchEvent(new CustomEvent("pick", { detail: { value } }));
+ }
+
afterEach(() => {
vi.useRealTimers();
app?.unmount();
@@ -86,27 +108,22 @@ describe("SQL formatter settings panel rules and preview", () => {
it("emits real rule values and keeps them when the feature is switched off", async () => {
const current = { ...DEFAULT_SQL_FORMATTER_SETTINGS, selectListLayout: "wrap" as const, customRulesEnabled: true };
const { root, update } = mountPanel(current);
- const selectLayout = Array.from(root.querySelectorAll("label"))
- .find((label) => label.textContent?.includes("settings.sqlFormatterSelectListLayout"))
- ?.querySelector("select");
- expect(selectLayout).not.toBeNull();
- selectLayout!.value = "fit";
- selectLayout!.dispatchEvent(new Event("change", { bubbles: true }));
+ const selectLayout = selectForLabel(root, "settings.sqlFormatterSelectListLayout");
+ pick(selectLayout, "fit");
+ await nextTick();
expect(update).toHaveBeenLastCalledWith({ ...current, selectListLayout: "fit" });
+ expect(selectLayout.dataset.modelValue).toBe("fit");
const enabled = root.querySelector<HTMLInputElement>("#sql-formatter-custom-rules")!;
enabled.checked = false;
enabled.dispatchEvent(new Event("change", { bubbles: true }));
- expect(update).toHaveBeenLastCalledWith({ ...current, customRulesEnabled: false });
- expect(selectLayout!.value).toBe("fit");
+ expect(update).toHaveBeenLastCalledWith({ ...current, selectListLayout: "fit", customRulesEnabled: false });
});
it("labels DML comma positions as comma placement and associates the width label", () => {
const { root } = mountPanel({ ...DEFAULT_SQL_FORMATTER_SETTINGS, customRulesEnabled: true });
- const commaSelect = Array.from(root.querySelectorAll("label"))
- .find((label) => label.textContent?.includes("settings.sqlFormatterSelectCommaPosition"))
- ?.querySelector("select");
- expect(Array.from(commaSelect!.options).map((option) => [option.value, option.textContent])).toEqual([
+ const commaSelect = selectForLabel(root, "settings.sqlFormatterSelectCommaPosition");
+ expect(Array.from(commaSelect.querySelectorAll('[data-stub="SelectItem"]')).map((option) => [option.getAttribute("value"), option.textContent])).toEqual([
["inherit", "settings.sqlFormatterRule_inherit"],
["after", "settings.sqlFormatterCommaPositionAfter"],
["before", "settings.sqlFormatterCommaPositionBefore"],
@@ -179,19 +196,19 @@ describe("SQL formatter settings panel rules and preview", () => {
vi.useFakeTimers();
const { root } = mountPanel({ ...DEFAULT_SQL_FORMATTER_SETTINGS, customRulesEnabled: true, selectListLayout: "vertical" });
const source = root.querySelector<HTMLTextAreaElement>('textarea[aria-label="settings.sqlFormatterPreviewSource"]')!;
- const dialect = Array.from(root.querySelectorAll("select")).find((select) => Array.from(select.options).some((option) => option.value === "postgres"))!;
+ const dialect = selectForLabel(root, "settings.sqlFormatterPreviewDialect");
source.value = "BEGIN\n UPDATE users SET name = 'Ada' WHERE id = 1;\nEND;";
source.dispatchEvent(new Event("input", { bubbles: true }));
await vi.advanceTimersByTimeAsync(200);
await nextTick();
expect(root.querySelector('[role="status"]')?.textContent).toContain("settings.sqlFormatterFallbackNotice");
- dialect.value = "postgres";
- dialect.dispatchEvent(new Event("change", { bubbles: true }));
- source.value = "SELECT id, name FROM users;";
+ pick(dialect, "postgres");
+ source.value = "SELECT payload->>'name' FROM users;";
source.dispatchEvent(new Event("input", { bubbles: true }));
await vi.advanceTimersByTimeAsync(200);
await nextTick();
+ expect(dialect.dataset.modelValue).toBe("postgres");
const expected = await formatSqlText(source.value, "postgres", { ...DEFAULT_SQL_FORMATTER_SETTINGS, customRulesEnabled: true, selectListLayout: "vertical" });
expect(root.querySelector("pre")?.textContent).toBe(expected);
expect(root.querySelector('[role="status"]')).toBeNull();