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

* commit '6ca44868ead898cee27097d610e36ed16593f6e9':
  设置文本高度
  fix: DEC-10016 && DEC-10010 交互修改补上单位，修改获取连接前校验默认为true

src/modules/constants/constant.ts

@@ -639,7 +639,7 @@ export const DEFAULT_JDBC_POOL = {
     maxActive: 50,
     maxIdle: 10,
     maxWait: 10000,
-    testOnBorrow: false,
+    testOnBorrow: true,
     testOnReturn: false,
     testWhileIdle: false,
     timeBetweenEvictionRunsMillis: -1,

src/modules/pages/connection/components/form_item/form_item.ts

@@ -1,11 +1,12 @@
 import { shortcut } from '@core/core';
-import { Label, Left } from 'ui';
+import { Label, Left, Layout } from 'ui';
 export const FormItemXtype = 'dec.dcm.connection_form_item';
 @shortcut(FormItemXtype)
 export class FormItem extends BI.Widget {
     props = {
         name: '',
         value: '',
+        unit: '',
         nameWidth: 140,
     }
 
@@ -23,6 +24,16 @@ export class FormItem extends BI.Widget {
                 {
                     type: Label,
                     text: this.options.value,
+                    height: 17,
+                },
+                this.options.unit ?
+                    {
+                        type: Label,
+                        text: this.options.unit,
+                        lgap: 5,
+                        textAlign: 'left',
+                    } : {
+                        type: Layout,
                     },
             ],
         };

src/modules/pages/connection/connection_jdbc/connection_jdbc.ts

@@ -111,6 +111,7 @@ export class ConnectionJdbc extends BI.Widget {
                             type: FormItemXtype,
                             name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Max_Wait'),
                             value: connectionPoolAttr.maxWait,
+                            unit: BI.i18nText('Dec-Dcm_Millisecond'),
                         },
                         {
                             type: FormItemXtype,
@@ -120,22 +121,23 @@ export class ConnectionJdbc extends BI.Widget {
                         {
                             type: FormItemXtype,
                             name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Test_On_Borrow'),
-                            value: connectionPoolAttr.testOnBorrow,
+                            value: connectionPoolAttr.testOnBorrow ? BI.i18nText('Dec-Dcm_Yes') : BI.i18nText('Dec-Dcm_No'),
                         },
                         {
                             type: FormItemXtype,
                             name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Test_On_Return'),
-                            value: connectionPoolAttr.testOnReturn,
+                            value: connectionPoolAttr.testOnReturn ? BI.i18nText('Dec-Dcm_Yes') : BI.i18nText('Dec-Dcm_No'),
                         },
                         {
                             type: FormItemXtype,
                             name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Test_While_Idle'),
-                            value: connectionPoolAttr.testWhileIdle,
+                            value: connectionPoolAttr.testWhileIdle ? BI.i18nText('Dec-Dcm_Yes') : BI.i18nText('Dec-Dcm_No'),
                         },
                         {
                             type: FormItemXtype,
                             name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Test_Between_Eviction_Millis'),
                             value: connectionPoolAttr.timeBetweenEvictionRunsMillis,
+                            unit: BI.i18nText('Dec-Dcm_Millisecond'),
                         },
                         {
                             type: FormItemXtype,
@@ -146,6 +148,7 @@ export class ConnectionJdbc extends BI.Widget {
                             type: FormItemXtype,
                             name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Min_Evictable_Idle_Time_Millis'),
                             value: connectionPoolAttr.minEvictableIdleTimeMillis,
+                            unit: BI.i18nText('BI-Basic_Seconds'),
                         },
                     ],
                 },