diff --git a/magic-editor/src/console/src/components/layout/magic-group.vue b/magic-editor/src/console/src/components/layout/magic-group.vue index f2a16d98..8160a7bf 100644 --- a/magic-editor/src/console/src/components/layout/magic-group.vue +++ b/magic-editor/src/console/src/components/layout/magic-group.vue @@ -90,7 +90,8 @@ import MagicInput from '@/components/common/magic-input.vue' import MagicSelect from '@/components/common/magic-select.vue' import request from "@/api/request" import { requestGroup } from '@/scripts/utils.js' -import bus from "@/scripts/bus"; +import bus from "@/scripts/bus" +import contants from "@/scripts/contants.js" export default { name: 'MagicGroup', @@ -128,6 +129,8 @@ export default { mounted() { let map = {} request.send('/options').success(data => { + data = data || [] + data = data.concat(contants.OPTIONS) this.defaultOptions = data&&data.map(e => { let item = {text: e[0], value: e[0], description: e[1], defaultValue: e[2]} this.optionsMap[item.value] = item; diff --git a/magic-editor/src/console/src/components/layout/magic-option.vue b/magic-editor/src/console/src/components/layout/magic-option.vue index e8afb0d3..de8979fc 100644 --- a/magic-editor/src/console/src/components/layout/magic-option.vue +++ b/magic-editor/src/console/src/components/layout/magic-option.vue @@ -35,6 +35,7 @@ import request from '@/api/request.js' import MagicInput from '@/components/common/magic-input.vue' import MagicSelect from '@/components/common/magic-select.vue' +import contants from "@/scripts/contants.js" export default { name: 'MagicOption', @@ -55,6 +56,8 @@ export default { mounted() { let map = {} request.send('/options').success(data => { + data = data || [] + data = data.concat(contants.OPTIONS) this.defaultOptions = data&&data.map(e => { let item = {text: e[0], value: e[0], description: e[1], defaultValue: e[2]} this.optionsMap[item.value] = item; diff --git a/magic-editor/src/console/src/components/magic-editor.vue b/magic-editor/src/console/src/components/magic-editor.vue index 2595bc02..662f4564 100644 --- a/magic-editor/src/console/src/components/magic-editor.vue +++ b/magic-editor/src/console/src/components/magic-editor.vue @@ -114,6 +114,9 @@ export default { }) bus.$on('ws_open', () => bus.$emit('message', 'login', contants.HEADER_MAGIC_TOKEN_VALUE)) contants.DEFAULT_EXPAND = this.config.defaultExpand !== false + contants.JDBC_DRIVERS = this.config.jdbcDrivers || [] + contants.DATASOURCE_TYPES = this.config.datasourceTypes || [] + contants.OPTIONS = this.config.options || [] this.config.version = contants.MAGIC_API_VERSION_TEXT this.config.title = this.config.title || 'magic-api' this.config.themes = this.config.themes || {} diff --git a/magic-editor/src/console/src/components/resources/magic-datasource-list.vue b/magic-editor/src/console/src/components/resources/magic-datasource-list.vue index b82406d2..16e9c149 100644 --- a/magic-editor/src/console/src/components/resources/magic-datasource-list.vue +++ b/magic-editor/src/console/src/components/resources/magic-datasource-list.vue @@ -83,6 +83,7 @@