From ff7f9e1a60f24e5cf5156f0a30bf9bcc5259bd25 Mon Sep 17 00:00:00 2001
From: alan <alan@fanruan.com>
Date: Wed, 8 May 2019 09:43:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=98=BE=E7=A4=BA=E5=A4=9A=E4=B8=AA?=
 =?UTF-8?q?=E9=A9=B1=E5=8A=A8=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  1 +
 .../right/right_edit/right.edit.component.ts  |  6 ++----
 .../right_edit/right.edit.mysql.component.ts  |  6 ++----
 .../right/right_edit/right.edit.service.ts    | 20 +++++++++++++++++++
 src/app/link_set/select/select.service.ts     |  2 ++
 src/ui/type.ts                                |  1 +
 6 files changed, 28 insertions(+), 8 deletions(-)
 create mode 100644 src/app/link_set/right/right_edit/right.edit.service.ts

diff --git a/README.md b/README.md
index 720e0af..e664810 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 # database-connection 数据连接设置页面
 ![start](https://img.shields.io/badge/start-2019%2F04%2F26-blue.svg) ![finui](https://img.shields.io/badge/lib-FinUi-blue.svg)
+
 ## 开始
 下载代码
 
diff --git a/src/app/link_set/right/right_edit/right.edit.component.ts b/src/app/link_set/right/right_edit/right.edit.component.ts
index 48ffa9e..a0bad35 100644
--- a/src/app/link_set/right/right_edit/right.edit.component.ts
+++ b/src/app/link_set/right/right_edit/right.edit.component.ts
@@ -4,6 +4,7 @@ import charset from './right.edit.constant';
 import Model from '../../link-set.model';
 import FormItem from '@shared/components/form.item.component';
 import Title from '@shared/components/title.component';
+import {getDrivers} from './right.edit.service';
 const className = 'fr.component.right.edit';
 const Widget: WidgetType = {
   _store() {
@@ -53,10 +54,7 @@ const Widget: WidgetType = {
                   cls: 'bi-border',
                   width: 300,
                   text: linkSelected.driver,
-                  items: [{
-                    text: linkSelected.driver,
-                    value: linkSelected.driver,
-                  }],
+                  items: getDrivers(linkSelected),
                   listeners: [{
                     eventName: BI.TextValueCombo.EVENT_CHANGE,
                     action() {
diff --git a/src/app/link_set/right/right_edit/right.edit.mysql.component.ts b/src/app/link_set/right/right_edit/right.edit.mysql.component.ts
index 65e391e..7fba51b 100644
--- a/src/app/link_set/right/right_edit/right.edit.mysql.component.ts
+++ b/src/app/link_set/right/right_edit/right.edit.mysql.component.ts
@@ -4,6 +4,7 @@ import charset from './right.edit.constant';
 import Model from '../../link-set.model';
 import FormItem from '@shared/components/form.item.component';
 import Title from '@shared/components/title.component';
+import {getDrivers} from './right.edit.service';
 const className = 'fr.component.right.edit.mysql';
 const Widget: WidgetType = {
   _store() {
@@ -45,10 +46,7 @@ const Widget: WidgetType = {
             cls: 'bi-border',
             width: 300,
             text: linkSelected.driver,
-            items: [{
-              text: linkSelected.driver,
-              value: linkSelected.driver,
-            }],
+            items: getDrivers(linkSelected),
             listeners: [{
               eventName: BI.TextValueCombo.EVENT_CHANGE,
               action() {
diff --git a/src/app/link_set/right/right_edit/right.edit.service.ts b/src/app/link_set/right/right_edit/right.edit.service.ts
new file mode 100644
index 0000000..195ee09
--- /dev/null
+++ b/src/app/link_set/right/right_edit/right.edit.service.ts
@@ -0,0 +1,20 @@
+import {LinkType} from '@ui/type';
+
+export function getDrivers(linkSelected: LinkType): {text: string; value: string}[] {
+  const drivers: {text: string; value: string}[] = [];
+  if (linkSelected.drivers.length > 0) {
+    linkSelected.drivers.forEach(item => {
+      drivers.push({
+        text: item,
+        value: item,
+      });
+    });
+  } else {
+    drivers.push({
+      text: linkSelected.driver,
+      value: linkSelected.driver,
+    });
+  }
+  
+  return drivers;
+}
diff --git a/src/app/link_set/select/select.service.ts b/src/app/link_set/select/select.service.ts
index 72b4f38..40f8e7d 100644
--- a/src/app/link_set/select/select.service.ts
+++ b/src/app/link_set/select/select.service.ts
@@ -65,12 +65,14 @@ export const databaseTyle = [
     text:'MySQL',
     databaseType: 'mysql',
     driver: 'com.mysql.jdbc.Driver',
+    drivers:['com.mysql.jdbc.Driver', 'org.gjt.mm.mysql.Driver'],
     url: 'jdbc:mysql://localhost/dbname',
   },
   {
     text:'其他',
     databaseType: 'other',
     driver: 'org.h2.Driver',
+    drivers:['org.h2.Driver', 'com.fr.third.org.hsqldb.jdbcDriver', 'org.sqlite.JDBC'],
     url: 'jdbc:h2://${ENV_HOME}/../databaseName',
   },
   {
diff --git a/src/ui/type.ts b/src/ui/type.ts
index d682e8b..6927621 100644
--- a/src/ui/type.ts
+++ b/src/ui/type.ts
@@ -3,6 +3,7 @@ export interface LinkType{
   database?: string;
   connectionName?: string;
   driver?: string;
+  drivers?: string[];
   url?: string;
   user?: string;
   password?: string;