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(editor): stop replaying stale format and compress requests
Abeautifulsnow32e070f387d0
diff --git a/apps/desktop/src/components/editor/QueryEditor.vue b/apps/desktop/src/components/editor/QueryEditor.vueindex b25390b0f4..17f44d4cdf 100644--- a/apps/desktop/src/components/editor/QueryEditor.vue+++ b/apps/desktop/src/components/editor/QueryEditor.vue@@ -1,3 +1,18 @@+<script lang="ts">+// Replay guard for the toolbar format/compress requests. The ids are global+// monotonic counters shared by every tab, and ContentArea delivers them by+// gating the inactive tab's prop back to `undefined`; returning to the tab+// re-arms the same stale id on the reused editor instance (a replay, not a new+// command). The cursors live at module scope — not in `<script setup>` — so+// they also survive an editor unmount/remount (data-page switches), letting a+// freshly mounted editor consume the stale id instead of replaying it. The+// check is strictly monotonic (`>`), not `!==`: because ids are shared across+// tabs, a lower id is always an already-handled request from an active tab+// (delivery is same-tick), never a pending undelivered one.+let lastHandledFormatRequestId = 0;+let lastHandledCompressRequestId = 0;+</script>+<script setup lang="ts">import { ref, onMounted, onBeforeUnmount, onActivated, onDeactivated, watch, shallowRef, computed, nextTick } from "vue";import { AlignLeft, Camera, CaseLower, CaseSensitive, CaseUpper, ClipboardPaste, Code2, Download, Eye, FileCode, MessageSquareText, Minimize2, Pencil, PencilRuler, Play, Copy, List, Scissors, Search, Sparkles, Table2, TextSelect, Trash2 } from "@lucide/vue";@@ -6922,15 +6937,21 @@ watch([() => props.tabId, () => props.modelValue], ([tabId, val], [prevTabId]) =watch(() => props.formatRequestId,- (val, oldVal) => {- if (val && val !== oldVal) formatCurrentSql();+ (val) => {+ if (val && val > lastHandledFormatRequestId) {+ lastHandledFormatRequestId = val;+ formatCurrentSql();+ }},);watch(() => props.compressRequestId,- (val, oldVal) => {- if (val && val !== oldVal) compressCurrentSql();+ (val) => {+ if (val && val > lastHandledCompressRequestId) {+ lastHandledCompressRequestId = val;+ compressCurrentSql();+ }},);diff --git a/apps/desktop/src/components/editor/__tests__/QueryEditor.formatCompressRequestReplay.spec.ts b/apps/desktop/src/components/editor/__tests__/QueryEditor.formatCompressRequestReplay.spec.tsnew file mode 100644index 0000000000..cc90b98191--- /dev/null+++ b/apps/desktop/src/components/editor/__tests__/QueryEditor.formatCompressRequestReplay.spec.ts@@ -0,0 +1,157 @@+// @vitest-environment happy-dom++import { createApp, defineComponent, h, nextTick, reactive } from "vue";+import { createPinia, setActivePinia } from "pinia";+import { createI18n } from "vue-i18n";+import { afterEach, describe, expect, it, vi } from "vitest";++import QueryEditor from "@/components/editor/QueryEditor.vue";+import { compressSqlText, formatSqlForEditing } from "@/lib/sql/sqlFormatter";+import { DEFAULT_SQL_FORMATTER_SETTINGS } from "@/lib/sql/sqlFormatterConfig";++// The request ids are per-kind global counters in App.vue, so ids keep+// increasing for the lifetime of the process. The module-scope replay cursor in+// QueryEditor.vue survives across the editor mounts in this file, so every test+// must advance its ids monotonically (never reuse a smaller id) to mirror the+// production counter.+const ORIGINAL_SQL = "select id, name\nfrom users\nwhere id = 1";+const COMPRESSED_SQL = compressSqlText(ORIGINAL_SQL, "mysql");+const FORMATTED_SQL = await formatSqlForEditing(COMPRESSED_SQL, "mysql", DEFAULT_SQL_FORMATTER_SETTINGS);++const cleanups: Array<() => void> = [];++type EditorState = {+ tabId: string;+ modelValue: string;+ formatRequestId: number | undefined;+ compressRequestId: number | undefined;+};++const WAIT = { timeout: 5000, interval: 20 };++function mountEditor(initial: { modelValue: string; tabId: string; formatRequestId?: number; compressRequestId?: number }) {+ const pinia = createPinia();+ setActivePinia(pinia);+ const state = reactive<EditorState>({+ tabId: initial.tabId,+ modelValue: initial.modelValue,+ formatRequestId: initial.formatRequestId,+ compressRequestId: initial.compressRequestId,+ });+ const emits: string[] = [];+ const root = defineComponent({+ setup: () => () =>+ h(QueryEditor, {+ modelValue: state.modelValue,+ tabId: state.tabId,+ databaseType: "mysql",+ dialect: "mysql",+ formatDialect: "mysql",+ autoFocus: false,+ formatRequestId: state.formatRequestId,+ compressRequestId: state.compressRequestId,+ "onUpdate:modelValue": (value: string) => {+ emits.push(value);+ // Mirror the app: App.vue writes the emitted text back into the tab+ // store, so the modelValue prop follows the editor document.+ state.modelValue = value;+ },+ }),+ });+ const host = document.createElement("div");+ document.body.appendChild(host);+ const app = createApp(root);+ app.use(pinia);+ app.use(createI18n({ legacy: false, locale: "en", messages: { en: {} }, missingWarn: false, fallbackWarn: false }));+ app.mount(host);+ cleanups.push(() => {+ app.unmount();+ host.remove();+ });+ return { state, emits, host, unmount: () => app.unmount() };+}++async function waitForEditor(host: HTMLElement) {+ await vi.waitFor(() => {+ expect(host.querySelector(".cm-editor")).not.toBeNull();+ }, WAIT);+}++// Flush the watcher queue, the microtask queue and the timers the editor uses+// for its async format path in one go.+async function settle() {+ await nextTick();+ await new Promise((resolve) => setTimeout(resolve, 0));+ await nextTick();+ await new Promise((resolve) => setTimeout(resolve, 0));+}++describe("QueryEditor format/compress request replay", () => {+ afterEach(() => {+ for (const cleanup of cleanups.splice(0)) cleanup();+ });++ it("does not replay the stale compress/format requests when the ids re-arm after a tab switch", async () => {+ // Preconditions: the sample must be recompressible and format must produce+ // a distinct multi-line document, otherwise the replay would be a no-op.+ expect(COMPRESSED_SQL).not.toBe(ORIGINAL_SQL);+ expect(FORMATTED_SQL).not.toBe(COMPRESSED_SQL);+ expect(FORMATTED_SQL).toContain("\n");++ const { state, emits, host } = mountEditor({ modelValue: ORIGINAL_SQL, tabId: "tab-a" });+ await waitForEditor(host);++ // Toolbar compress, then toolbar format, on the active tab.+ state.compressRequestId = 1;+ await vi.waitFor(() => expect(emits.at(-1)).toBe(COMPRESSED_SQL), WAIT);++ state.formatRequestId = 1;+ await vi.waitFor(() => expect(emits.at(-1)).toBe(FORMATTED_SQL), WAIT);++ // Switch to another SQL file: ContentArea gates the inactive tab's request+ // props back to undefined on the same reused editor instance.+ state.tabId = "tab-b";+ state.formatRequestId = undefined;+ state.compressRequestId = undefined;+ await settle();++ // Switch back: the same stale ids re-arm, which is the replay trigger.+ state.tabId = "tab-a";+ state.formatRequestId = 1;+ state.compressRequestId = 1;+ await settle();+ await settle();++ // The replayed compress must not undo the user's later format.+ expect(emits.at(-1)).toBe(FORMATTED_SQL);+ });++ it("still applies a genuinely new request id", async () => {+ const { state, emits, host } = mountEditor({ modelValue: ORIGINAL_SQL, tabId: "tab-a" });+ await waitForEditor(host);++ state.compressRequestId = 2;+ await vi.waitFor(() => expect(emits.at(-1)).toBe(COMPRESSED_SQL), WAIT);++ state.formatRequestId = 2;+ await vi.waitFor(() => expect(emits.at(-1)).toBe(FORMATTED_SQL), WAIT);+ });++ it("does not replay a stale id on a fresh mount", async () => {+ const first = mountEditor({ modelValue: ORIGINAL_SQL, tabId: "tab-a" });+ await waitForEditor(first.host);++ first.state.formatRequestId = 3;+ await vi.waitFor(() => expect(first.emits.at(-1)).toBe(FORMATTED_SQL), WAIT);+ first.unmount();++ // Data-page remount path: a new editor instance mounts while the global+ // request still holds the stale id for this tab.+ const second = mountEditor({ modelValue: COMPRESSED_SQL, tabId: "tab-a", formatRequestId: 3, compressRequestId: 3 });+ await waitForEditor(second.host);+ await settle();+ await settle();++ expect(second.emits).toEqual([]);+ });+});