Ver código fonte

支持设置字体和字号

mxd 3 anos atrás
pai
commit
7fce21d63c

+ 3 - 0
magic-editor/src/console/src/components/editor/magic-history.vue

@@ -19,6 +19,7 @@ import * as monaco from 'monaco-editor'
 import bus from '@/scripts/bus.js'
 import {formatDate, isVisible} from '@/scripts/utils.js'
 import request from '@/api/request.js'
+import contants from "@/scripts/contants";
 
 export default {
   name: 'MagicHistory',
@@ -43,6 +44,8 @@ export default {
       folding: false,
       lineDecorationsWidth: 20,
       fixedOverflowWidgets: false,
+      fontFamily: contants.EDITOR_FONT_FAMILY,
+      fontSize: contants.EDITOR_FONT_SIZE,
     })
     bus.$on('update-window-size', this.layout)
   },

+ 2 - 0
magic-editor/src/console/src/components/editor/magic-script-editor.vue

@@ -109,6 +109,8 @@ export default {
       lineDecorationsWidth: 35,
       wordWrap: 'on',
       theme: store.get('skin') || 'default',
+      fontFamily: contants.EDITOR_FONT_FAMILY,
+      fontSize: contants.EDITOR_FONT_SIZE,
       // 自动调整大小
       automaticLayout: true
     })

+ 3 - 0
magic-editor/src/console/src/components/layout/magic-request.vue

@@ -188,6 +188,7 @@
   import bus from '@/scripts/bus.js'
   import store from '@/scripts/store.js'
   import {parseJson} from '@/scripts/parsing/parser.js'
+  import contants from "@/scripts/contants";
   let timeout = null;
   export default {
     name: 'MagicRequest',
@@ -345,6 +346,8 @@
             folding: true,
             wordWrap: 'on',
             lineDecorationsWidth: 35,
+            fontFamily: contants.EDITOR_FONT_FAMILY,
+            fontSize: contants.EDITOR_FONT_SIZE,
             theme: store.get('skin') || 'default',
             value: formatJson(this.info.requestBody) || '{\r\n\t\r\n}'
           })

+ 3 - 0
magic-editor/src/console/src/components/layout/magic-run.vue

@@ -19,6 +19,7 @@ import * as monaco from 'monaco-editor'
 import store from '@/scripts/store.js'
 import {isVisible, deepClone, download as downloadFile} from '@/scripts/utils.js'
 import {parseJson} from '@/scripts/parsing/parser.js'
+import contants from "@/scripts/contants";
 
 export default {
   name: 'MagicRun',
@@ -92,6 +93,8 @@ export default {
         readOnly: true, //只读模式
         lineDecorationsWidth: 35,
         wordWrap: 'on',
+        fontFamily: contants.EDITOR_FONT_FAMILY,
+        fontSize: contants.EDITOR_FONT_SIZE,
         value: this.info.responseBody || '',
         theme: store.get('skin') || 'default'
       })

+ 3 - 0
magic-editor/src/console/src/components/layout/magic-search.vue

@@ -35,6 +35,7 @@ import request from '@/api/request.js'
 import bus from '@/scripts/bus.js'
 import { TokenizationRegistry } from 'monaco-editor/esm/vs/editor/common/modes.js'
 import { tokenizeToString } from 'monaco-editor/esm/vs/editor/common/modes/textToHtmlTokenizer.js'
+import contants from "@/scripts/contants";
 export default {
   name: 'MagicSearch',
   components: {
@@ -76,6 +77,8 @@ export default {
           wordWrap: 'on',
           readOnly: true,
           scrollBeyondLastLine: false,
+          fontFamily: contants.EDITOR_FONT_FAMILY,
+          fontSize: contants.EDITOR_FONT_SIZE,
           theme: store.get('skin') || 'default'
         })
       }

+ 6 - 0
magic-editor/src/console/src/components/magic-editor.vue

@@ -117,6 +117,12 @@ export default {
     contants.JDBC_DRIVERS = this.config.jdbcDrivers || []
     contants.DATASOURCE_TYPES = this.config.datasourceTypes || []
     contants.OPTIONS = this.config.options || []
+    if(this.config.editorFontFamily !== undefined){
+      contants.EDITOR_FONT_FAMILY = this.config.editorFontFamily
+    }
+    if(this.config.editorFontSize !== undefined){
+      contants.EDITOR_FONT_SIZE = this.config.editorFontSize
+    }
     this.config.version = contants.MAGIC_API_VERSION_TEXT
     this.config.title = this.config.title || 'magic-api'
     this.config.themes = this.config.themes || {}

+ 2 - 0
magic-editor/src/console/src/components/resources/magic-datasource-list.vue

@@ -313,6 +313,8 @@ export default {
             fixedOverflowWidgets: true,
             folding: true,
             wordWrap: 'on',
+            fontFamily: contants.EDITOR_FONT_FAMILY,
+            fontSize: contants.EDITOR_FONT_SIZE,
             theme: store.get('skin') || 'default',
             value: formatJson(temp) || '{\r\n\t\r\n}'
           })

+ 2 - 0
magic-editor/src/console/src/scripts/contants.js

@@ -25,6 +25,8 @@ const contants = {
   JDBC_DRIVERS: [],
   DATASOURCE_TYPES: [],
   OPTIONS: [],
+  EDITOR_FONT_FAMILY: 'Consolas, "Courier New", monospace',
+  EDITOR_FONT_SIZE: 14,
   config: {}
 }