fix(module: checkbox): fix checkbox init status when checked is true (#…

…193)
NG-ZORRO · Dec 25, 2018 · 0293e85 · 0293e85
1 parent b0f41b7
commit 0293e85
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/components/checkbox/agree-item.component.ts b/components/checkbox/agree-item.component.ts
@@ -5,6 +5,7 @@ import {
   Output,
   EventEmitter,
   HostBinding,
+  ChangeDetectorRef,
   ViewEncapsulation,
   ChangeDetectionStrategy
 } from '@angular/core';
@@ -54,7 +55,7 @@ export class AgreeItem implements ControlValueAccessor {
   @HostBinding('class.am-checkbox-agree')
   checkboxAgree: boolean = true;
 
-  constructor() { }
+  constructor(private cdr: ChangeDetectorRef) { }
 
   change(event) {
     this.checked = event.checked;
@@ -64,6 +65,7 @@ export class AgreeItem implements ControlValueAccessor {
 
   writeValue(value: boolean): void {
     this.checked = value;
+    this.cdr.markForCheck();
   }
 
   registerOnChange(fn: (_: boolean) => {}): void {

diff --git a/components/checkbox/checkbox-item.component.ts b/components/checkbox/checkbox-item.component.ts
@@ -1,4 +1,4 @@
-import { Component, forwardRef, Input, Output, EventEmitter, ChangeDetectionStrategy, ViewEncapsulation } from '@angular/core';
+import { Component, forwardRef, Input, Output, EventEmitter, ChangeDetectionStrategy, ChangeDetectorRef, ViewEncapsulation } from '@angular/core';
 import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
 
 export interface CheckboxStatus {
@@ -41,7 +41,7 @@ export class CheckboxItem implements ControlValueAccessor {
   @Output()
   onChange = new EventEmitter<CheckboxStatus>();
 
-  constructor() { }
+  constructor(private cdr: ChangeDetectorRef) { }
 
   onCheckboxClick(event) { }
 
@@ -53,6 +53,7 @@ export class CheckboxItem implements ControlValueAccessor {
 
   writeValue(value: boolean): void {
     this.checked = value;
+    this.cdr.markForCheck();
   }
 
   registerOnChange(fn: (_: boolean) => {}): void {

diff --git a/components/checkbox/demo/basic.ts b/components/checkbox/demo/basic.ts
@@ -38,12 +38,12 @@ import { Component } from '@angular/core';
 export class DemoCheckboxBasicComponent {
   checkItemListData = [
     { value: 0, name: 'Ph.D.', checked: false },
-    { value: 1, name: 'Bachelor', checked: false },
+    { value: 1, name: 'Bachelor', checked: true },
     { value: 2, name: 'College diploma', checked: false }
   ];
   disabledStatus: boolean = true;
   disabledCheckboxItemStatus: boolean = true;
-  agreeItemData = { value: 'Agree Submit', name: 'Agree Item', checked: false };
+  agreeItemData = { value: 'Agree Submit', name: 'Agree Item', checked: true };
 
   onChange = (val: any) => {
     console.log('onChange Event: ', val);