From 39f388f3919eabcb73ba0b181869f0a2d30ce827 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E6=A1=A5=E5=87=89=E4=BB=8B?= <113153113+HighBigSky@users.noreply.github.com> Date: Tue, 29 Sep 2026 21:51:10 +0800 Subject: [PATCH] feat(editor): restore SQL pasted from source code --- .../editor/EditorSettingsDialog.vue | 16 + .../src/components/editor/QueryEditor.vue | 32 ++ .../editor/QueryEditorContextMenu.vue | 10 +- ...ueryEditor.sourcePaste.integration.spec.ts | 122 ++++++ .../useQueryEditorTextActions.spec.ts | 16 + .../editor/useQueryEditorTextActions.ts | 25 ++ .../__tests__/sqlSourcePasteParity.spec.ts | 83 +++++ apps/desktop/src/i18n/locales/az.ts | 5 + apps/desktop/src/i18n/locales/en.ts | 5 + apps/desktop/src/i18n/locales/es.ts | 5 + apps/desktop/src/i18n/locales/it.ts | 6 + apps/desktop/src/i18n/locales/ja.ts | 5 + apps/desktop/src/i18n/locales/ko.ts | 5 + apps/desktop/src/i18n/locales/pt-BR.ts | 5 + apps/desktop/src/i18n/locales/ru.ts | 6 + apps/desktop/src/i18n/locales/tr.ts | 6 + apps/desktop/src/i18n/locales/zh-CN.ts | 5 + apps/desktop/src/i18n/locales/zh-TW.ts | 5 + .../lib/__tests__/sql/sqlSourcePaste.spec.ts | 164 +++++++++ .../src/lib/settings/editorSettingsDraft.ts | 1 + .../src/lib/settings/settingsSearch.ts | 1 + .../src/lib/settings/settingsTransfer.ts | 1 + apps/desktop/src/lib/sql/sqlSourcePaste.ts | 348 ++++++++++++++++++ .../stores/__tests__/settingsStore.spec.ts | 8 + apps/desktop/src/stores/settingsStore.ts | 5 + 25 files changed, 889 insertions(+), 1 deletion(-) create mode 100644 apps/desktop/src/components/editor/__tests__/QueryEditor.sourcePaste.integration.spec.ts create mode 100644 apps/desktop/src/i18n/__tests__/sqlSourcePasteParity.spec.ts create mode 100644 apps/desktop/src/lib/__tests__/sql/sqlSourcePaste.spec.ts create mode 100644 apps/desktop/src/lib/sql/sqlSourcePaste.ts diff --git a/apps/desktop/src/components/editor/EditorSettingsDialog.vue b/apps/desktop/src/components/editor/EditorSettingsDialog.vue index 577b5ed367..d01fdf746e 100644 --- a/apps/desktop/src/components/editor/EditorSettingsDialog.vue +++ b/apps/desktop/src/components/editor/EditorSettingsDialog.vue @@ -697,6 +697,7 @@ const editDdlOpenMode = ref(settingsStore.editorS const editVimModeEnabled = ref(settingsStore.editorSettings.vimModeEnabled); const editDoubleClickStringSelectionMode = ref(settingsStore.editorSettings.doubleClickStringSelectionMode); const editAutoCloseBrackets = ref(settingsStore.editorSettings.autoCloseBrackets); +const editRestoreSqlFromSourcePasteEnabled = ref(settingsStore.editorSettings.restoreSqlFromSourcePasteEnabled); const editSqlSemanticDiagnosticsMode = ref(settingsStore.editorSettings.sqlSemanticDiagnosticsMode); const editSqlSemanticDiagnosticsEnabled = ref(settingsStore.editorSettings.sqlSemanticDiagnosticsEnabled); const editConfirmDangerousSqlExecution = ref(settingsStore.editorSettings.confirmDangerousSqlExecution); @@ -1062,6 +1063,7 @@ function currentEditorSettingsDraft(): EditorSettingsDraft { vimModeEnabled: editVimModeEnabled.value, doubleClickStringSelectionMode: editDoubleClickStringSelectionMode.value, autoCloseBrackets: editAutoCloseBrackets.value, + restoreSqlFromSourcePasteEnabled: editRestoreSqlFromSourcePasteEnabled.value, sqlSemanticDiagnosticsMode: editSqlSemanticDiagnosticsMode.value, confirmDangerousSqlExecution: editConfirmDangerousSqlExecution.value, continueOnErrorOnBatch: editContinueOnErrorOnBatch.value, @@ -1726,6 +1728,7 @@ function syncEditorSettingsDraftFromStore() { editVimModeEnabled.value = settingsStore.editorSettings.vimModeEnabled; editDoubleClickStringSelectionMode.value = settingsStore.editorSettings.doubleClickStringSelectionMode; editAutoCloseBrackets.value = settingsStore.editorSettings.autoCloseBrackets; + editRestoreSqlFromSourcePasteEnabled.value = settingsStore.editorSettings.restoreSqlFromSourcePasteEnabled; editSqlSemanticDiagnosticsMode.value = settingsStore.editorSettings.sqlSemanticDiagnosticsMode; editSqlSemanticDiagnosticsEnabled.value = settingsStore.editorSettings.sqlSemanticDiagnosticsEnabled; editConfirmDangerousSqlExecution.value = settingsStore.editorSettings.confirmDangerousSqlExecution; @@ -1868,6 +1871,7 @@ const editorSettingsDraftRefs: EditorSettingsDraftRefMap = { vimModeEnabled: editVimModeEnabled, doubleClickStringSelectionMode: editDoubleClickStringSelectionMode, autoCloseBrackets: editAutoCloseBrackets, + restoreSqlFromSourcePasteEnabled: editRestoreSqlFromSourcePasteEnabled, sqlSemanticDiagnosticsMode: editSqlSemanticDiagnosticsMode, confirmDangerousSqlExecution: editConfirmDangerousSqlExecution, confirmUnsavedSqlClose: editConfirmUnsavedSqlClose, @@ -2362,6 +2366,7 @@ function resetDefaultsForTab(tab: SettingsCategory) { editVimModeEnabled.value = DEFAULT_EDITOR_SETTINGS.vimModeEnabled; editDoubleClickStringSelectionMode.value = DEFAULT_EDITOR_SETTINGS.doubleClickStringSelectionMode; editAutoCloseBrackets.value = DEFAULT_EDITOR_SETTINGS.autoCloseBrackets; + editRestoreSqlFromSourcePasteEnabled.value = DEFAULT_EDITOR_SETTINGS.restoreSqlFromSourcePasteEnabled; editSqlSemanticDiagnosticsMode.value = DEFAULT_EDITOR_SETTINGS.sqlSemanticDiagnosticsMode; editSqlSemanticDiagnosticsEnabled.value = DEFAULT_EDITOR_SETTINGS.sqlSemanticDiagnosticsEnabled; editConfirmDangerousSqlExecution.value = DEFAULT_EDITOR_SETTINGS.confirmDangerousSqlExecution; @@ -2524,6 +2529,7 @@ function resetAllDefaults() { editVimModeEnabled.value = DEFAULT_EDITOR_SETTINGS.vimModeEnabled; editDoubleClickStringSelectionMode.value = DEFAULT_EDITOR_SETTINGS.doubleClickStringSelectionMode; editAutoCloseBrackets.value = DEFAULT_EDITOR_SETTINGS.autoCloseBrackets; + editRestoreSqlFromSourcePasteEnabled.value = DEFAULT_EDITOR_SETTINGS.restoreSqlFromSourcePasteEnabled; editSqlSemanticDiagnosticsMode.value = DEFAULT_EDITOR_SETTINGS.sqlSemanticDiagnosticsMode; editSqlSemanticDiagnosticsEnabled.value = DEFAULT_EDITOR_SETTINGS.sqlSemanticDiagnosticsEnabled; editConfirmDangerousSqlExecution.value = DEFAULT_EDITOR_SETTINGS.confirmDangerousSqlExecution; @@ -6714,6 +6720,16 @@ onUnmounted(() => { +
+
+ +

+ {{ t("settings.restoreSqlFromSourcePasteDescription") }} +

+
+ +
+
diff --git a/apps/desktop/src/components/editor/QueryEditor.vue b/apps/desktop/src/components/editor/QueryEditor.vue index abd34cc47b..5bd98b4c73 100644 --- a/apps/desktop/src/components/editor/QueryEditor.vue +++ b/apps/desktop/src/components/editor/QueryEditor.vue @@ -69,6 +69,7 @@ import { looksLikeDmlStatement } from "@/lib/sql/dmlChangePreview"; import { canFormatSqlForDatabaseType, formatSqlForEditing, compressSqlText } from "@/lib/sql/sqlFormatter"; import { detectAndFormatStructured } from "@/lib/sql/autoFormat"; +import { restoreSqlFromSourcePaste } from "@/lib/sql/sqlSourcePaste"; import { enabledSqlParameterSyntaxes, resolveSqlVariableSyntaxToggles } from "@/lib/sql/sqlVariableSyntax"; import { createQueryEditorExecutionViewportOwnership, isQueryEditorPositionVisible } from "@/lib/editor/queryEditorExecutionViewport"; @@ -281,6 +282,7 @@ const { copySelectedSqlAsRichTextFromContextMenu, cutSelectedSqlFromContextMenu, pasteClipboardSqlFromContextMenu, + pasteClipboardSqlRestoringSource, toggleCommentFromContextMenu, toggleBlockCommentFromContextMenu, selectAllSqlFromContextMenu, @@ -1038,6 +1040,34 @@ function resyncCaretAfterPaste(view: EditorViewType) { }); } +/** + * 粘贴时尝试把「源码里的字符串拼接 SQL」(Java/JS/Python 等)还原为普通 SQL。 + * 命中后自行插入并阻止默认粘贴;未命中返回 false,交给原有粘贴流程处理。 + */ +function tryRestoreSqlFromSourcePaste(event: ClipboardEvent, currentView: EditorViewType): boolean { + if (props.readOnly || !settingsStore.editorSettings.restoreSqlFromSourcePasteEnabled) return false; + if (currentView.state.selection.ranges.length !== 1) return false; + const eventText = event.clipboardData?.getData("text/plain") ?? ""; + if (!eventText) return false; + // Tauri 下超长文本会被 WebView 截断、之后异步补写后半段,这里不参与还原以免破坏片段边界 + if (shouldRecoverLargeTauriPaste(eventText, isTauriRuntime())) return false; + + const restored = restoreSqlFromSourcePaste(eventText); + if (!restored.changed) return false; + + event.preventDefault(); + const selection = currentView.state.selection.main; + const insertedText = normalizeQueryEditorPasteText(restored.sql); + currentView.dispatch({ + changes: { from: selection.from, to: selection.to, insert: insertedText }, + selection: { anchor: selection.from + insertedText.length }, + scrollIntoView: true, + userEvent: "input.paste", + }); + toast(t("editor.sqlSourcePasteRestored"), 2000); + return true; +} + function recoverLargeTauriPaste(event: ClipboardEvent, currentView: EditorViewType): boolean { const eventText = event.clipboardData?.getData("text/plain") ?? ""; if (props.readOnly || currentView.state.selection.ranges.length !== 1 || !shouldRecoverLargeTauriPaste(eventText, isTauriRuntime())) return false; @@ -1166,6 +1196,7 @@ const contextMenuActions: QueryEditorContextMenuActions = { copySelectedSqlAsRichTextFromContextMenu, cutSelectedSqlFromContextMenu, pasteClipboardSqlFromContextMenu, + pasteClipboardSqlRestoringSource, convertSelectedSqlCase, convertSelectedNamingStyle, openDelimitedListDialog, @@ -2055,6 +2086,7 @@ const codeMirrorLifecycle = useQueryEditorCodeMirror({ ), EditorView.domEventHandlers({ paste(event, currentView) { + if (tryRestoreSqlFromSourcePaste(event, currentView)) return true; return recoverLargeTauriPaste(event, currentView); }, dragover(event) { diff --git a/apps/desktop/src/components/editor/QueryEditorContextMenu.vue b/apps/desktop/src/components/editor/QueryEditorContextMenu.vue index 9d3cbd6e13..d022c6992d 100644 --- a/apps/desktop/src/components/editor/QueryEditorContextMenu.vue +++ b/apps/desktop/src/components/editor/QueryEditorContextMenu.vue @@ -1,7 +1,7 @@