fix(module:form): optimize code to increase robustness (#5550)

NG-ZORRO · Jul 13, 2020 · fdf085b · fdf085b
1 parent 07d91a1
commit fdf085b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/components/form/form-control.component.ts b/components/form/form-control.component.ts
@@ -199,7 +199,7 @@ export class NzFormControlComponent implements OnChanges, OnDestroy, OnInit, Aft
       for (const key in errors) {
         if (errors.hasOwnProperty(key)) {
           autoErrorTip =
-            errors[key][this.localeId] ??
+            errors[key]?.[this.localeId] ??
             this.nzAutoTips?.[this.localeId]?.[key] ??
             this.nzFormDirective?.nzAutoTips?.[this.localeId]?.[key];
         }

diff --git a/components/form/form.directive.ts b/components/form/form.directive.ts
@@ -13,6 +13,8 @@ import { filter, map } from 'rxjs/operators';
 
 const NZ_CONFIG_COMPONENT_NAME = 'form';
 
+export type NzFormLayoutType = 'horizontal' | 'vertical' | 'inline';
+
 @Directive({
   selector: '[nz-form]',
   exportAs: 'nzForm',
@@ -26,7 +28,7 @@ export class NzFormDirective implements OnChanges, OnDestroy, InputObservable {
   static ngAcceptInputType_nzNoColon: BooleanInput;
   static ngAcceptInputType_nzDisableAutoTips: BooleanInput;
 
-  @Input() nzLayout: 'horizontal' | 'vertical' | 'inline' = 'horizontal';
+  @Input() nzLayout: NzFormLayoutType = 'horizontal';
   @Input() @WithConfig(NZ_CONFIG_COMPONENT_NAME) @InputBoolean() nzNoColon: boolean = false;
   @Input() @WithConfig(NZ_CONFIG_COMPONENT_NAME) nzAutoTips: Record<string, Record<string, string>> = {};
   @Input() @InputBoolean() nzDisableAutoTips = false;
@@ -50,6 +52,7 @@ export class NzFormDirective implements OnChanges, OnDestroy, InputObservable {
   }
 
   ngOnDestroy(): void {
+    this.inputChanges$.complete();
     this.destroy$.next();
     this.destroy$.complete();
   }