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
feat(editor): zoom SQL text with a trackpad pinch
kkwang.xxe71df99e7b01
diff --git a/apps/desktop/src/components/editor/QueryEditor.vue b/apps/desktop/src/components/editor/QueryEditor.vueindex 1f7279bb7d..f5eddd97ad 100644--- a/apps/desktop/src/components/editor/QueryEditor.vue+++ b/apps/desktop/src/components/editor/QueryEditor.vue@@ -109,7 +109,7 @@ import { defaultKeymapForGlobalShortcuts } from "@/lib/editor/codemirrorDefaultKimport { createQueryEditorFoldShortcutBindings, foldKeymapWithoutAllBindings } from "@/lib/editor/queryEditorFoldKeymap";import { createShowWhitespaceExtension } from "@/lib/editor/codemirrorShowWhitespace";-import { clampEditorFontSize, createEditorWheelZoomGestureGuard, createEditorZoomCommitScheduler, fontSizeFromGestureScale, fontSizeFromWheelDelta } from "@/lib/editor/editorZoom";+import { clampEditorFontSize, createEditorWheelZoomController, createEditorZoomCommitScheduler, fontSizeFromGestureScale } from "@/lib/editor/editorZoom";import { buildSqlShortcutExecutionSql, enabledSqlShortcutActions, resolveSqlShortcutForDatabase, uniqueSqlShortcutBindings } from "@/lib/sql/sqlShortcutActions";import { resolveSqlShortcutTableToken } from "@/lib/sql/sqlShortcutTableTarget";import { normalizeShortcutSettings, shortcutToCodeMirrorKey } from "@/lib/editor/shortcutRegistry";@@ -597,7 +597,7 @@ const zoomCommitScheduler = createEditorZoomCommitScheduler((fontSize) => {if (settingsStore.editorSettings.fontSize === fontSize) return;settingsStore.updateEditorSettings({ fontSize });});-const wheelZoomGestureGuard = createEditorWheelZoomGestureGuard();+const wheelZoom = createEditorWheelZoomController();const queryEditorAppearanceSettings = computed(() => {const settings = settingsStore.editorSettings;@@ -693,6 +693,7 @@ function onEditorGestureChange(event: EditorGestureEvent) {function onEditorGestureEnd(event: Event) {event.preventDefault();isGestureZooming.value = false;+ wheelZoom.holdScrollGesture(event.timeStamp);zoomCommitScheduler.flush(liveFontSize.value);}@@ -2412,9 +2413,16 @@ const codeMirrorLifecycle = useQueryEditorCodeMirror({return handleVimDbxAction(event, currentView);},wheel(event) {- if (!wheelZoomGestureGuard.accepts(event)) return false;+ if (isGestureZooming.value) {+ if (event.ctrlKey || event.metaKey) {+ event.preventDefault();+ return true;+ }+ return false;+ }+ const next = wheelZoom.nextFontSize(liveFontSize.value, event);+ if (next === null) return false;event.preventDefault();- const next = fontSizeFromWheelDelta(liveFontSize.value, event.deltaY);applyLiveFontSize(next);scheduleFontSizeCommit(next);return true;@@ -2774,6 +2782,7 @@ async function applyEditorAppearance() {}if (!isGestureZooming.value && !zoomCommitScheduler.hasPendingCommit() && liveFontSize.value !== ss.fontSize) {liveFontSize.value = ss.fontSize;+ wheelZoom.rebase();}syncEditorFontCssVars(liveFontSize.value, ss.fontFamily);syncEditorDiagnosticCssVars();diff --git a/apps/desktop/src/components/nacos/NacosAdminConsole.vue b/apps/desktop/src/components/nacos/NacosAdminConsole.vueindex 78ebe52032..2ddcec59b9 100644--- a/apps/desktop/src/components/nacos/NacosAdminConsole.vue+++ b/apps/desktop/src/components/nacos/NacosAdminConsole.vue@@ -54,7 +54,7 @@ import { clipboardLineEndings, copyToClipboard, readTextFromClipboard } from "@/import { trimmedSelectionLayer } from "@/lib/editor/codemirrorTrimmedSelectionLayer";import { safeLocalStorageGet, safeLocalStorageSet } from "@/lib/backend/safeStorage";import { editorFontTheme, loadEditorTheme } from "@/lib/editor/editorThemes";-import { clampEditorFontSize, createEditorWheelZoomGestureGuard, createEditorZoomCommitScheduler, fontSizeFromWheelDelta } from "@/lib/editor/editorZoom";+import { clampEditorFontSize, createEditorWheelZoomController, createEditorZoomCommitScheduler } from "@/lib/editor/editorZoom";import { replaceFallbackKey } from "@/lib/editor/queryEditorSearchKeymap";import { isTauriRuntime } from "@/lib/backend/tauriRuntime";import { matchesShortcut } from "@/lib/editor/keyboardShortcuts";@@ -221,7 +221,7 @@ const configEditorZoomCommitScheduler = createEditorZoomCommitScheduler((fontSizif (settingsStore.editorSettings.fontSize === fontSize) return;settingsStore.updateEditorSettings({ fontSize });});-const configEditorWheelZoomGestureGuard = createEditorWheelZoomGestureGuard();+const configEditorWheelZoom = createEditorWheelZoomController();const knownConfigFormats = ref<Record<string, string>>({});const selectedConfigKeys = ref<string[]>([]);const searchOpen = ref(false);@@ -646,9 +646,9 @@ async function mountConfigEditor() {return selectLineEnds(eventView);},wheel(event, eventView) {- if (!configEditorWheelZoomGestureGuard.accepts(event)) return false;+ const next = configEditorWheelZoom.nextFontSize(configEditorFontSize.value, event);+ if (next === null) return false;event.preventDefault();- const next = fontSizeFromWheelDelta(configEditorFontSize.value, event.deltaY);if (next !== configEditorFontSize.value) {configEditorFontSize.value = next;eventView.dispatch({diff --git a/apps/desktop/src/composables/useCellDetailEditor.ts b/apps/desktop/src/composables/useCellDetailEditor.tsindex b08731601d..ba3a6b67a3 100644--- a/apps/desktop/src/composables/useCellDetailEditor.ts+++ b/apps/desktop/src/composables/useCellDetailEditor.ts@@ -13,7 +13,7 @@ import { matchesShortcut } from "@/lib/editor/keyboardShortcuts";import { shortcutToCodeMirrorKey } from "@/lib/editor/shortcutRegistry";import { useSettingsStore } from "@/stores/settingsStore";import { isJsonColumnType } from "@/lib/dataGrid/cellDetailPresentation";-import { clampEditorFontSize, createEditorWheelZoomGestureGuard, createEditorZoomCommitScheduler, fontSizeFromGestureScale, fontSizeFromWheelDelta } from "@/lib/editor/editorZoom";+import { clampEditorFontSize, createEditorWheelZoomController, createEditorZoomCommitScheduler, fontSizeFromGestureScale } from "@/lib/editor/editorZoom";import i18n from "@/i18n";import EditorSearchPanel from "@/components/editor/EditorSearchPanel.vue";import type { EditorTheme } from "@/stores/settingsStore";@@ -107,7 +107,7 @@ export function useCellDetailEditor(options: UseCellDetailEditorOptions): UseCelif (settingsStore.editorSettings.fontSize === fontSize) return;settingsStore.updateEditorSettings({ fontSize });});- const wheelZoomGestureGuard = createEditorWheelZoomGestureGuard();+ const wheelZoom = createEditorWheelZoomController();function syncEditorFontCssVars(fontSize = liveFontSize, fontFamily = options.fontFamily()) {if (!wrapperEl) return;@@ -187,6 +187,7 @@ export function useCellDetailEditor(options: UseCellDetailEditorOptions): UseCelfunction onEditorGestureEnd(event: Event) {event.preventDefault();isGestureZooming = false;+ wheelZoom.holdScrollGesture(event.timeStamp);zoomCommitScheduler.flush(liveFontSize);}@@ -194,7 +195,9 @@ export function useCellDetailEditor(options: UseCellDetailEditorOptions): UseCelconst editor = view.value;if (!editor || destroyed) return;if (!isGestureZooming && !zoomCommitScheduler.hasPendingCommit()) {- liveFontSize = clampEditorFontSize(fontSize);+ const nextFontSize = clampEditorFontSize(fontSize);+ if (nextFontSize !== liveFontSize) wheelZoom.rebase();+ liveFontSize = nextFontSize;}syncEditorFontCssVars(liveFontSize, fontFamily);const theme = await loadEditorTheme(editorTheme, appearance, undefined, palette);@@ -342,9 +345,16 @@ export function useCellDetailEditor(options: UseCellDetailEditorOptions): UseCelreturn true;},wheel(event) {- if (!wheelZoomGestureGuard.accepts(event)) return false;+ if (isGestureZooming) {+ if (event.ctrlKey || event.metaKey) {+ event.preventDefault();+ return true;+ }+ return false;+ }+ const next = wheelZoom.nextFontSize(liveFontSize, event);+ if (next === null) return false;event.preventDefault();- const next = fontSizeFromWheelDelta(liveFontSize, event.deltaY);applyLiveFontSize(next);zoomCommitScheduler.schedule(next);return true;diff --git a/apps/desktop/src/lib/__tests__/editor/editorZoom.spec.ts b/apps/desktop/src/lib/__tests__/editor/editorZoom.spec.tsindex a815a91b52..387c5b0c7e 100644--- a/apps/desktop/src/lib/__tests__/editor/editorZoom.spec.ts+++ b/apps/desktop/src/lib/__tests__/editor/editorZoom.spec.ts@@ -1,10 +1,14 @@import { describe, expect, it } from "vitest";-import { createEditorWheelZoomGestureGuard } from "@/lib/editor/editorZoom";+import { clampEditorFontSize, createEditorWheelZoomController, createEditorWheelZoomGestureGuard, fontSizeFromWheelDelta } from "@/lib/editor/editorZoom";function wheelEvent(timeStamp: number, modifier = false) {return { timeStamp, metaKey: modifier, ctrlKey: false };}+function pinchWheel(timeStamp: number, deltaY: number, modifier = true) {+ return { timeStamp, metaKey: false, ctrlKey: modifier, deltaX: 0, deltaY, deltaMode: 0 };+}+describe("createEditorWheelZoomGestureGuard", () => {it("ignores a modifier pressed during an existing scroll gesture", () => {const guard = createEditorWheelZoomGestureGuard();@@ -42,4 +46,66 @@ describe("createEditorWheelZoomGestureGuard", () => {guard.reset();expect(guard.accepts(wheelEvent(120, true))).toBe(true);});++ it("accepts a pinch that follows a short non-modified prefix", () => {+ const guard = createEditorWheelZoomGestureGuard();++ expect(guard.accepts(pinchWheel(100, -1.25, false))).toBe(false);+ expect(guard.accepts(pinchWheel(140, -1.5, true))).toBe(true);+ expect(guard.accepts(pinchWheel(156, -1.25, true))).toBe(true);+ });++ it("does not treat ctrl during an established scroll as a pinch", () => {+ const guard = createEditorWheelZoomGestureGuard();++ for (let index = 0; index < 6; index += 1) {+ expect(guard.accepts(pinchWheel(100 + index * 16, -20.5, false))).toBe(false);+ }+ expect(guard.accepts(pinchWheel(196, -1.25, true))).toBe(false);+ });++ it("does not promote an integer wheel delta that appears during a short scroll", () => {+ const guard = createEditorWheelZoomGestureGuard();++ expect(guard.accepts({ timeStamp: 0, ctrlKey: false, metaKey: false, deltaX: 0, deltaY: -4, deltaMode: 0 })).toBe(false);+ expect(guard.accepts({ timeStamp: 20, ctrlKey: true, metaKey: false, deltaX: 0, deltaY: -4, deltaMode: 0 })).toBe(false);+ });+});++describe("createEditorWheelZoomController", () => {+ it("keeps mouse-notch zoom on the existing curve", () => {+ const zoom = createEditorWheelZoomController();+ const event = { timeStamp: 10, ctrlKey: true, metaKey: false, deltaX: 0, deltaY: 120, deltaMode: 0 };++ expect(zoom.nextFontSize(16, event)).toBe(fontSizeFromWheelDelta(16, 120));+ });++ it("maps a trackpad pinch through Chromium's exp(-deltaY / 100) scale", () => {+ const zoom = createEditorWheelZoomController();+ const deltaY = -100 * Math.log(2);++ expect(zoom.nextFontSize(11, pinchWheel(1, deltaY))).toBe(clampEditorFontSize(22));+ });++ it("accumulates pinch frames that are smaller than the displayed precision", () => {+ const zoom = createEditorWheelZoomController();+ let size = 14;++ for (let index = 0; index < 40; index += 1) {+ const next = zoom.nextFontSize(size, pinchWheel(index * 10, -0.02));+ expect(next).not.toBeNull();+ size = next ?? size;+ }++ expect(size).toBe(clampEditorFontSize(14 * Math.exp(0.8 / 100)));+ });++ it("holds trailing wheel inertia after a native pinch gesture ends", () => {+ const zoom = createEditorWheelZoomController();++ expect(zoom.nextFontSize(14, pinchWheel(100, -1.5))).toBeGreaterThan(14);+ zoom.holdScrollGesture(200);+ expect(zoom.nextFontSize(14, pinchWheel(250, -1.5))).toBeNull();+ expect(zoom.nextFontSize(14, pinchWheel(431, -1.5))).toBeGreaterThan(14);+ });});diff --git a/apps/desktop/src/lib/editor/editorZoom.ts b/apps/desktop/src/lib/editor/editorZoom.tsindex 20d308e587..30ceadb514 100644--- a/apps/desktop/src/lib/editor/editorZoom.ts+++ b/apps/desktop/src/lib/editor/editorZoom.ts@@ -1,13 +1,44 @@export const EDITOR_MIN_FONT_SIZE = 10;export const EDITOR_MAX_FONT_SIZE = 24;const WHEEL_FONT_ZOOM_SENSITIVITY = 0.0015;+/**+ * Chromium turns a trackpad pinch into wheel events whose scale is+ * `exp(-deltaY / 100)`. Mouse notches stay on the coarser curve above.+ */+const PINCH_WHEEL_ZOOM_SENSITIVITY = 0.01;const WHEEL_GESTURE_IDLE_MS = 180;+/**+ * Fingers often scroll a little before a pinch is recognized. A real scroll+ * moves farther than that, which is what keeps ctrl-during-inertia from zooming.+ */+const PINCH_PREFIX_DISTANCE = 80;+const PINCH_PREFIX_SCROLL_MS = 200;-type WheelZoomModifierEvent = Pick<WheelEvent, "ctrlKey" | "metaKey" | "timeStamp">;+type WheelZoomModifierEvent = Pick<WheelEvent, "ctrlKey" | "metaKey" | "timeStamp"> & Partial<Pick<WheelEvent, "deltaX" | "deltaY" | "deltaMode">>;++export interface EditorWheelZoomEvent extends WheelZoomModifierEvent {+ deltaX: number;+ deltaY: number;+ deltaMode: number;+}++function isSyntheticPinchWheel(event: Partial<Pick<WheelEvent, "deltaX" | "deltaY" | "deltaMode">>): boolean {+ if (event.deltaMode !== 0) return false;+ if (typeof event.deltaX !== "number" || typeof event.deltaY !== "number") return false;+ if (Math.abs(event.deltaX) > 0.5) return false;+ const absY = Math.abs(event.deltaY);+ if (!(absY > 0) || absY >= 250) return false;+ // 100 * ln(scale) is fractional. Integer pixel notches (100 / 120) stay on the mouse curve.+ return Math.abs(event.deltaY - Math.round(event.deltaY)) >= 0.001;+}export function createEditorWheelZoomGestureGuard(idleMs = WHEEL_GESTURE_IDLE_MS) {let lastEventTime = Number.NEGATIVE_INFINITY;let startedWithModifier = false;+ let plainScrollEvents = 0;+ let plainScrollDistance = 0;+ let plainScrollStartedAt: number | null = null;+ let gestureId = 0;return {accepts(event: WheelZoomModifierEvent) {@@ -15,13 +46,42 @@ export function createEditorWheelZoomGestureGuard(idleMs = WHEEL_GESTURE_IDLE_MSconst eventTime = Number.isFinite(event.timeStamp) ? event.timeStamp : 0;if (eventTime < lastEventTime || eventTime - lastEventTime > idleMs) {startedWithModifier = hasModifier;+ plainScrollEvents = 0;+ plainScrollDistance = 0;+ plainScrollStartedAt = null;+ gestureId += 1;+ }+ if (!hasModifier) {+ if (plainScrollEvents === 0) plainScrollStartedAt = eventTime;+ plainScrollEvents += 1;+ plainScrollDistance += Math.abs(event.deltaY ?? 0);+ } else if (!startedWithModifier && isSyntheticPinchWheel(event)) {+ const prefixMs = plainScrollStartedAt === null ? Number.POSITIVE_INFINITY : eventTime - plainScrollStartedAt;+ if (plainScrollEvents > 0 && plainScrollDistance <= PINCH_PREFIX_DISTANCE && prefixMs <= PINCH_PREFIX_SCROLL_MS) {+ startedWithModifier = true;+ }}lastEventTime = eventTime;return startedWithModifier && hasModifier;},+ currentGestureId() {+ return gestureId;+ },+ holdAsPlainScroll(timeStamp: number) {+ const eventTime = Number.isFinite(timeStamp) ? timeStamp : 0;+ lastEventTime = eventTime;+ startedWithModifier = false;+ plainScrollEvents = 1;+ plainScrollDistance = PINCH_PREFIX_DISTANCE + 1;+ plainScrollStartedAt = eventTime;+ },reset() {lastEventTime = Number.NEGATIVE_INFINITY;startedWithModifier = false;+ plainScrollEvents = 0;+ plainScrollDistance = 0;+ plainScrollStartedAt = null;+ gestureId += 1;},};}@@ -31,6 +91,11 @@ export function clampEditorFontSize(value: number): number {return Number(clamped.toFixed(2));}+function clampEditorFontSizeExact(value: number): number {+ if (!Number.isFinite(value)) return EDITOR_MIN_FONT_SIZE;+ return Math.min(EDITOR_MAX_FONT_SIZE, Math.max(EDITOR_MIN_FONT_SIZE, value));+}+export function fontSizeFromWheelDelta(currentFontSize: number, deltaY: number): number {return clampEditorFontSize(currentFontSize * Math.exp(-deltaY * WHEEL_FONT_ZOOM_SENSITIVITY));}@@ -39,6 +104,45 @@ export function fontSizeFromGestureScale(startFontSize: number, scale: number):return clampEditorFontSize(startFontSize * scale);}+export function createEditorWheelZoomController(idleMs = WHEEL_GESTURE_IDLE_MS) {+ const guard = createEditorWheelZoomGestureGuard(idleMs);+ let exactFontSize: number | null = null;+ let appliedGestureId = -1;++ return {+ nextFontSize(currentFontSize: number, event: EditorWheelZoomEvent): number | null {+ if (!guard.accepts(event)) {+ exactFontSize = null;+ appliedGestureId = guard.currentGestureId();+ return null;+ }+ const gestureId = guard.currentGestureId();+ let exact = exactFontSize;+ if (appliedGestureId !== gestureId || exact === null) {+ exact = currentFontSize;+ appliedGestureId = gestureId;+ }+ const sensitivity = isSyntheticPinchWheel(event) ? PINCH_WHEEL_ZOOM_SENSITIVITY : WHEEL_FONT_ZOOM_SENSITIVITY;+ exact = clampEditorFontSizeExact(exact * Math.exp(-event.deltaY * sensitivity));+ exactFontSize = exact;+ return clampEditorFontSize(exact);+ },+ rebase() {+ exactFontSize = null;+ },+ /** Keep trailing pinch inertia from starting a second zoom after a native gesture ends. */+ holdScrollGesture(timeStamp: number) {+ guard.holdAsPlainScroll(timeStamp);+ exactFontSize = null;+ },+ reset() {+ guard.reset();+ exactFontSize = null;+ appliedGestureId = -1;+ },+ };+}+export function createEditorZoomCommitScheduler(commit: (fontSize: number) => void, delayMs = 160) {let timer: ReturnType<typeof setTimeout> | null = null;let pendingFontSize: number | null = null;