From b2653adda5543949e27560f40c0d1011874e95b0 Mon Sep 17 00:00:00 2001 From: JiangQiming <291854119@qq.com> Date: Thu, 16 Feb 2023 14:03:46 +0800 Subject: [PATCH] =?UTF-8?q?update:=20=E4=BB=A3=E7=A0=81=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=99=A8=E6=94=AF=E6=8C=81=E8=84=9A=E6=9C=AC=E8=AF=AD=E8=A8=80?= =?UTF-8?q?=E8=BE=93=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/MonacoEditor/index.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/components/MonacoEditor/index.vue b/src/components/MonacoEditor/index.vue index 9b8b725c..6762be92 100644 --- a/src/components/MonacoEditor/index.vue +++ b/src/components/MonacoEditor/index.vue @@ -13,7 +13,7 @@ import htmlWorker from 'monaco-editor/esm/vs/language/html/html.worker?worker'; import tsWorker from 'monaco-editor/esm/vs/language/typescript/ts.worker?worker'; self.MonacoEnvironment = { - getWorker(workerId, label) { + getWorker(_, label) { if (label === 'json') { return new jsonWorker(); } @@ -23,7 +23,7 @@ self.MonacoEnvironment = { if (label === 'html') { return new htmlWorker(); } - if (label === 'ts') { + if (['typescript', 'javascript'].includes(label)) { return new tsWorker(); } return new editorWorker(); @@ -33,6 +33,7 @@ self.MonacoEnvironment = { const props = defineProps({ modelValue: [String, Number], theme: { type: String, default: 'vs-dark' }, + language: { type: String, default: 'json' }, }); const emit = defineEmits(['update:modelValue']); @@ -42,10 +43,10 @@ const dom = ref(); let instance; onMounted(() => { - const jsonModel = monaco.editor.createModel(props.modelValue, 'json'); + const _model = monaco.editor.createModel(props.modelValue, props.language); instance = monaco.editor.create(dom.value, { - model: jsonModel, + model: _model, tabSize: 2, automaticLayout: true, scrollBeyondLastLine: false,