DEC-22408 feat:【迭代】【数据连接支持SSH及SSL】调整gap

src/modules/components/file_chooser/file_chooser.ts

@@ -37,12 +37,13 @@ export class FileChooser extends BI.Widget {
 
         return {
             type: BI.VerticalAdaptLayout.xtype,
-            height: 20,
+            height: 24,
             items: [
                 {
                     type: BI.SignEditor.xtype,
                     cls: 'bi-border bi-focus-shadow',
                     width,
+                    height: 22,
                     watermark,
                     title: value,
                     value,

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

@@ -152,9 +152,9 @@ export class ConnectionJdbc extends BI.Widget {
                     ],
                 },
                 {
+                    el: {
                         type: BI.VerticalLayout.xtype,
-                    tgap: -15,
+                        bgap: vgap,
-                    vgap,
                         invisible: true,
                         ref: (_ref: VerticalLayout) => {
                             this.sshSet = _ref;
@@ -193,6 +193,7 @@ export class ConnectionJdbc extends BI.Widget {
                             },
                         ],
                     },
+                },
                 // ssl设置
                 {
                     type: Collapse.xtype,
@@ -209,9 +210,9 @@ export class ConnectionJdbc extends BI.Widget {
                     ],
                 },
                 {
+                    el: {
                         type: BI.VerticalLayout.xtype,
-                    tgap: -15,
+                        bgap: vgap,
-                    vgap,
                         invisible: true,
                         ref: (_ref: VerticalLayout) => {
                             this.sslSet = _ref;
@@ -240,6 +241,7 @@ export class ConnectionJdbc extends BI.Widget {
                             },
                         ],
                     },
+                },
                 // 更多设置
                 {
                     type: Collapse.xtype,
@@ -255,9 +257,9 @@ export class ConnectionJdbc extends BI.Widget {
                     ],
                 },
                 {
+                    el: {
                         type: BI.VerticalLayout.xtype,
-                    tgap: -15,
+                        bgap: vgap,
-                    vgap,
                         invisible: true,
                         ref: (_ref: VerticalLayout) => {
                             this.advancedSet = _ref;
@@ -308,6 +310,7 @@ export class ConnectionJdbc extends BI.Widget {
                             },
                         ],
                     },
+                },
             ],
         };
     }

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

@@ -639,15 +639,16 @@ export class FormJdbc extends BI.Widget {
                     ],
                 },
                 {
+                    el: {
                         type: BI.VerticalLayout.xtype,
                         ref: (_ref: VerticalLayout) => {
                             this.sshSet = _ref;
                         },
+                        bgap: vgap,
                         invisible: true,
                         items: [
                             {
                                 type: FormItem.xtype,
-                            bgap: -15,
                                 name: BI.i18nText('Dec-Dcm_Connection_Tunnel', 'SSH'),
                                 forms: [
                                     {
@@ -671,11 +672,12 @@ export class FormJdbc extends BI.Widget {
                                 ],
                             },
                             {
+                                el: {
                                     type: BI.VerticalLayout.xtype,
                                     ref: (_ref: VerticalLayout) => {
                                         this.sshForm = _ref;
                                     },
-                            vgap,
+                                    bgap: vgap,
                                     invisible: !usingSsh,
                                     items: [
                                         {
@@ -794,8 +796,10 @@ export class FormJdbc extends BI.Widget {
                                         },
                                     ],
                                 },
+                            },
                         ],
                     },
+                },
                 // SSL设置
                 {
                     type: Collapse.xtype,
@@ -812,15 +816,16 @@ export class FormJdbc extends BI.Widget {
                     ],
                 },
                 {
+                    el: {
                         type: BI.VerticalLayout.xtype,
                         ref: (_ref: VerticalLayout) => {
                             this.sslSet = _ref;
                         },
+                        bgap: vgap,
                         invisible: true,
                         items: [
                             {
                                 type: FormItem.xtype,
-                            bgap: -15,
                                 name: BI.i18nText('Dec-Dcm_Connection_Tunnel', 'SSL'),
                                 forms: [
                                     {
@@ -844,11 +849,12 @@ export class FormJdbc extends BI.Widget {
                                 ],
                             },
                             {
+                                el: {
                                     type: BI.VerticalLayout.xtype,
                                     ref: (_ref: VerticalLayout) => {
                                         this.sslForm = _ref;
                                     },
-                            vgap,
+                                    bgap: vgap,
                                     invisible: !usingSsl,
                                     items: [
                                         {
@@ -914,12 +920,13 @@ export class FormJdbc extends BI.Widget {
                                         },
                                     ],
                                 },
+                            },
                         ],
                     },
+                },
                 // 高级设置
                 {
                     type: Collapse.xtype,
-                    bgap: -15,
                     width: 100,
                     name: BI.i18nText('Dec-Dcm_Connection_Form_Database_More_Setting'),
                     listeners: [
@@ -932,9 +939,9 @@ export class FormJdbc extends BI.Widget {
                     ],
                 },
                 {
+                    el: {
                         type: BI.VerticalLayout.xtype,
-                    vgap,
+                        bgap: vgap,
-                    tgap: -15,
                         invisible: true,
                         ref: (_ref: VerticalLayout) => {
                             this.advancedSet = _ref;
@@ -942,7 +949,6 @@ export class FormJdbc extends BI.Widget {
                         items: [
                             {
                                 type: FormItem.xtype,
-                            tgap: 15,
                                 name: BI.i18nText('Dec-Dcm_Connection_Form_Database_Initial_Size'),
                                 forms: [
                                     {
@@ -1153,6 +1159,7 @@ export class FormJdbc extends BI.Widget {
                             },
                         ],
                     },
+                },
             ],
         };
     }