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。
TypeScript aicliclickhousedatabasedatabase-clientdatabase-managementdockerguimcpmongodbmysqlpostgresqlredisrustsql-serversqlitetaurivue
fix(mqtt): 保留已填写的发布 Topic (#11842)
_Mr丶s ゛😁®70c0e563f3c1
diff --git a/apps/desktop/src/components/mqtt/MqttAdminConsole.vue b/apps/desktop/src/components/mqtt/MqttAdminConsole.vueindex 3970afd485..9d46880d4c 100644--- a/apps/desktop/src/components/mqtt/MqttAdminConsole.vue+++ b/apps/desktop/src/components/mqtt/MqttAdminConsole.vue@@ -62,6 +62,8 @@ const messages = ref<MqttMessage[]>([]);const collapsedMessageKeys = ref<Set<string>>(new Set());const noLocalSubscribe = ref(false);const selectedTopic = ref<string>(restoredUiState.selectedTopic ?? props.initialTopic ?? "");+const publishInitialTopic = ref(selectedTopic.value);+const publishTopic = ref(selectedTopic.value);const loading = ref(true);const error = ref<string | null>(null);const pollingIntervalMs = ref<number>(MQTT_POLLING_INTERVAL_OPTIONS.some((opt) => opt.value === restoredUiState.pollingIntervalMs) ? restoredUiState.pollingIntervalMs! : DEFAULT_MQTT_POLLING_INTERVAL_MS);@@ -118,6 +120,12 @@ trackUiState(() => ({pollingIntervalMs: pollingIntervalMs.value,}));+function suggestPublishTopic(topic: string, force = false) {+ if (!force && publishTopic.value.length > 0) return;+ publishTopic.value = topic;+ publishInitialTopic.value = topic;+}+const connected = computed(() => brokerInfo.value?.connected ?? false);const mqtt5 = computed(() => brokerInfo.value?.protocolVersion?.includes("5") ?? false);@@ -213,6 +221,7 @@ async function handleSubscribe(topic: string, qos: MqttQoS = "atmostonce", noLoctry {await mqttSubscribe(props.connectionId, topic, qos, noLocal);selectedTopic.value = topic;+ suggestPublishTopic(topic);await refreshData();} catch (e) {error.value = String(e);@@ -238,7 +247,10 @@ async function handleDelete(config: MqttSavedTopic) {try {if (subscribedTopics.value.some(([topic]) => topic === config.topic)) await mqttUnsubscribe(props.connectionId, config.topic);await mqttDeleteTopicConfig(props.connectionId, config.topic);- if (selectedTopic.value === config.topic) selectedTopic.value = "";+ if (selectedTopic.value === config.topic) {+ selectedTopic.value = "";+ suggestPublishTopic("");+ }await refreshData();} catch (e) {error.value = String(e);@@ -357,6 +369,7 @@ async function saveSubscription() {if (topicChanged && previousWasActive && previousTopic) await mqttUnsubscribe(props.connectionId, previousTopic);if (topicChanged && previousTopic) await mqttDeleteTopicConfig(props.connectionId, previousTopic);selectedTopic.value = topic;+ suggestPublishTopic(topic);showSubscriptionDialog.value = false;await refreshData();} catch (e) {@@ -369,6 +382,7 @@ async function saveSubscription() {function handleTopicClick(topic: string) {selectedTopic.value = topic;+ suggestPublishTopic(topic, true);void refreshData();}@@ -504,6 +518,7 @@ watch((topic) => {if (topic !== undefined && topic !== selectedTopic.value) {selectedTopic.value = topic;+ suggestPublishTopic(topic, true);void refreshData();}},@@ -717,7 +732,7 @@ onUnmounted(stopPolling);</div></CustomContextMenu></div>- <MqttPublishPanel v-if="connected" v-show="!publishPanelCollapsed" :connection-id="connectionId" :initial-topic="selectedTopic" @published="handleMessagePublished" />+ <MqttPublishPanel v-if="connected" v-show="!publishPanelCollapsed" :connection-id="connectionId" :initial-topic="publishInitialTopic" @topic-changed="publishTopic = $event" @published="handleMessagePublished" /></div></div>diff --git a/apps/desktop/src/components/mqtt/MqttPublishDialog.vue b/apps/desktop/src/components/mqtt/MqttPublishDialog.vueindex a9e1c1e8ce..7e7413f780 100644--- a/apps/desktop/src/components/mqtt/MqttPublishDialog.vue+++ b/apps/desktop/src/components/mqtt/MqttPublishDialog.vue@@ -13,10 +13,12 @@ interface Props {const props = defineProps<Props>();const emit = defineEmits<{published: [];+ "topic-changed": [topic: string];}>();const { t } = useI18n();const topic = ref(props.initialTopic || "");+watch(topic, (value) => emit("topic-changed", value));const qos = ref<0 | 1 | 2>(0);const retain = ref(false);const payloadText = ref("");diff --git a/apps/desktop/src/components/mqtt/__tests__/MqttAdminConsolePublishTopic.spec.ts b/apps/desktop/src/components/mqtt/__tests__/MqttAdminConsolePublishTopic.spec.tsnew file mode 100644index 0000000000..3a10f0fdcc--- /dev/null+++ b/apps/desktop/src/components/mqtt/__tests__/MqttAdminConsolePublishTopic.spec.ts@@ -0,0 +1,150 @@+// @vitest-environment happy-dom++import { createApp, nextTick, type App } from "vue";+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";+import i18n, { loadLocaleMessages } from "@/i18n";+import MqttAdminConsole from "@/components/mqtt/MqttAdminConsole.vue";+import type { MqttBrokerInfo } from "@/types/mqtt";++const { mqttListSavedTopicConfigsMock, mqttGetMessagesMock } = vi.hoisted(() => ({+ mqttListSavedTopicConfigsMock: vi.fn(),+ mqttGetMessagesMock: vi.fn(),+}));++vi.mock("@/lib/backend/api", () => ({+ mqttGetBrokerInfo: vi.fn(+ async (): Promise<MqttBrokerInfo> => ({+ brokerUrl: "mqtt://localhost:1883",+ clientId: "dbx-test",+ connected: true,+ protocolVersion: "5.0",+ subscriptionCount: 1,+ }),+ ),+ mqttListTopics: vi.fn(async () => [["device/status", "atmostonce"]]),+ mqttListSavedTopicConfigs: mqttListSavedTopicConfigsMock,+ mqttGetMessages: mqttGetMessagesMock,+ mqttSubscribe: vi.fn(),+ mqttUnsubscribe: vi.fn(),+ mqttSaveTopicConfig: vi.fn(),+ mqttDeleteTopicConfig: vi.fn(),+ mqttClearMessages: vi.fn(),+}));++const mountedApps: App[] = [];++async function settleConsole() {+ await Promise.resolve();+ await Promise.resolve();+ await Promise.resolve();+ await nextTick();+}++async function mountConsole(initialTopic = "device/status") {+ const container = document.createElement("div");+ document.body.append(container);+ const app = createApp(MqttAdminConsole, {+ connectionId: "mqtt-connection-1",+ initialTopic,+ });+ mountedApps.push(app);+ app.use(i18n);+ app.mount(container);+ await settleConsole();+ return container;+}++function publishTopicInput(container: HTMLElement): HTMLInputElement {+ const input = container.querySelector<HTMLInputElement>(".publish-panel input");+ expect(input).not.toBeNull();+ return input!;+}++async function setInputValue(input: HTMLInputElement, value: string) {+ input.value = value;+ input.dispatchEvent(new Event("input", { bubbles: true }));+ await settleConsole();+}++async function openNewSubscription(container: HTMLElement) {+ const button = Array.from(container.querySelectorAll("button")).find((candidate) => candidate.textContent?.includes("新建订阅"));+ expect(button).toBeTruthy();+ button!.dispatchEvent(new MouseEvent("click", { bubbles: true }));+ await settleConsole();+}++async function openExistingSubscription(container: HTMLElement) {+ const editTitle = i18n.global.t("connection.mqttSubscriptionEdit");+ const button = Array.from(container.querySelectorAll<HTMLButtonElement>("button[title]")).find((candidate) => candidate.title === editTitle);+ expect(button).toBeTruthy();+ button!.dispatchEvent(new MouseEvent("click", { bubbles: true }));+ await settleConsole();+}++function subscriptionTopicInput(): HTMLInputElement {+ const dialog = document.querySelector<HTMLElement>('[role="dialog"]');+ expect(dialog).not.toBeNull();+ const input = dialog!.querySelector<HTMLInputElement>('input:not([type="checkbox"])');+ expect(input).not.toBeNull();+ return input!;+}++async function saveSubscription() {+ const saveText = i18n.global.t("common.save");+ const button = Array.from(document.querySelectorAll<HTMLButtonElement>('[role="dialog"] button')).find((candidate) => candidate.textContent?.trim() === saveText);+ expect(button).toBeTruthy();+ button!.dispatchEvent(new MouseEvent("click", { bubbles: true }));+ await settleConsole();+ await settleConsole();+}++beforeEach(async () => {+ mqttListSavedTopicConfigsMock.mockReset().mockResolvedValue([{ topic: "device/status", qos: "atmostonce", enabled: true, noLocal: false }]);+ mqttGetMessagesMock.mockReset().mockResolvedValue([]);+ await loadLocaleMessages("zh-CN");+ i18n.global.locale.value = "zh-CN";+ vi.useFakeTimers();+});++afterEach(() => {+ vi.useRealTimers();+ for (const app of mountedApps.splice(0)) app.unmount();+ document.body.innerHTML = "";+});++describe("MQTT 订阅编辑不覆盖发布 Topic (issue #11830)", () => {+ it("编辑订阅时保留发布框里已有的 Topic", async () => {+ const container = await mountConsole();+ const publishInput = publishTopicInput(container);+ await setInputValue(publishInput, "manual/publish/topic");++ await openExistingSubscription(container);+ await setInputValue(subscriptionTopicInput(), "device/updated");+ await saveSubscription();++ expect(publishTopicInput(container).value).toBe("manual/publish/topic");+ });++ it("新增订阅时保留发布框里已有的 Topic", async () => {+ const container = await mountConsole();+ const publishInput = publishTopicInput(container);+ await setInputValue(publishInput, "manual/publish/topic");++ await openNewSubscription(container);+ await setInputValue(subscriptionTopicInput(), "device/new");+ await saveSubscription();++ expect(publishTopicInput(container).value).toBe("manual/publish/topic");+ });++ it("发布框为空时新增订阅会预填其 Topic", async () => {+ const container = await mountConsole("");+ expect(publishTopicInput(container).value).toBe("");++ await openNewSubscription(container);+ await setInputValue(subscriptionTopicInput(), "device/new");+ await saveSubscription();++ expect(publishTopicInput(container).value).toBe("device/new");+ });+});