From dcf957494c6cbef6781ca8dbf582a997cc3ed759 Mon Sep 17 00:00:00 2001
From: alan <alan@fanruan.com>
Date: Tue, 27 Aug 2019 17:36:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20BI-50517=20=E6=B5=8B=E8=AF=95=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5=E6=97=B6=E4=BC=A0=E6=97=A7=E7=9A=84name=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=BAid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/constants/constant.ts        | 4 ++--
 src/modules/crud/decision.api.ts         | 1 -
 src/modules/pages/maintain/forms/form.ts | 6 +++++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/modules/constants/constant.ts b/src/modules/constants/constant.ts
index a8be020..7304cb0 100644
--- a/src/modules/constants/constant.ts
+++ b/src/modules/constants/constant.ts
@@ -25,7 +25,7 @@ export const DATA_BASE_TYPES_OTHER =
     commonly: false,
     internal: false,
     type: 'jdbc',
-    hasSchema: false,
+    hasSchema: true,
     kerberos: false,
 };
 export const DATA_BASE_TYPES = [
@@ -396,7 +396,7 @@ export const DATA_BASE_TYPES = [
         commonly: false,
         internal: false,
         type: 'jdbc',
-        hasSchema: false,
+        hasSchema: true,
         kerberos: false,
     },
     ...BI.Constants.getConstant(CONSTANT_PLUGIN_TYPES).map(item => {
diff --git a/src/modules/crud/decision.api.ts b/src/modules/crud/decision.api.ts
index ba31495..e4b2fe3 100644
--- a/src/modules/crud/decision.api.ts
+++ b/src/modules/crud/decision.api.ts
@@ -38,7 +38,6 @@ export class DecisionApi implements Api {
     testConnection(data: Connection): Promise<TestRequest> {
         const form = {
             ...data,
-            connectionId: data.connectionName,
             connectionData : JSON.stringify(data.connectionData),
         };
         
diff --git a/src/modules/pages/maintain/forms/form.ts b/src/modules/pages/maintain/forms/form.ts
index 73d6ed3..c735242 100644
--- a/src/modules/pages/maintain/forms/form.ts
+++ b/src/modules/pages/maintain/forms/form.ts
@@ -41,7 +41,11 @@ export class MaintainForm extends BI.Widget {
             }
             const id = BI.UUID();
             const testConnection = () => {
-                this.store.testConnection(this.form.getSubmitValue()).then(re => {
+                const formValue = this.form.getSubmitValue();
+                if (this.isEdit) {
+                    formValue.connectionId = this.connectionName;
+                }
+                this.store.testConnection(formValue).then(re => {
                     if (re && re.errorCode) {
                         this.testStatus.setFail(re.errorMsg);
                     } else if (re.data) {