fix bug
This commit is contained in:
@ -14,7 +14,7 @@
|
||||
<sf #sf [schema]="schema" [ui]="ui" [button]="'none'"></sf>
|
||||
</div>
|
||||
<div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
|
||||
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading" (click)="st.load()">查询</button>
|
||||
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="st.load()">查询</button>
|
||||
<button nz-button (click)="resetSF()">重置</button>
|
||||
<button nz-button nzType="link" (click)="expandToggle()">
|
||||
{{ !_$expand ? '展开' : '收起' }}
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
|
||||
</div>
|
||||
<div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
|
||||
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading"
|
||||
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading"
|
||||
(click)="st?.load(1)">查询</button>
|
||||
<button nz-button (click)="resetSF()">重置</button>
|
||||
<button nz-button (click)="export()" nzType="primary" nzGhost>导出</button>
|
||||
|
||||
@ -24,6 +24,7 @@ export class PartnerPartnerOrderDetailComponent implements OnInit {
|
||||
@ViewChild('sf') private readonly sf!: SFComponent;
|
||||
columns: STColumn[] = [];
|
||||
_$expand = false;
|
||||
isLoading: boolean = false;
|
||||
|
||||
constructor(public service: BussinessStatisticsService) {
|
||||
|
||||
@ -41,9 +42,7 @@ export class PartnerPartnerOrderDetailComponent implements OnInit {
|
||||
resetSF() {
|
||||
this._$expand = false;
|
||||
this.sf.reset();
|
||||
setTimeout(() => {
|
||||
this.st.reset();
|
||||
})
|
||||
this.isLoading = true
|
||||
}
|
||||
/**
|
||||
* 伸缩查询条件
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<nz-card>
|
||||
<sf mode="search" [schema]="schema" [ui]="ui" [button]="'none'" (formSubmit)="st.load(1)" (formReset)="resetSF()" #sf>
|
||||
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading"
|
||||
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading"
|
||||
(click)="st?.load(1)">查询</button>
|
||||
<button nz-button (click)="resetSF()">重置</button>
|
||||
<button nz-button (click)="export()" nzType="primary" nzGhost>导出</button>
|
||||
|
||||
@ -15,6 +15,7 @@ export class PartnerPartnerStatisticsComponent implements OnInit {
|
||||
@ViewChild('st') private readonly st!: STComponent;
|
||||
@ViewChild('sf') private readonly sf!: SFComponent;
|
||||
columns: STColumn[] = [];
|
||||
isLoading: boolean = false;
|
||||
|
||||
constructor(public service: BussinessStatisticsService) { }
|
||||
/**
|
||||
@ -85,9 +86,7 @@ export class PartnerPartnerStatisticsComponent implements OnInit {
|
||||
|
||||
resetSF() {
|
||||
this.sf.reset();
|
||||
setTimeout(() => {
|
||||
this.st.reset();
|
||||
})
|
||||
this.isLoading = true
|
||||
}
|
||||
|
||||
export() {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<nz-card>
|
||||
<sf mode="search" [schema]="schema" [button]="'none'" #sf>
|
||||
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading"
|
||||
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading"
|
||||
(click)="st?.load(1)">查询</button>
|
||||
<button nz-button (click)="resetSF()">重置</button>
|
||||
<button nz-button (click)="export()" nzType="primary" nzGhost>导出</button>
|
||||
|
||||
@ -15,6 +15,7 @@ export class PartnerSaleStatisticsComponent implements OnInit {
|
||||
@ViewChild('sf') private readonly sf!: SFComponent;
|
||||
columns: STColumn[] = [];
|
||||
ui!: SFUISchema;
|
||||
isLoading: boolean = false;
|
||||
|
||||
constructor(public service: BussinessStatisticsService) { }
|
||||
|
||||
@ -72,8 +73,6 @@ export class PartnerSaleStatisticsComponent implements OnInit {
|
||||
}
|
||||
resetSF() {
|
||||
this.sf.reset();
|
||||
setTimeout(() => {
|
||||
this.st.reset();
|
||||
})
|
||||
this.isLoading = true
|
||||
}
|
||||
}
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
<sf #sf [schema]="schema" [ui]="ui" [button]="'none'"></sf>
|
||||
</div>
|
||||
<div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
|
||||
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading" (click)="st.load()">查询</button>
|
||||
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="st.load()">查询</button>
|
||||
<button nz-button (click)="resetSF()">重置</button>
|
||||
<button nz-button nzType="link" (click)="expandToggle()">
|
||||
{{ !_$expand ? '展开' : '收起' }}
|
||||
|
||||
@ -23,6 +23,7 @@ export class BannerComponentsListComponent implements OnInit {
|
||||
appName: '',
|
||||
appId: ''
|
||||
};
|
||||
isLoading: boolean = false;
|
||||
|
||||
@ViewChild('st', { static: false }) st!: STComponent;
|
||||
@ViewChild('sf', { static: false }) sf!: SFComponent;
|
||||
@ -212,6 +213,7 @@ export class BannerComponentsListComponent implements OnInit {
|
||||
resetSF() {
|
||||
this.sf.reset();
|
||||
this._$expand = false;
|
||||
this.isLoading = true
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
<sf #sf [schema]="schema" [ui]="ui" [button]="'none'"></sf>
|
||||
</div>
|
||||
<div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
|
||||
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading" (click)="st.load()">查询</button>
|
||||
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="st.load()">查询</button>
|
||||
<button nz-button (click)="resetSF()">重置</button>
|
||||
<button nz-button nzType="link" (click)="expandToggle()">
|
||||
{{ !_$expand ? '展开' : '收起' }}
|
||||
|
||||
@ -23,6 +23,7 @@ export class ScrollImgComponentsListComponent implements OnInit {
|
||||
appName: '',
|
||||
appId: ''
|
||||
};
|
||||
isLoading: boolean = false;
|
||||
|
||||
@ViewChild('st', { static: false }) st!: STComponent;
|
||||
@ViewChild('sf', { static: false }) sf!: SFComponent;
|
||||
@ -256,6 +257,7 @@ export class ScrollImgComponentsListComponent implements OnInit {
|
||||
resetSF() {
|
||||
this.sf.reset();
|
||||
this._$expand = false;
|
||||
this.isLoading = true
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user