vue-devui 1.5.6 → 1.5.7-hotfix.2

package/code-editor/index.es.js

@@ -5498,7 +5498,7 @@ function useCodeEditor(props, ctx) {
     addCommentIcon,
     expandCommentIcon
   } = toRefs(props);
-  let monaco;
+  let monaco2;
   let editor;
   let diffEditor;
   let themeService;
@@ -5537,14 +5537,14 @@ function useCodeEditor(props, ctx) {
   });
   onMounted(async () => {
     if (inBrowser) {
-      monaco = await import("monaco-editor");
+      monaco2 = await import("monaco-editor");
       setCurrentTheme();
       init();
       if (mode.value === "review") {
         nextTick(() => {
           refreshDecorations();
-          refreshOverlayWidgets();
           refreshViewZones();
+          refreshOverlayWidgets();
         });
       }
     }
@@ -5556,15 +5556,15 @@ function useCodeEditor(props, ctx) {
       initDiffEditor();
     }
     if (!options.value["theme"]) {
-      monaco.editor.setTheme(currentTheme);
+      monaco2.editor.setTheme(currentTheme);
     }
     handleAutoHeight();
     setValueEmitter();
   }
   function initNormalEditor() {
     if (!editor) {
-      editor = monaco.editor.create(editorEl.value, options.value);
-      editor.setModel(monaco.editor.createModel(modelValue.value, options.value["language"]));
+      editor = monaco2.editor.create(editorEl.value, options.value);
+      editor.setModel(monaco2.editor.createModel(modelValue.value, options.value["language"]));
       ctx.emit("afterEditorInit", editor);
       if (mode.value === "review") {
         editor.onMouseMove(handleMouseMove);
@@ -5575,10 +5575,10 @@ function useCodeEditor(props, ctx) {
   }
   function initDiffEditor() {
     if (!diffEditor) {
-      diffEditor = monaco.editor.createDiffEditor(editorEl.value, options.value);
+      diffEditor = monaco2.editor.createDiffEditor(editorEl.value, options.value);
       diffEditor.setModel({
-        original: monaco.editor.createModel(originalText.value, options.value["language"]),
-        modified: monaco.editor.createModel(modelValue.value, options.value["language"])
+        original: monaco2.editor.createModel(originalText.value, options.value["language"]),
+        modified: monaco2.editor.createModel(modelValue.value, options.value["language"])
       });
       ctx.emit("afterEditorInit", diffEditor);
     }
@@ -5591,11 +5591,10 @@ function useCodeEditor(props, ctx) {
     }
   }
   function setEditorValue() {
-    var _a;
     if (!editor || !editor.getModel()) {
       return;
     }
-    (_a = editor.getModel().modified) == null ? void 0 : _a.setValue(modelValue.value);
+    editor.getModel().setValue(modelValue.value);
   }
   function setDiffEditorValue() {
     var _a;
@@ -5614,7 +5613,7 @@ function useCodeEditor(props, ctx) {
       currentTheme = themeService && themeService.currentTheme.isDark ? "vs" : "vs-dark";
     }
     if (editor) {
-      monaco.editor.setTheme(currentTheme);
+      monaco2.editor.setTheme(currentTheme);
     }
   }
   function handleAutoHeight() {
@@ -5647,9 +5646,11 @@ function useCodeEditor(props, ctx) {
     const language = options.value.language;
     if (editor) {
       if (mode.value === "normal" || mode.value === "review") {
+        monaco2.editor.setModelLanguage(editor.getModel(), language);
+      } else if (mode.value === "diff") {
         const model = diffEditor.getModel();
-        monaco.editor.setModelLanguage(model.modified, language);
-        monaco.editor.setModelLanguage(model.original, language);
+        monaco2.editor.setModelLanguage(model.modified, language);
+        monaco2.editor.setModelLanguage(model.original, language);
       }
     }
   }
@@ -5663,7 +5664,7 @@ function useCodeEditor(props, ctx) {
   }
   function updateEditorHeightAuto() {
     var _a;
-    const lineHeight = editor.getOption(monaco.editor.EditorOption.lineHeight);
+    const lineHeight = editor.getOption(monaco2.editor.EditorOption.lineHeight);
     const lineCount = ((_a = editor.getModel()) == null ? void 0 : _a.getLineCount()) || 1;
     const height = editor.getTopForLineNumber(lineCount + 1) + lineHeight;
     if (editorEl.value) {
@@ -5677,8 +5678,8 @@ function useCodeEditor(props, ctx) {
       if (!isDecorationExisted(currentLineNumber)) {
         const lineDecoration = [
           {
-            range: new monaco.Range(currentLineNumber, 0, currentLineNumber, 0),
-            option: {
+            range: new monaco2.Range(currentLineNumber, 0, currentLineNumber, 0),
+            options: {
               isWholeLine: true,
               glyphMarginClassName: `icon-pointer ${addCommentIcon.value}`
             }
@@ -5704,12 +5705,12 @@ function useCodeEditor(props, ctx) {
       setTimeout(() => {
         currentDecorations = editor.deltaDecorations(currentDecorations, tempDecorations);
       });
-      currentDecorations = editor.deltaDecorations(currentLineDecoration, []);
+      currentLineDecoration = editor.deltaDecorations(currentLineDecoration, []);
     }
   }
   function setDecorations(decoration) {
     return {
-      range: new monaco.Range(decoration.lineNumber, 1, decoration.lineNumber, 1),
+      range: new monaco2.Range(decoration.lineNumber, 1, decoration.lineNumber, 1),
       options: {
         isWholeLine: true,
         className: decoration.customClasses || "",
@@ -5749,7 +5750,7 @@ function useCodeEditor(props, ctx) {
           heightInPx: comment.heightInPx ? comment.heightInPx : 0,
           afterColumn: 1,
           domNode: document.createElement("div"),
-          ondomNodeTop: (top) => {
+          onDomNodeTop: (top) => {
             layoutOverlayWidget(comment.lineNumber, { top });
           },
           onComputedHeight: (height) => {
@@ -5772,7 +5773,7 @@ function useCodeEditor(props, ctx) {
   }
   function calculateLayoutInfo(positionInfos, editorLayoutInfo, index2) {
     let _offsetLeft = 0;
-    const indexOffsetLeft = comments.value[index2].offserLeft;
+    const indexOffsetLeft = comments.value[index2].offsetLeft;
     if (indexOffsetLeft) {
       _offsetLeft = indexOffsetLeft;
     } else {
@@ -5785,8 +5786,8 @@ function useCodeEditor(props, ctx) {
       offsetLeft: _offsetLeft
     };
   }
-  function handleDomNodePosition(top, hieght, index2) {
-    comments.value[index2].domNode.style.height = `${hieght}px`;
+  function handleDomNodePosition(top, height, index2) {
+    comments.value[index2].domNode.style.height = `${height}px`;
     if (heightMap.get(index2) === 0) {
       comments.value[index2].domNode.style.top = `-${1e4 + top}px`;
     } else {
@@ -5863,11 +5864,26 @@ var CodeEditor = defineComponent({
     }, null);
   }
 });
+let monaco;
+const CodeHighlightDirective = {
+  async mounted(el) {
+    if (inBrowser) {
+      monaco = await import("monaco-editor");
+      monaco.editor.colorizeElement(el);
+    }
+  },
+  updated(el) {
+    if (inBrowser) {
+      monaco.editor.colorizeElement(el);
+    }
+  }
+};
 var index = {
   title: "Code Editor \u4EE3\u7801\u7F16\u8F91\u5668",
   category: "\u6F14\u8FDB\u4E2D",
   status: "100%",
   install(app) {
+    app.directive("d-code-highlight", CodeHighlightDirective);
     app.component(CodeEditor.name, CodeEditor);
   }
 };