From 58566fa2773f5a89a63049853b9671b754baa968 Mon Sep 17 00:00:00 2001 From: zsmj1994 Date: Tue, 26 May 2020 15:32:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?DEC-13363=20feat:=20=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E5=8A=A8=E7=94=BB=E7=BB=9F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/less/lib/background.less | 2 +- src/modules/components/test_status/tip_icon/tip_fail.ts | 6 +++--- src/modules/components/test_status/tip_icon/tip_icon.ts | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/less/lib/background.less b/src/less/lib/background.less index 0264cf7..551cdf0 100644 --- a/src/less/lib/background.less +++ b/src/less/lib/background.less @@ -1,5 +1,5 @@ @background-data-connection: "background/data-connection-tip.png"; -@icon-upload-loading: "icon/upload_loading.gif"; +@icon-upload-loading: "icon/wave_loading.gif"; @icon-upload-fail: "icon/upload_fail.png"; @icon-upload-success: "icon/upload_success.png"; @background-error-page: "background/error_page.png"; \ No newline at end of file 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 1117637..d5fb9b9 100644 --- a/src/modules/components/test_status/tip_icon/tip_fail.ts +++ b/src/modules/components/test_status/tip_icon/tip_fail.ts @@ -29,7 +29,7 @@ export class TipFail extends BI.Widget { render() { const { tipCls, tipText, retryText } = this.options; - + return { type: CenterAdapt, items: [ @@ -42,8 +42,8 @@ export class TipFail extends BI.Widget { bgap: 20, items: [{ type: 'bi.icon', - width: 96, - height: 96, + width: 60, + height: 60, }], }, { type: Label, diff --git a/src/modules/components/test_status/tip_icon/tip_icon.ts b/src/modules/components/test_status/tip_icon/tip_icon.ts index 8c04341..167a894 100644 --- a/src/modules/components/test_status/tip_icon/tip_icon.ts +++ b/src/modules/components/test_status/tip_icon/tip_icon.ts @@ -9,7 +9,7 @@ export class TipIcon extends BI.Widget { } render() { const { tipCls, tipText } = this.options; - + return { type: CenterAdapt, items: [ @@ -22,8 +22,8 @@ export class TipIcon extends BI.Widget { bgap: 20, items: [{ type: 'bi.icon', - width: 96, - height: 96, + width: 60, + height: 60, }], }, { type: Label, From 89001f077079848bd58ea73dc2bdb3744beb9325 Mon Sep 17 00:00:00 2001 From: zsmj1994 Date: Tue, 26 May 2020 15:35:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=97=A0JIRA=20=E4=BF=AE=E5=A4=8Dhusky=20p?= =?UTF-8?q?re-push=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/pages/database/database.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/pages/database/database.ts b/src/modules/pages/database/database.ts index e7fa658..d563fe0 100644 --- a/src/modules/pages/database/database.ts +++ b/src/modules/pages/database/database.ts @@ -1,4 +1,4 @@ -import { SearchEditor, Vtape, Right, Htape, Vertical, ButtonGroup, Left, VerticalAdapt, Label, MultiSelectItem, CenterAdapt } from 'ui'; +import { SearchEditor, Vtape, Right, Htape, Vertical, ButtonGroup, Left, Label, MultiSelectItem, CenterAdapt } from 'ui'; import { shortcut, store } from '@core/core'; import { FilterXtype } from './filter/filter'; import { DatebaseModel, DatebaseModelXtype } from './database.model'; @@ -45,7 +45,7 @@ export class Datebase extends BI.Widget { datebaseTypes: () => { this.datebaseType.populate(this.renderDatebaseType()); }, - 'isInternal || isPlugin' : () => { + 'isInternal || isPlugin': () => { this.internalWidget.setSelected(this.model.isInternal); this.pluginWidget.setSelected(this.model.isPlugin); if (this.model.filter === DATEBASE_FILTER_TYPE.ALL) { @@ -215,7 +215,7 @@ export class Datebase extends BI.Widget { if (this.model.datebaseTypes.length === 0) { return this.renderNoResult(); } - + return this.model.datebaseTypes.map(item => { return { type: DatebaseTypeXtype,