From 2b1cea4686513774d3745ded363e6b95c8f885f5 Mon Sep 17 00:00:00 2001 From: "Austin.Duan" Date: Tue, 25 Apr 2023 15:37:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?REPORT-94654=20fix=EF=BC=9A=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=BF=9E=E6=8E=A5=E5=BC=82=E5=B8=B8=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/components/test_status/tip_icon/tip_fail.ts | 1 + src/modules/pages/maintain/maintain.ts | 2 +- src/modules/pages/setting/setting.ts | 3 ++- src/modules/title/title_maintain/title_maintain.ts | 5 +++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/modules/components/test_status/tip_icon/tip_fail.ts b/src/modules/components/test_status/tip_icon/tip_fail.ts index 576580e..a12f157 100644 --- a/src/modules/components/test_status/tip_icon/tip_fail.ts +++ b/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); }, }, diff --git a/src/modules/pages/maintain/maintain.ts b/src/modules/pages/maintain/maintain.ts index 28b47b9..1f6f221 100644 --- a/src/modules/pages/maintain/maintain.ts +++ b/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, diff --git a/src/modules/pages/setting/setting.ts b/src/modules/pages/setting/setting.ts index eaddc96..29d3166 100644 --- a/src/modules/pages/setting/setting.ts +++ b/src/modules/pages/setting/setting.ts @@ -44,11 +44,11 @@ export class TimeOutSetting extends BI.Widget { }, { type: 'bi.vertical', cls: 'bi-card', - hgap: 10, vgap: 10, items: [ { type: 'bi.vertical_adapt', + hgap: 16, cls: 'bi-border-bottom', height: 32, items: [{ @@ -61,6 +61,7 @@ export class TimeOutSetting extends BI.Widget { }, { type: 'bi.vertical_adapt', + hgap: 16, items: [{ type: 'dec.label.editor.item', text: BI.i18nText('Dec-Over_Time'), diff --git a/src/modules/title/title_maintain/title_maintain.ts b/src/modules/title/title_maintain/title_maintain.ts index 9eed070..b121cf1 100644 --- a/src/modules/title/title_maintain/title_maintain.ts +++ b/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, }], }; } From 06f1ea79a57dcb74d2c7adac4089f1dd790c53e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=97=AD=E6=97=AD?= Date: Tue, 25 Apr 2023 19:44:46 +0800 Subject: [PATCH 2/3] =?UTF-8?q?REPORT-94752=E3=80=90=E8=A7=86=E8=A7=89?= =?UTF-8?q?=E9=AA=8C=E6=94=B6=E3=80=91=E6=95=B0=E6=8D=AE=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=20fix:=E4=BF=AE=E5=A4=8D=E8=A7=86=E8=A7=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/constants/constant.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/constants/constant.ts b/src/modules/constants/constant.ts index fa34f1f..7b698a0 100644 --- a/src/modules/constants/constant.ts +++ b/src/modules/constants/constant.ts @@ -703,7 +703,7 @@ export const DATA_BASE_TYPES = [ type: 'jdbc', hasSchema: true, kerberos: false, - }, + }, { text: 'TDSQL', databaseType: 'tdsql', @@ -837,7 +837,7 @@ export const DEFAULT_JDBC_POOL = { }; export const CONNECTION_LAYOUT = { - hgap: 5, + hgap: 10, vgap: 15, labelHeight: 24, }; @@ -878,4 +878,4 @@ export const YES_OR_NO = [ text: BI.i18nText('Dec-Basic_No'), value: 0, } -] \ No newline at end of file +] From 88f9e5fb54b55d86aa230817338915d1a6bb31b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=97=AD=E6=97=AD?= Date: Wed, 26 Apr 2023 11:44:56 +0800 Subject: [PATCH 3/3] =?UTF-8?q?REPORT-94752=E3=80=90=E8=A7=86=E8=A7=89?= =?UTF-8?q?=E9=AA=8C=E6=94=B6=E3=80=91=E6=95=B0=E6=8D=AE=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=20fix:=E4=BF=AE=E5=A4=8D=E8=A7=86=E8=A7=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/pages/setting/setting.ts | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/src/modules/pages/setting/setting.ts b/src/modules/pages/setting/setting.ts index 29d3166..d196730 100644 --- a/src/modules/pages/setting/setting.ts +++ b/src/modules/pages/setting/setting.ts @@ -47,17 +47,18 @@ export class TimeOutSetting extends BI.Widget { vgap: 10, items: [ { - type: 'bi.vertical_adapt', - hgap: 16, - cls: 'bi-border-bottom', - height: 32, - items: [{ - type: 'bi.label', - textAlign: 'left', - width: 120, - cls: 'dec-font-weight-bold', - text: BI.i18nText('Dec-Dcm_Connection_Timeout_Detection'), - }] + el:{ + type: 'bi.vertical_adapt', + cls: 'bi-border-bottom', + height: 40, + items: [{ + type: 'bi.label', + textAlign: 'left', + width: 120, + cls: 'dec-font-weight-bold', + text: BI.i18nText('Dec-Dcm_Connection_Timeout_Detection'), + }] + }, tgap: -10, hgap: 16, }, { type: 'bi.vertical_adapt', @@ -84,7 +85,7 @@ export class TimeOutSetting extends BI.Widget { lgap: 10, }] - }, + }, ] }], ref: function (_ref) { @@ -92,4 +93,4 @@ export class TimeOutSetting extends BI.Widget { }, }; } -} \ No newline at end of file +}