@fc-components/monaco-editor 0.1.11 → 0.1.13

package/README.md

@@ -40,8 +40,8 @@ const App = () => {
           // Interpolate variables in the query string
           return query.replace(/\$__interval/g, '10s');
         }}
-        onShiftEnter={(value) => {
-          console.log('Shift+Enter pressed, current value:', value);
+        onEnter={(value) => {
+          console.log('Enter pressed, current value:', value);
         }}
         onBlur={(value) => {
           console.log('Editor lost focus, current value:', value);

package/dist/monaco-editor.cjs.development.js

@@ -2012,7 +2012,7 @@ function PromQLEditor(props) {
     _props$disabled = props.disabled,
     disabled = _props$disabled === void 0 ? false : _props$disabled,
     onChange = props.onChange,
-    onShiftEnter = props.onShiftEnter,
+    onEnter = props.onEnter,
     onBlur = props.onBlur,
     editorDidMount = props.editorDidMount;
   var autocompleteDisposeFun = React.useRef(null);
@@ -2076,10 +2076,32 @@ function PromQLEditor(props) {
       keybinding: monaco.KeyMod.CtrlCmd | monaco.KeyCode.KeyF,
       command: null
     });
-    // handle: shift + enter
+    // 设置 Shift + Enter 为在光标位置换行
     editor.addCommand(monaco.KeyMod.Shift | monaco.KeyCode.Enter, function () {
-      onShiftEnter == null || onShiftEnter(editor.getValue());
+      // 在光标位置插入换行符
+      var 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, function () {
+      onEnter == null || onEnter(editor.getValue());
+    }, '!suggestWidgetVisible && isEditorFocused' + id);
     editor.onDidChangeModelContent(function () {
       var model = editor.getModel();
       if (model) {
@@ -2225,7 +2247,11 @@ function PromQLEditor(props) {
       },
       scrollBeyondLastLine: false,
       suggest: {
-        showWords: false
+        showWords: false,
+        // 防止补全层自动关闭的关键配置
+        filterGraceful: false,
+        snippetsPreventQuickSuggestions: false,
+        shareSuggestSelections: false
       },
       suggestFontSize: 12,
       wordWrap: 'on',