From 07b8f5fe8303bad57490c7dd0eba00e435fbfad5 Mon Sep 17 00:00:00 2001
From: qyaniwu <qyaniwu@tencent.com>
Date: Thu, 24 Jul 2025 04:13:02 +0000
Subject: [PATCH] =?UTF-8?q?fix(editor):=20=E4=BF=AE=E5=A4=8D=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E5=9D=97=E7=BC=96=E8=BE=91=E5=99=A8=E7=9A=84=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E5=86=85=E5=AE=B9=E5=90=8E=E6=8C=89=E4=B8=8Bctrl+s?=
 =?UTF-8?q?=E5=85=89=E6=A0=87=E4=BC=9A=E5=81=8F=E7=A7=BB=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/editor/src/layouts/CodeEditor.vue | 48 ++++++++++++++--------
 1 file changed, 31 insertions(+), 17 deletions(-)

diff --git a/packages/editor/src/layouts/CodeEditor.vue b/packages/editor/src/layouts/CodeEditor.vue
index 4b8233e1..f19b1ae3 100644
--- a/packages/editor/src/layouts/CodeEditor.vue
+++ b/packages/editor/src/layouts/CodeEditor.vue
@@ -20,7 +20,7 @@
 </template>
 
 <script lang="ts" setup>
-import { nextTick, onBeforeUnmount, onMounted, ref, useTemplateRef, watch } from 'vue';
+import { nextTick, onBeforeUnmount, onMounted, onUnmounted, ref, useTemplateRef, watch } from 'vue';
 import { FullScreen } from '@element-plus/icons-vue';
 import { throttle } from 'lodash-es';
 import serialize from 'serialize-javascript';
@@ -62,7 +62,7 @@ const props = withDefaults(
 const emit = defineEmits(['initd', 'save']);
 
 const toString = (v: string | any, language: string): string => {
-  let value = '';
+  let value: string;
   if (typeof v !== 'string') {
     if (language === 'json') {
       value = JSON.stringify(v, null, 2);
@@ -113,19 +113,40 @@ const setEditorValue = (v: string | any, m: string | any) => {
   if (props.type === 'diff') {
     const originalModel = monaco.editor.createModel(values.value, 'text/javascript');
     const modifiedModel = monaco.editor.createModel(toString(m, props.language), 'text/javascript');
-
-    return vsDiffEditor?.setModel({
+    const position = vsDiffEditor?.getPosition();
+    const result = vsDiffEditor?.setModel({
       original: originalModel,
       modified: modifiedModel,
     });
+    if (position) {
+      vsDiffEditor?.setPosition(position);
+      vsDiffEditor?.focus();
+    }
+    return result;
   }
-
-  return vsEditor?.setValue(values.value);
+  // 保存当前光标位置
+  const position = vsEditor?.getPosition();
+  const result = vsEditor?.setValue(values.value);
+  // 恢复光标位置
+  if (position) {
+    vsEditor?.setPosition(position);
+    vsEditor?.focus();
+  }
+  return result;
 };
 
 const getEditorValue = () =>
   (props.type === 'diff' ? vsDiffEditor?.getModifiedEditor().getValue() : vsEditor?.getValue()) || '';
 
+const handleKeyDown = (e: KeyboardEvent) => {
+  if (e.keyCode === 83 && (navigator.platform.match('Mac') ? e.metaKey : e.ctrlKey)) {
+    e.preventDefault();
+    e.stopPropagation();
+    const newValue = getEditorValue();
+    values.value = newValue;
+    emit('save', props.parse ? parseCode(newValue, props.language) : newValue);
+  }
+};
 const init = async () => {
   if (!codeEditorEl.value) return;
 
@@ -149,16 +170,7 @@ const init = async () => {
   setEditorValue(props.initValues, props.modifiedValues);
 
   emit('initd', vsEditor);
-
-  codeEditorEl.value.addEventListener('keydown', (e) => {
-    if (e.keyCode === 83 && (navigator.platform.match('Mac') ? e.metaKey : e.ctrlKey)) {
-      e.preventDefault();
-      e.stopPropagation();
-      const newValue = getEditorValue();
-      values.value = newValue;
-      emit('save', props.parse ? parseCode(newValue, props.language) : newValue);
-    }
-  });
+  codeEditorEl.value.addEventListener('keydown', handleKeyDown);
 
   if (props.type !== 'diff' && props.autoSave) {
     vsEditor?.onDidBlurEditorWidget(() => {
@@ -214,7 +226,9 @@ onBeforeUnmount(() => {
   vsEditor = null;
   vsDiffEditor = null;
 });
-
+onUnmounted(() => {
+  codeEditorEl.value?.removeEventListener('keydown', handleKeyDown);
+});
 const fullScreen = ref(false);
 const fullScreenHandler = () => {
   fullScreen.value = !fullScreen.value;