fix(module:select): fix select reset in form (#3017)

close #3014
NG-ZORRO · Mar 4, 2019 · 30b3d86 · 30b3d86
1 parent 42ed317
commit 30b3d86
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 5 deletions.
diff --git a/components/select/nz-select.component.spec.ts b/components/select/nz-select.component.spec.ts
@@ -295,6 +295,37 @@ describe('nz-select component', () => {
       fixture.detectChanges();
       expect(select.nativeElement.classList).toContain('ant-select-disabled');
     }));
+    /** https://github.com/NG-ZORRO/ng-zorro-antd/issues/3014 **/
+    it('should reset form works', fakeAsync(() => {
+      fixture.detectChanges();
+      flush();
+      fixture.detectChanges();
+      expect(testComponent.formGroup.value.select).toBe('jack');
+      testComponent.reset();
+      fixture.detectChanges();
+      flush();
+      fixture.detectChanges();
+      expect(testComponent.formGroup.value.select).toBe(null);
+      select.nativeElement.click();
+      fixture.detectChanges();
+      overlayContainerElement.querySelector('li').click();
+      fixture.detectChanges();
+      flush();
+      fixture.detectChanges();
+      expect(testComponent.formGroup.value.select).toBe('jack');
+      testComponent.reset();
+      fixture.detectChanges();
+      flush();
+      fixture.detectChanges();
+      expect(testComponent.formGroup.value.select).toBe(null);
+      select.nativeElement.click();
+      fixture.detectChanges();
+      overlayContainerElement.querySelector('li').click();
+      fixture.detectChanges();
+      flush();
+      fixture.detectChanges();
+      expect(testComponent.formGroup.value.select).toBe('jack');
+    }));
   });
   describe('option change', () => {
     let fixture;
@@ -401,6 +432,7 @@ export class NzTestSelectTagsComponent {
   template: `
     <form [formGroup]="formGroup">
       <nz-select
+        nzShowSearch
         formControlName="select">
         <nz-option nzValue="jack" nzLabel="Jack"></nz-option>
         <nz-option nzValue="lucy" nzLabel="Lucy"></nz-option>
@@ -421,6 +453,10 @@ export class NzTestSelectFormComponent {
   disable(): void {
     this.formGroup.disable();
   }
+
+  reset(): void {
+    this.formGroup.reset();
+  }
 }
 
 @Component({

diff --git a/components/select/nz-select.component.ts b/components/select/nz-select.component.ts
@@ -278,9 +278,11 @@ export class NzSelectComponent implements ControlValueAccessor, OnInit, AfterVie
     this.nzSelectService.modelChange$.pipe(
       takeUntil(this.destroy$)
     ).subscribe(modelValue => {
-      this.value = modelValue;
-      this.onChange(this.value);
-      this.updateCdkConnectedOverlayPositions();
+      if (this.value !== modelValue) {
+        this.value = modelValue;
+        this.onChange(this.value);
+        this.updateCdkConnectedOverlayPositions();
+      }
     });
     this.nzSelectService.open$.pipe(
       takeUntil(this.destroy$)

diff --git a/components/select/nz-select.service.ts b/components/select/nz-select.service.ts
@@ -63,8 +63,7 @@ export class NzSelectService {
         modelValue = selectedList;
       }
       return modelValue;
-    }),
-    distinctUntilChanged()
+    })
   );
   searchValue$ = this.searchValueRaw$.pipe(
     distinctUntilChanged(),