From 08a535c91a718b11441994b4592645f24b2484f7 Mon Sep 17 00:00:00 2001
From: alan <alan@fanruan.com>
Date: Tue, 3 Sep 2019 16:23:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20KERNEL-1209=20jndiname=20=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=20jndiName?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/constants/constant.ts                      |  2 +-
 src/modules/crud/crud.typings.d.ts                     |  2 +-
 .../connection/connection_jndi/connection_jndi.ts      |  4 ++--
 .../pages/maintain/forms/components/form.jndi.ts       | 10 +++++-----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/modules/constants/constant.ts b/src/modules/constants/constant.ts
index f0480fc..5ad38ac 100644
--- a/src/modules/constants/constant.ts
+++ b/src/modules/constants/constant.ts
@@ -456,7 +456,7 @@ export const TEST_STATUS = {
 };
 
 export const DEFAULT_JNDI_DATA = {
-    jndiname: '',
+    jndiName: '',
     originalCharsetName: '',
     newCharsetName: '',
     contextHashtable: {
diff --git a/src/modules/crud/crud.typings.d.ts b/src/modules/crud/crud.typings.d.ts
index fef47b3..2b9d8c4 100644
--- a/src/modules/crud/crud.typings.d.ts
+++ b/src/modules/crud/crud.typings.d.ts
@@ -158,7 +158,7 @@ export interface ConnectionPoolJDBC {
 }
 
 export interface ConnectionJNDI {
-    jndiname: string;
+    jndiName: string;
     /**
      * 编码
      */
diff --git a/src/modules/pages/connection/connection_jndi/connection_jndi.ts b/src/modules/pages/connection/connection_jndi/connection_jndi.ts
index 7e97d23..deb2bc7 100644
--- a/src/modules/pages/connection/connection_jndi/connection_jndi.ts
+++ b/src/modules/pages/connection/connection_jndi/connection_jndi.ts
@@ -15,7 +15,7 @@ export class ConnectionJdbc extends BI.Widget {
 
     render() {
         const connectionData = this.model.connectionSelectedOne.connectionData as ConnectionJNDI;
-        const { jndiname, contextHashtable, originalCharsetName } = connectionData;
+        const { jndiName, contextHashtable, originalCharsetName } = connectionData;
         
         return {
             type: Vertical,
@@ -26,7 +26,7 @@ export class ConnectionJdbc extends BI.Widget {
                     type: FormItemXtype,
                     nameWidth: 200,
                     name: BI.i18nText('Dec-Dcm_Connection_JNDI_Form_ConnectionName'),
-                    value: jndiname,
+                    value: jndiName,
                 },
                 {
                     type: Htape,
diff --git a/src/modules/pages/maintain/forms/components/form.jndi.ts b/src/modules/pages/maintain/forms/components/form.jndi.ts
index d1a65ce..49f0600 100644
--- a/src/modules/pages/maintain/forms/components/form.jndi.ts
+++ b/src/modules/pages/maintain/forms/components/form.jndi.ts
@@ -15,7 +15,7 @@ export class FormJndi extends BI.Widget {
     testStatus: any;
     form = {
         connectionName: null,
-        jndiname: null,
+        jndiName: null,
         initial: null,
         providerUrl: null,
         securityPrincipal: null,
@@ -36,7 +36,7 @@ export class FormJndi extends BI.Widget {
 
     render() {
         const { connectionName, connectionData } = this.options.formData;
-        const { jndiname, newCharsetName, contextHashtable } = connectionData as ConnectionJNDI;
+        const { jndiName, newCharsetName, contextHashtable } = connectionData as ConnectionJNDI;
         
         return {
             type: Vertical,
@@ -64,9 +64,9 @@ export class FormJndi extends BI.Widget {
                         type: TextEditor,
                         width: 300,
                         allowBlank: true,
-                        value: jndiname,
+                        value: jndiName,
                         ref: (_ref: any) => {
-                            this.form.jndiname = _ref;
+                            this.form.jndiName = _ref;
                         },
                     }],
                 },
@@ -383,7 +383,7 @@ export class FormJndi extends BI.Widget {
             connectionName: this.form.connectionName.getValue(),
             connectionType: connectionType.JNDI,
             connectionData: {
-                jndiname: this.form.jndiname.getValue(),
+                jndiName: this.form.jndiName.getValue(),
                 newCharsetName: this.form.newCharsetName.getValue()[0] || '',
                 originalCharsetName: this.form.newCharsetName.getValue()[0] || '',
                 creator: Dec ? Dec.personal.username : '',