Merge pull request #103 in DEC/decision-webui-dcm from ~ALAN/decision-webui-dcm:feature/10.0 to feature/10.0

* commit 'b76f3af094eb1027e9a47141b898d8f0b1161419':
  fix: DEC-10152 修改factory时自动修改url

src/modules/constants/constant.ts

@@ -684,9 +684,23 @@ export const CONNECTION_LAYOUT = {
 
 
 export const JNDI_FACTORYS = [
-    'weblogic.jndi.WLInitialContextFactory',
-    'com.ibm.websphere.naming.WsnInitialContextFactory',
-    'org.jboss.naming.HttpNamingContextFactory',
-    'org.jnp.interfaces.NamingContextFactory',
-    'com.caucho.burlap.BurlapContextFactory',
+    {
+        factory:'',
+        url: '',
+    }, {
+        factory:'weblogic.jndi.WLInitialContextFactory',
+        url: 't3://localhost:7001',
+    }, {
+        factory: 'com.ibm.websphere.naming.WsnInitialContextFactory',
+        url: 'iiop://localhost:2809',
+    }, {
+        factory: 'org.jboss.naming.HttpNamingContextFactory',
+        url: 'http://jboss_server_address:8080/invoker/JNDIFactory',
+    }, {
+        factory: 'org.jnp.interfaces.NamingContextFactory',
+        url: 'localhost:1099',
+    }, {
+        factory: 'com.caucho.burlap.BurlapContextFactory',
+        url: 'http://localhost:8080/hello/burlap',
+    },
 ];

src/modules/pages/maintain/forms/components/form.jndi.ts

@@ -1,5 +1,5 @@
 import { shortcut } from '@core/core';
-import { Vertical, TextEditor, Htape, Left, Label, TextValueCombo } from 'ui';
+import { Vertical, TextEditor, Htape, Left, Label, TextValueCombo, EdirotIconCheckCombo } from 'ui';
 import { FormItemXtype } from '../../components/form_item/form_item';
 import { ConnectionJNDI, Connection, ContextHashtable } from 'src/modules/crud/crud.typings';
 import { CONNECT_CHARSET, CONNECTION_LAYOUT, JNDI_FACTORYS } from '@constants/constant';
@@ -99,7 +99,7 @@ export class FormJndi extends BI.Widget {
                                     name: 'INTIAL_CONTEXT_FACTORY',
                                     nameWidth: 200,
                                     forms: [{
-                                        type: TextValueCombo,
+                                        type: EdirotIconCheckCombo,
                                         width: 300,
                                         value: contextHashtable['java.naming.factory.initial'],
                                         ref: (_ref: any) => {
@@ -107,10 +107,18 @@ export class FormJndi extends BI.Widget {
                                         },
                                         items: JNDI_FACTORYS.map(item => {
                                             return {
-                                                text: item,
-                                                value: item,
+                                                text: item.factory,
+                                                value: item.factory,
                                             };
                                         }),
+                                        listeners: [{
+                                            eventName: BI.EditorIconCheckCombo.EVENT_CHANGE,
+                                            action: () => {
+                                                const value = this.form.initial.getValue();
+                                                const factory = JNDI_FACTORYS.find(item => item.factory === value);
+                                                factory ? this.form.providerUrl.setValue(factory.url) : null;
+                                            },
+                                        }],
                                     }],
                                 },
                                 {
@@ -366,7 +374,7 @@ export class FormJndi extends BI.Widget {
 
     public getSubmitValue():Connection {
         const contextHashtable = {
-            'java.naming.factory.initial': this.form.initial.getValue()[0],
+            'java.naming.factory.initial': this.form.initial.getValue(),
             'java.naming.provider.url': this.form.providerUrl.getValue(),
             'java.naming.factory.object': this.form.factoryObject.getValue(),
             'java.naming.factory.state': this.form.factoryState.getValue(),