Browse Source

Pull request #7526: REPORT-94654 fix:数据连接异常报错问题修复

Merge in DEC/decision-webui-dcm from ~AUSTIN.DUAN/decision-webui-dcm:release/11.0 to release/11.0

* commit '2b1cea4686513774d3745ded363e6b95c8f885f5':
  REPORT-94654 fix:数据连接异常报错问题修复
release/11.0
Austin.Duan-段嗣跃 2 years ago
parent
commit
3671116076
  1. 1
      src/modules/components/test_status/tip_icon/tip_fail.ts
  2. 2
      src/modules/pages/maintain/maintain.ts
  3. 3
      src/modules/pages/setting/setting.ts
  4. 5
      src/modules/title/title_maintain/title_maintain.ts

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

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

2
src/modules/pages/maintain/maintain.ts

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

3
src/modules/pages/setting/setting.ts

@ -44,11 +44,11 @@ export class TimeOutSetting extends BI.Widget {
}, { }, {
type: 'bi.vertical', type: 'bi.vertical',
cls: 'bi-card', cls: 'bi-card',
hgap: 10,
vgap: 10, vgap: 10,
items: [ items: [
{ {
type: 'bi.vertical_adapt', type: 'bi.vertical_adapt',
hgap: 16,
cls: 'bi-border-bottom', cls: 'bi-border-bottom',
height: 32, height: 32,
items: [{ items: [{
@ -61,6 +61,7 @@ export class TimeOutSetting extends BI.Widget {
}, },
{ {
type: 'bi.vertical_adapt', type: 'bi.vertical_adapt',
hgap: 16,
items: [{ items: [{
type: 'dec.label.editor.item', type: 'dec.label.editor.item',
text: BI.i18nText('Dec-Over_Time'), text: BI.i18nText('Dec-Over_Time'),

5
src/modules/title/title_maintain/title_maintain.ts

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

Loading…
Cancel
Save