Merge pull request #7552 in DEC/decision-webui-dcm from bugfix/11.0 to feature/x

* commit '62e2f253cefa43e12c7de2631d5ec6a0957aa82d':
  REPORT-94752【视觉验收】数据连接 fix:修复视觉问题
  REPORT-94752【视觉验收】数据连接 fix:修复视觉问题
  REPORT-94654 fix：数据连接异常报错问题修复

src/modules/components/test_status/tip_icon/tip_fail.ts

@@ -88,6 +88,7 @@ export class TipFail extends BI.Widget {
                                     type: BI.Button.xtype,
                                     text: retryText,
                                     handler: () => {
+                                        this.store.setIsCollapse(false);
                                         this.fireEvent(TipFail.EVENT_RELOAD);
                                     },
                                 },

src/modules/constants/constant.ts

@@ -837,7 +837,7 @@ export const DEFAULT_JDBC_POOL = {
 };
 
 export const CONNECTION_LAYOUT = {
-    hgap: 5,
+    hgap: 10,
     vgap: 15,
     labelHeight: 24,
 };

src/modules/pages/maintain/maintain.ts

@@ -28,7 +28,7 @@ export class Maintain extends BI.Widget {
         
         return {
             type: BI.VTapeLayout.xtype,
-            hgap: 5,
+            hgap: 16,
             items: [
                 {
                     type: BI.VerticalAdaptLayout.xtype,

src/modules/pages/setting/setting.ts

@@ -44,23 +44,25 @@ export class TimeOutSetting extends BI.Widget {
             }, {
                 type: 'bi.vertical',
                 cls: 'bi-card',
-                hgap: 10,
                 vgap: 10,
                 items: [
                     {
-                        type: 'bi.vertical_adapt',
+                        el:{
-                        cls: 'bi-border-bottom',
+                            type: 'bi.vertical_adapt',
-                        height: 32,
+                            cls: 'bi-border-bottom',
-                        items: [{
+                            height: 40,
-                            type: 'bi.label',
+                            items: [{
-                            textAlign: 'left',
+                                type: 'bi.label',
-                            width: 120,
+                                textAlign: 'left',
-                            cls: 'dec-font-weight-bold',
+                                width: 120,
-                            text: BI.i18nText('Dec-Dcm_Connection_Timeout_Detection'),
+                                cls: 'dec-font-weight-bold',
-                        }]
+                                text: BI.i18nText('Dec-Dcm_Connection_Timeout_Detection'),
+                            }]
+                        }, tgap: -10,  hgap: 16,
                     },
                     {
                         type: 'bi.vertical_adapt',
+                        hgap: 16,
                         items: [{
                             type: 'dec.label.editor.item',
                             text: BI.i18nText('Dec-Over_Time'),

src/modules/title/title_maintain/title_maintain.ts

@@ -15,13 +15,13 @@ export class TitleMaintain extends BI.Widget {
             items: [{
                 type: BI.VerticalAdaptLayout.xtype,
                 height: 40,
-                hgap: 16,
                 items: [
                     {
                         type: BI.Button.xtype,
                         $value: 'title-maintain-cancel',
                         text: BI.i18nText('BI-Basic_Cancel'),
                         clear: true,
+                        _rgap: 16,
                         handler: () => {
                             this.store.setIsCopy(false);
                             this.store.setPageIndex(PAGE_INDEX.CONNECTION);
@@ -30,6 +30,7 @@ export class TitleMaintain extends BI.Widget {
                     },
                     {
                         type: BI.Button.xtype,
+                        _rgap: 16,
                         $value: 'title-maintain-connection-test',
                         text: BI.i18nText('Dec-Dcm_Connection_Test'),
                         light: true,
@@ -39,6 +40,7 @@ export class TitleMaintain extends BI.Widget {
                     },
                     {
                         type: BI.Button.xtype,
+                        _rgap: 16,
                         $value: 'title-maintain-save',
                         text: BI.i18nText('BI-Basic_Save'),
                         handler: () => {
@@ -47,7 +49,6 @@ export class TitleMaintain extends BI.Widget {
                         },
                     },
                 ],
-                _hgap: -16,
             }],
         };
     }