Browse Source

Pull request #172: DEC-13363 feat: 加载动画统一

Merge in DEC/decision-webui-dcm from ~DAILER/decision-webui-dcm:release/10.0 to release/10.0

* commit '89001f077079848bd58ea73dc2bdb3744beb9325':
  无JIRA 修复husky pre-push报错
  DEC-13363 feat: 加载动画统一
research/10.0
parent
commit
e62eb908b5
  1. 2
      src/less/lib/background.less
  2. 6
      src/modules/components/test_status/tip_icon/tip_fail.ts
  3. 6
      src/modules/components/test_status/tip_icon/tip_icon.ts
  4. 6
      src/modules/pages/database/database.ts

2
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";

6
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,

6
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,

6
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,

Loading…
Cancel
Save