fix(module:cascader): support falsy value expect for undefined and nu…

…ll (#4119) * fix(module:cascader): support falsy value expect for undefined and null * fix: tests close #4110
NG-ZORRO · Sep 6, 2019 · 0cb44ac · 0cb44ac
1 parent c530c74
commit 0cb44ac
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/components/cascader/nz-cascader.service.ts b/components/cascader/nz-cascader.service.ts
@@ -9,7 +9,7 @@
 import { Injectable, OnDestroy } from '@angular/core';
 import { BehaviorSubject, Subject } from 'rxjs';
 
-import { arraysEqual } from 'ng-zorro-antd/core';
+import { arraysEqual, isNotNil } from 'ng-zorro-antd/core';
 
 import {
   isShowSearchObject,
@@ -93,7 +93,7 @@ export class NzCascaderService implements OnDestroy {
       const activatedOptionSetter = () => {
         const currentValue = values[columnIndex];
 
-        if (!currentValue) {
+        if (!isNotNil(currentValue)) {
           this.$redraw.next();
           return;
         }

diff --git a/components/cascader/nz-cascader.spec.ts b/components/cascader/nz-cascader.spec.ts
@@ -594,9 +594,12 @@ describe('cascader', () => {
       control.writeValue([]);
       fixture.detectChanges();
       expect(control.getSubmitValue().length).toBe(0);
+      control.writeValue(0);
+      fixture.detectChanges();
+      expect(control.getSubmitValue().length).toBe(1);
       control.writeValue('');
       fixture.detectChanges();
-      expect(control.getSubmitValue().length).toBe(0);
+      expect(control.getSubmitValue().length).toBe(1);
       control.writeValue(['zhejiang']);
       fixture.detectChanges();
       expect(control.getSubmitValue().length).toBe(1);
@@ -660,9 +663,12 @@ describe('cascader', () => {
       control.writeValue([]);
       fixture.detectChanges();
       expect(control.getSubmitValue().length).toBe(0);
+      control.writeValue(0);
+      fixture.detectChanges();
+      expect(control.getSubmitValue().length).toBe(1);
       control.writeValue('');
       fixture.detectChanges();
-      expect(control.getSubmitValue().length).toBe(0);
+      expect(control.getSubmitValue().length).toBe(1);
       control.writeValue(['zhejiang']);
       fixture.detectChanges();
       expect(control.getSubmitValue().length).toBe(1);