diff --git a/src/components/transfer/nz-transfer-list.component.ts b/src/components/transfer/nz-transfer-list.component.ts index 8b44e9d1c1..e540dc13a3 100644 --- a/src/components/transfer/nz-transfer-list.component.ts +++ b/src/components/transfer/nz-transfer-list.component.ts @@ -112,9 +112,9 @@ export class NzTransferListComponent implements OnChanges, OnInit, DoCheck { } }); - // ngModelChange 事件内对状态的变更会无效,因此使用延迟改变执行顺序 - setTimeout(() => this.updateCheckStatus()); - + // // ngModelChange 事件内对状态的变更会无效,因此使用延迟改变执行顺序 + // setTimeout(() => this.updateCheckStatus()); + this.updateCheckStatus(); this.handleSelectAll.emit(status); } diff --git a/src/components/transfer/nz-transfer.component.ts b/src/components/transfer/nz-transfer.component.ts index 277047a4b7..f60bee0da6 100644 --- a/src/components/transfer/nz-transfer.component.ts +++ b/src/components/transfer/nz-transfer.component.ts @@ -14,7 +14,7 @@ import { ViewEncapsulation } from '@angular/core'; import { Observable } from 'rxjs/Observable'; -import { ArrayObservable } from 'rxjs/observable/ArrayObservable'; +import { of } from 'rxjs/observable/of'; import { NzLocaleService } from '../locale/index'; import { toBoolean } from '../util/convert'; import { TransferItem } from './item'; @@ -109,7 +109,7 @@ export class NzTransferComponent implements OnChanges { @Input() nzListStyle: object; @Input() nzItemUnit = this._locale.translate('Transfer.itemUnit'); @Input() nzItemsUnit = this._locale.translate('Transfer.itemsUnit'); - @Input() canMove: (arg: TransferCanMove) => Observable = (arg: TransferCanMove) => ArrayObservable.of(arg.list); + @Input() canMove: (arg: TransferCanMove) => Observable = (arg: TransferCanMove) => of(arg.list); @ContentChild('render') render: TemplateRef; @ContentChild('footer') footer: TemplateRef; diff --git a/src/components/transfer/nz-transfer.spec.ts b/src/components/transfer/nz-transfer.spec.ts index ab8e800849..d928f2b9d2 100644 --- a/src/components/transfer/nz-transfer.spec.ts +++ b/src/components/transfer/nz-transfer.spec.ts @@ -1,14 +1,14 @@ -// tslint:disable: import { Component, DebugElement, ViewChild } from '@angular/core'; import { async, fakeAsync, tick, ComponentFixture, ComponentFixtureAutoDetect, TestBed } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { ArrayObservable } from 'rxjs/observable/ArrayObservable'; +import { Observable } from 'rxjs/Observable'; +import { of } from 'rxjs/observable/of'; import { NzButtonModule } from '../button/nz-button.module'; import { NzTransferModule } from '../ng-zorro-antd.module'; import { TransferItem } from './item'; -import { NzTransferComponent } from './nz-transfer.component'; +import { NzTransferComponent, TransferCanMove } from './nz-transfer.component'; const DEFAULT = ` { if (arg.direction === 'right' && arg.list.length > 0) arg.list.splice(0, 1); // or // if (arg.direction === 'right' && arg.list.length > 0) delete arg.list[0]; - return ArrayObservable.of(arg.list); + return of(arg.list); } } diff --git a/src/showcase/nz-demo-transfer/nz-demo-transfer-can-move.component.ts b/src/showcase/nz-demo-transfer/nz-demo-transfer-can-move.component.ts index f574148a30..139f832cf1 100644 --- a/src/showcase/nz-demo-transfer/nz-demo-transfer-can-move.component.ts +++ b/src/showcase/nz-demo-transfer/nz-demo-transfer-can-move.component.ts @@ -1,7 +1,10 @@ import { Component, OnInit } from '@angular/core'; -import { ArrayObservable } from 'rxjs/observable/ArrayObservable'; +import { Observable } from 'rxjs/Observable'; +import { of } from 'rxjs/observable/of'; import { delay } from 'rxjs/operators'; import { NzMessageService } from '../../../index.showcase'; +import { TransferItem } from '../../components/transfer/item'; +import { TransferCanMove } from '../../components/transfer/nz-transfer.component'; @Component({ selector: 'nz-demo-transfer-can-move', @@ -16,8 +19,9 @@ import { NzMessageService } from '../../../index.showcase'; ` }) export class NzDemoTransferCanMoveComponent implements OnInit { - list: any[] = []; - ngOnInit() { + list: TransferItem[] = []; + + ngOnInit(): void { for (let i = 0; i < 20; i++) { this.list.push({ key: i.toString(), @@ -29,18 +33,18 @@ export class NzDemoTransferCanMoveComponent implements OnInit { [ 2, 3 ].forEach(idx => this.list[idx].direction = 'right'); } - canMove(arg: any) { + canMove(arg: TransferCanMove): Observable { if (arg.direction === 'right' && arg.list.length > 0) arg.list.splice(0, 1); // or // if (arg.direction === 'right' && arg.list.length > 0) delete arg.list[0]; - return ArrayObservable.of(arg.list).pipe(delay(1000)); + return of(arg.list).pipe(delay(1000)); } - select(ret: any) { + select(ret: {}): void { console.log('nzSelectChange', ret); } - change(ret: any) { + change(ret: {}): void { console.log('nzChange', ret); } }