From c3068364e833a6e181141d698d69f6e383619405 Mon Sep 17 00:00:00 2001 From: VTem <1774116123@qq.com> Date: Sun, 16 Jun 2024 22:29:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../editor-monaco/components/monaco.vue | 23 ++++++++----- src/plugins/editor-monaco/config.ts | 14 ++++---- src/plugins/editor-monaco/utils/config.ts | 19 ++++++++--- src/plugins/editor-monaco/utils/declare.ts | 33 +++++++++++++++++-- src/plugins/editor-monaco/utils/format.ts | 4 +-- src/plugins/editor-monaco/utils/types.ts | 29 ---------------- 6 files changed, 68 insertions(+), 54 deletions(-) delete mode 100644 src/plugins/editor-monaco/utils/types.ts diff --git a/src/plugins/editor-monaco/components/monaco.vue b/src/plugins/editor-monaco/components/monaco.vue index efb256e..1a9848d 100644 --- a/src/plugins/editor-monaco/components/monaco.vue +++ b/src/plugins/editor-monaco/components/monaco.vue @@ -2,7 +2,8 @@
.cl-editor-monaco { - border: 1px solid var(--el-border-color); box-sizing: border-box; min-height: 100px; + + :deep(.monaco-editor) { + outline-width: 0; + } + + &.border { + border: 1px solid var(--el-border-color); + } } diff --git a/src/plugins/editor-monaco/config.ts b/src/plugins/editor-monaco/config.ts index 8391f8c..50e440e 100644 --- a/src/plugins/editor-monaco/config.ts +++ b/src/plugins/editor-monaco/config.ts @@ -1,12 +1,12 @@ -import type { ModuleConfig } from "/@/cool"; +import { ModuleConfig } from "/@/cool"; export default (): ModuleConfig => { return { label: "代码编辑器", - description: "基于 monaco 封装的代码编辑器", // https://www.npmjs.com/package/monaco-editor + description: "基于 monaco 封装的代码编辑器", author: "COOL", - version: "1.0.1", - updateTime: "2024-02-04", + version: "1.1.0", + updateTime: "2024-06-01", demo: [ { name: "基础用法", @@ -14,7 +14,9 @@ export default (): ModuleConfig => { } ], - // 组件依赖过大，如不需求请注释以下代码 - components: [() => import("./components/monaco.vue")] + components: [ + // 代码编辑器 https://www.npmjs.com/package/monaco-editor + () => import("./components/monaco.vue") + ] }; }; diff --git a/src/plugins/editor-monaco/utils/config.ts b/src/plugins/editor-monaco/utils/config.ts index d02c668..dfc3d01 100644 --- a/src/plugins/editor-monaco/utils/config.ts +++ b/src/plugins/editor-monaco/utils/config.ts @@ -3,14 +3,23 @@ import { languages } from "monaco-editor"; languages.typescript.typescriptDefaults.setEagerModelSync(true); languages.typescript.typescriptDefaults.setCompilerOptions({ - target: languages.typescript.ScriptTarget.ES2016, + target: languages.typescript.ScriptTarget.ES2018, allowNonTsExtensions: true, - moduleResolution: languages.typescript.ModuleResolutionKind.NodeJs, - module: languages.typescript.ModuleKind.CommonJS, experimentalDecorators: true, + jsx: languages.typescript.JsxEmit.Preserve, + esModuleInterop: true, noEmit: true, - allowJs: false, - typeRoots: ["node_modules/@types"] + allowSyntheticDefaultImports: true, + noImplicitAny: false, + emitDecoratorMetadata: true, + inlineSourceMap: true, + noImplicitThis: true, + noUnusedLocals: false, + stripInternal: true, + skipLibCheck: true, + resolveJsonModule: true, + pretty: true, + declaration: true }); languages.typescript.typescriptDefaults.setDiagnosticsOptions({ diff --git a/src/plugins/editor-monaco/utils/declare.ts b/src/plugins/editor-monaco/utils/declare.ts index fd2e89e..08d437b 100644 --- a/src/plugins/editor-monaco/utils/declare.ts +++ b/src/plugins/editor-monaco/utils/declare.ts @@ -1,5 +1,32 @@ -export let Declares = ``; +import { languages } from "monaco-editor"; +import { keys } from "lodash-es"; -export function addDeclare(content: string) { - Declares += content; +export function addDeclare({ path, content }: { path: string; content: string }) { + const defaults = languages.typescript.typescriptDefaults; + + const filePath = `file:///node_modules/${path}`; + const loaded = defaults.getExtraLibs(); + const libs = keys(loaded).map((e) => { + return { + filePath: e, + content: loaded[e].content + }; + }); + + const item = libs.find((e) => e.filePath.includes(path)); + try { + if (item) { + item.content = content; + defaults.setExtraLibs(libs); + } else { + defaults.addExtraLib(content, filePath); + } + } catch (err) { + console.error(err); + } +} + +export function clearDeclare() { + const defaults = languages.typescript.typescriptDefaults; + defaults.setExtraLibs([]); } diff --git a/src/plugins/editor-monaco/utils/format.ts b/src/plugins/editor-monaco/utils/format.ts index 02122e6..a82cd1e 100644 --- a/src/plugins/editor-monaco/utils/format.ts +++ b/src/plugins/editor-monaco/utils/format.ts @@ -42,9 +42,7 @@ export function useFormat() { singleQuote: true, trailingComma: "none" }); - } catch (e) { - console.error("代码格式化失败", e); - } + } catch (err) {} return [ { diff --git a/src/plugins/editor-monaco/utils/types.ts b/src/plugins/editor-monaco/utils/types.ts deleted file mode 100644 index 4d24206..0000000 --- a/src/plugins/editor-monaco/utils/types.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { languages } from "monaco-editor"; -import { Declares } from "./declare"; - -export function addExtraLib({ path, content }: { path: string; content: string }) { - const fullpath = `file:///node_modules/${path}`; - const defaults = languages.typescript.typescriptDefaults; - - const loaded = defaults.getExtraLibs(); - const keys = Object.keys(loaded); - - if (!keys.includes(fullpath)) { - try { - defaults.addExtraLib(content, fullpath); - } catch (error) { - console.log(error, fullpath, keys); - throw error; - } - } -} - -export function useTypes() { - function loadDeclares() { - addExtraLib({ path: "globals.d.ts", content: Declares }); - } - - return { - loadDeclares - }; -}