From 1b6c352f2cf781a791c4ac28be8ffcc509728156 Mon Sep 17 00:00:00 2001
From: mxd <838425805@qq.com>
Date: Fri, 10 Sep 2021 19:44:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AF=E9=85=8D=E7=BD=AE=E9=A9=B1=E5=8A=A8?=
 =?UTF-8?q?=E7=B1=BB=E3=80=81=E6=95=B0=E6=8D=AE=E6=BA=90=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E3=80=81=E6=8E=A5=E5=8F=A3=E9=80=89=E9=A1=B9=E3=80=81=E5=88=86?=
 =?UTF-8?q?=E7=BB=84=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/console/src/components/layout/magic-group.vue        | 5 ++++-
 .../src/console/src/components/layout/magic-option.vue       | 3 +++
 magic-editor/src/console/src/components/magic-editor.vue     | 3 +++
 .../src/components/resources/magic-datasource-list.vue       | 3 +++
 magic-editor/src/console/src/scripts/contants.js             | 3 +++
 5 files changed, 16 insertions(+), 1 deletion(-)

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 @@
 <script>
 import bus from '@/scripts/bus.js'
 import request from '@/api/request.js'
+import contants from "@/scripts/contants.js"
 import MagicDialog from '@/components/common/modal/magic-dialog.vue'
 import MagicInput from '@/components/common/magic-input.vue'
 import {formatJson, isVisible, replaceURL} from '@/scripts/utils.js'
@@ -121,12 +122,14 @@ export default {
           'org.postgresql.Driver',
           'com.microsoft.sqlserver.jdbc.SQLServerDriver',
           'com.ibm.db2.jcc.DB2Driver',
+          ...contants.JDBC_DRIVERS
       ].map(it => { return {text: it, value: it} }),
       datasourceTypes: [
           'com.zaxxer.hikari.HikariDataSource',
           'com.alibaba.druid.pool.DruidDataSource',
           'org.apache.tomcat.jdbc.pool.DataSource',
           'org.apache.commons.dbcp2.BasicDataSource',
+          ...contants.DATASOURCE_TYPES
       ].map(it => { return {text: it, value: it} }),
       editor: null,
       // 是否展示loading
diff --git a/magic-editor/src/console/src/scripts/contants.js b/magic-editor/src/console/src/scripts/contants.js
index 7cd5f075..878880cd 100644
--- a/magic-editor/src/console/src/scripts/contants.js
+++ b/magic-editor/src/console/src/scripts/contants.js
@@ -22,6 +22,9 @@ const contants = {
   RESPONSE_CODE_SCRIPT_ERROR: -1000,
   RESPONSE_NO_PERMISSION: -10,
   DEFAULT_EXPAND: true,
+  JDBC_DRIVERS: [],
+  DATASOURCE_TYPES: [],
+  OPTIONS: [],
   config: {}
 }