@fc-components/monaco-editor 0.1.11 → 0.1.12

package/dist/promql/index.d.ts

@@ -12,7 +12,7 @@ interface PromQLEditorProps {
     disabled?: boolean;
     interpolateString?: (query: string) => string;
     onChange?: (value: string) => void;
-    onShiftEnter?: (value: string) => void;
+    onEnter?: (value: string) => void;
     onBlur?: (value: string) => void;
     editorDidMount?: (editor: monacoTypes.editor.IStandaloneCodeEditor) => void;
 }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.1.11",
+  "version": "0.1.12",
   "license": "MIT",
   "main": "dist/index.js",
   "module": "dist/monaco-editor.esm.js",

package/src/promql/index.tsx

@@ -24,7 +24,7 @@ interface PromQLEditorProps {
   disabled?: boolean;
   interpolateString?: (query: string) => string;
   onChange?: (value: string) => void;
-  onShiftEnter?: (value: string) => void;
+  onEnter?: (value: string) => void;
   onBlur?: (value: string) => void;
   editorDidMount?: (editor: monacoTypes.editor.IStandaloneCodeEditor) => void;
 }
@@ -95,7 +95,7 @@ export default function PromQLEditor(props: PromQLEditorProps & DataProviderPara
     readOnly = false,
     disabled = false,
     onChange,
-    onShiftEnter,
+    onEnter,
     onBlur,
     editorDidMount,
   } = props;
@@ -165,15 +165,45 @@ export default function PromQLEditor(props: PromQLEditorProps & DataProviderPara
       command: null,
     });
 
-    // handle: shift + enter
+    // 设置 Shift + Enter 为在光标位置换行
     editor.addCommand(
       monaco.KeyMod.Shift | monaco.KeyCode.Enter,
       () => {
-        onShiftEnter?.(editor.getValue());
+        // 在光标位置插入换行符
+        const position = editor.getPosition();
+        if (position) {
+          editor.executeEdits('shift-enter', [
+            {
+              range: new monaco.Range(position.lineNumber, position.column, position.lineNumber, position.column),
+              text: '\n',
+            },
+          ]);
+          // 将光标移动到新行
+          editor.setPosition({
+            lineNumber: position.lineNumber + 1,
+            column: 1,
+          });
+        }
       },
       'isEditorFocused' + id,
     );
 
+    // 完全阻止 Enter 键的默认行为（包括换行）
+    monaco.editor.addKeybindingRule({
+      keybinding: monaco.KeyCode.Enter,
+      command: '-',
+      when: '!suggestWidgetVisible',
+    });
+
+    // handle: enter - 只有在没有建议窗口时才执行自定义行为
+    editor.addCommand(
+      monaco.KeyCode.Enter,
+      () => {
+        onEnter?.(editor.getValue());
+      },
+      '!suggestWidgetVisible && isEditorFocused' + id,
+    );
+
     editor.onDidChangeModelContent(() => {
       const model = editor.getModel();
       if (model) {