@fc-components/monaco-editor 0.1.1 → 0.1.2

package/README.md

@@ -5,23 +5,33 @@ import { PromQLMonacoEditor } from '@fc-components/monaco-editor';
 
 const App = () => {
   return (
-    <div>
-      <PromQLMonacoEditor
-        height="500px"
-        apiPrefix="/api/n9e/proxy/1/api/v1"
-        fetchFn={(resource, options: any) => {
-          const params = options.body?.toString();
-          const search = params ? `?${params}` : '';
-          return fetch(resource + search, {
-            method: 'Get',
-            headers: new Headers({
-              Authorization: `Bearer ${localStorage.getItem('access_token') ||
-                ''}`,
-            }),
-          });
-        }}
-      />
-    </div>
+    <PromQLMonacoEditor
+      theme='light'
+      size='middle'
+      placeholder='请输入PromQL查询语句'
+      variablesNames={['$job', '$instance']}
+      apiPrefix='/api/n9e/proxy/1/api/v1'
+      request={(resource, options) => {
+        const params = options?.body?.toString();
+        const search = params ? `?${params}` : '';
+        return fetch(resource + search, {
+          method: 'Get',
+          headers: new Headers({
+            Authorization: `Bearer ${localStorage.getItem('access_token') || ''}`,
+          }),
+        });
+      }}
+      interpolateString={(query) => {
+        // Example interpolation function
+        return query.replace(/\$__interval/g, '10s');
+      }}
+      onShiftEnter={(value) => {
+        console.log('Shift+Enter pressed, current value:', value);
+      }}
+      onBlur={(value) => {
+        console.log('Editor lost focus, current value:', value);
+      }}
+    />
   );
 };
 

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

@@ -862,7 +862,7 @@ function makeSelector(metricName, labels, labelName) {
   var allLabelTexts = allLabels.map(function (label) {
     return "" + label.name + label.op + "\"" + escapeLabelValueInExactSelector(label.value) + "\"";
   });
-  return "{" + allLabelTexts.join(',') + "}";
+  return metricName + "{" + allLabelTexts.join(',') + "}";
 }
 
 var DEFAULT_SERIES_LIMIT = '40000';
@@ -1989,6 +1989,8 @@ function PromQLEditor(props) {
     value = props.value,
     placeholder = props.placeholder,
     interpolateString = props.interpolateString,
+    _props$enableAutocomp = props.enableAutocomplete,
+    enableAutocomplete = _props$enableAutocomp === void 0 ? true : _props$enableAutocomp,
     onChange = props.onChange,
     onShiftEnter = props.onShiftEnter,
     onBlur = props.onBlur;
@@ -2036,21 +2038,23 @@ function PromQLEditor(props) {
     });
     dataProviderRef.current = dataProvider;
     dataProvider.start();
-    var completionProvider = getCompletionProvider(monaco, dataProvider);
-    var filteringCompletionProvider = _extends({}, completionProvider, {
-      provideCompletionItems: function provideCompletionItems(model, position, context, token) {
-        var _editor$getModel;
-        if (((_editor$getModel = editor.getModel()) == null ? void 0 : _editor$getModel.id) !== model.id) {
-          return {
-            suggestions: []
-          };
+    if (enableAutocomplete) {
+      var completionProvider = getCompletionProvider(monaco, dataProvider);
+      var filteringCompletionProvider = _extends({}, completionProvider, {
+        provideCompletionItems: function provideCompletionItems(model, position, context, token) {
+          var _editor$getModel;
+          if (((_editor$getModel = editor.getModel()) == null ? void 0 : _editor$getModel.id) !== model.id) {
+            return {
+              suggestions: []
+            };
+          }
+          return completionProvider.provideCompletionItems(model, position, context, token);
         }
-        return completionProvider.provideCompletionItems(model, position, context, token);
-      }
-    });
-    var _monaco$languages$reg = monaco.languages.registerCompletionItemProvider(PROMQL_LANG_ID, filteringCompletionProvider),
-      dispose = _monaco$languages$reg.dispose;
-    autocompleteDisposeFun.current = dispose;
+      });
+      var _monaco$languages$reg = monaco.languages.registerCompletionItemProvider(PROMQL_LANG_ID, filteringCompletionProvider),
+        dispose = _monaco$languages$reg.dispose;
+      autocompleteDisposeFun.current = dispose;
+    }
     var updateElementHeight = function updateElementHeight() {
       var containerDiv = containerRef.current;
       if (containerDiv !== null) {
@@ -2073,7 +2077,6 @@ function PromQLEditor(props) {
     });
     // handle: shift + enter
     editor.addCommand(monaco.KeyMod.Shift | monaco.KeyCode.Enter, function () {
-      console.log(22222);
       onShiftEnter == null || onShiftEnter(editor.getValue());
     }, 'isEditorFocused' + id);
     if (placeholder) {