From 61d662677aacc09204602598f410aa9cc5569afd Mon Sep 17 00:00:00 2001
From: alan <alan@fanruan.com>
Date: Sun, 29 Sep 2019 16:53:49 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20DEC-10147=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=A4=8D=E5=88=B6=E6=95=B0=E6=8D=AE=E8=BF=9E=E6=8E=A5=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/pages/connection/connection.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/modules/pages/connection/connection.ts b/src/modules/pages/connection/connection.ts
index b604354..227579c 100644
--- a/src/modules/pages/connection/connection.ts
+++ b/src/modules/pages/connection/connection.ts
@@ -134,6 +134,10 @@ export class Connection extends BI.Widget {
         };
     }
 
+    mounted() {
+        this.store.setDatebaseTypeSelected('');
+    }
+
     private renderItems() {
         switch (this.model.connectionSelectedOne.connectionType) {
             case connectionType.JDBC:

From a02e38a15908375e6c5fc3e903b5010accc38bff Mon Sep 17 00:00:00 2001
From: alan <alan@fanruan.com>
Date: Sun, 29 Sep 2019 17:04:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20DEC-10165=20=E5=A4=8D=E5=88=B6?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=9E=E6=8E=A5=E6=97=B6=EF=BC=8C=E5=90=8D?=
 =?UTF-8?q?=E5=AD=97=E5=90=8E=E9=9D=A2=E8=87=AA=E5=8A=A8=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=90=8E=E7=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/pages/maintain/forms/form.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/modules/pages/maintain/forms/form.ts b/src/modules/pages/maintain/forms/form.ts
index ffc5d00..e451dbb 100644
--- a/src/modules/pages/maintain/forms/form.ts
+++ b/src/modules/pages/maintain/forms/form.ts
@@ -44,7 +44,7 @@ export class MaintainForm extends BI.Widget {
     render() {
         const formData = BI.clone(this.getFormData());
         if (this.model.isCopy) {
-            formData.connectionName = `${formData.connectionName}-${BI.i18nText('Dec-Dcm_Copy')}`;
+            formData.connectionName = this.getConnectionName(formData.connectionName);
             this.isEdit = false;
         }
         
@@ -175,8 +175,7 @@ export class MaintainForm extends BI.Widget {
         return true;
     }
 
-    private getConnectionName() {
-        const name = BI.i18nText('Dec-Dcm_Data_Connections');
+    private getConnectionName(name = BI.i18nText('Dec-Dcm_Data_Connections')) {
         const connections = this.model.connections.filter(item => item.connectionName.startsWith(name));
         if (connections.length === 0) {
             return name;