fix(module:select): error caused by value of sync (#338)

close #326
NG-ZORRO · Sep 22, 2017 · cfcdef1 · cfcdef1
1 parent d5d379b
commit cfcdef1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/components/select/nz-option.component.ts b/src/components/select/nz-option.component.ts
@@ -2,7 +2,8 @@ import {
   Component,
   ViewEncapsulation,
   Input,
-  OnDestroy
+  OnDestroy,
+  OnInit
 } from '@angular/core';
 
 import { NzSelectComponent } from './nz-select.component';
@@ -15,7 +16,8 @@ import { NzSelectComponent } from './nz-select.component';
   `,
   styleUrls    : []
 })
-export class NzOptionComponent implements OnDestroy {
+export class NzOptionComponent implements OnDestroy, OnInit {
+
   _value: string;
   _label: string;
   _disabled = false;
@@ -54,6 +56,9 @@ export class NzOptionComponent implements OnDestroy {
   }
 
   constructor(private _nzSelect: NzSelectComponent) {
+  }
+
+  ngOnInit(): void {
     this._nzSelect.addOption(this);
   }
 

diff --git a/src/components/select/nz-select.component.ts b/src/components/select/nz-select.component.ts
@@ -319,7 +319,11 @@ export class NzSelectComponent implements OnInit, AfterContentInit, AfterContent
   addOption = (option) => {
     this._options.push(option);
     if (!this._isTags) {
-      this.forceUpdateSelectedOption(this._value);
+      if (option.nzValue) {
+        this.updateSelectedOption(this._value);
+      } else {
+        this.forceUpdateSelectedOption(this._value);
+      }
     }
   }
 
@@ -672,7 +676,6 @@ export class NzSelectComponent implements OnInit, AfterContentInit, AfterContent
   }
 
   writeValue(value: any): void {
-    // this.nzValue = value;
     this._updateValue(value, false);
   }