解决冲突

This commit is contained in:
wangshiming
2022-04-27 16:57:30 +08:00
parent 9fa1a206ef
commit eb015bf42e
4 changed files with 31 additions and 53 deletions

View File

@ -1,8 +1,8 @@
import { AfterViewInit, Component, OnDestroy, OnInit } from '@angular/core';
import { SFComponent, SFSchema } from '@delon/form';
import { SearchDrawerService } from '@shared';
import { fromEvent, Subscription } from 'rxjs';
import { debounceTime } from 'rxjs/operators';
import { SearchDrawerService } from 'src/app/shared/components/search-drawer/search-drawer.service';
@Component({
template: ''
@ -40,14 +40,14 @@ export class BasicTableComponent implements AfterViewInit, OnDestroy {
} else {
const drawer = this.searchDrawerService.create(this.sfValue, this.schema);
this.drawer.push(
drawer.initEvent.subscribe(sf => {
drawer.initEvent.subscribe((sf: SFComponent) => {
if (sf) {
this.sf = sf;
}
})
);
this.drawer.push(
drawer.closeEvent.subscribe(res => {
drawer.closeEvent.subscribe((res: Record<string, any>) => {
this.sfValue = res;
if (res) {
this.search();