diff --git a/src/components/Pages/MonacoEditor/index.hook.ts b/src/components/Pages/MonacoEditor/index.hook.ts index ddd3512e..89b5a752 100644 --- a/src/components/Pages/MonacoEditor/index.hook.ts +++ b/src/components/Pages/MonacoEditor/index.hook.ts @@ -1,7 +1,10 @@ import { ref, onBeforeUnmount, nextTick } from 'vue' +import { useDesignStore } from '@/store/modules/designStore/designStore' import * as monaco from 'monaco-editor/esm/vs/editor/editor.api.js' export const useMonacoEditor = (language = 'javascript') => { +const designStore = useDesignStore() + let monacoEditor: monaco.editor.IStandaloneCodeEditor | null = null let initReadOnly = false const el = ref(null) @@ -29,18 +32,29 @@ export const useMonacoEditor = (language = 'javascript') => { // 创建 monacoEditor = monaco.editor.create(el.value, { model: javascriptModel, - minimap: { enabled: true }, - roundedSelection: false, - theme: 'vs-dark', + // 是否启用预览图 + minimap: { enabled: false }, + // 圆角 + roundedSelection: true, + // 主题 + theme: designStore.getDarkTheme ? 'vs-dark' : 'vs', + // 主键 multiCursorModifier: 'ctrlCmd', + // 滚动条 scrollbar: { verticalScrollbarSize: 8, horizontalScrollbarSize: 8 }, + // 行号 + lineNumbers: 'off', + // tab大小 tabSize: 2, - fontSize: 16, //字体大小 - autoIndent: 'advanced', //自动布局 - automaticLayout: true, // 自适应宽高 + //字体大小 + fontSize: 16, + // 控制编辑器在用户键入、粘贴、移动或缩进行时是否应自动调整缩进 + autoIndent: 'advanced', + // 自动布局 + automaticLayout: true, ...editorOption }) diff --git a/src/components/Pages/MonacoEditor/index.vue b/src/components/Pages/MonacoEditor/index.vue index 81d655e0..1a1349ce 100644 --- a/src/components/Pages/MonacoEditor/index.vue +++ b/src/components/Pages/MonacoEditor/index.vue @@ -1,5 +1,5 @@ @@ -65,12 +65,28 @@ watch( diff --git a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMonacoEditor/index.vue b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMonacoEditor/index.vue index 80fe5c97..dd07e151 100644 --- a/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMonacoEditor/index.vue +++ b/src/views/chart/ContentConfigurations/components/ChartData/components/ChartDataMonacoEditor/index.vue @@ -90,7 +90,7 @@ 规则 - 过滤器将对接口返回值的「data」字段进行处理 + 过滤器将对接口返回值的「data」字段进行处理