fix(module: checkbox): disable checked status while disabled is true (#…

…170)
NG-ZORRO · Dec 19, 2018 · 5fe311f · 5fe311f
1 parent d29a08a
commit 5fe311f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 2 deletions.
diff --git a/components/checkbox/agree-item.component.ts b/components/checkbox/agree-item.component.ts
@@ -57,6 +57,7 @@ export class AgreeItem implements ControlValueAccessor {
   constructor() { }
 
   change(event) {
+    this.checked = event.checked;
     this._ngModelOnChange(event.checked);
     this.onChange.emit(event);
   }

diff --git a/components/checkbox/checkbox-item.component.ts b/components/checkbox/checkbox-item.component.ts
@@ -46,6 +46,7 @@ export class CheckboxItem implements ControlValueAccessor {
   onCheckboxClick(event) { }
 
   change(event) {
+    this.checked = event.checked;
     this._ngModelOnChange(event.checked);
     this.onChange.emit(event);
   }

diff --git a/components/checkbox/checkbox.component.html b/components/checkbox/checkbox.component.html
@@ -4,6 +4,7 @@
          [attr.name]="name"
          [attr.value]="value"
          [checked]="checked"
+         [disabled]="disabled"
   >
   <span class="{{prefixCls}}-inner"></span>
 </span>

diff --git a/components/checkbox/checkbox.component.ts b/components/checkbox/checkbox.component.ts
@@ -42,8 +42,10 @@ export class Checkbox implements OnInit {
     return this._checked;
   }
   set checked(value: boolean) {
-    this._checked = value;
-    this.updateClassMap();
+    if (!this._disabled) {
+      this._checked = value;
+      this.updateClassMap();
+    }
   }
   @Input()
   get disabled(): boolean {

diff --git a/components/radio/radio.component.html b/components/radio/radio.component.html
@@ -4,6 +4,7 @@
          [attr.name]="name"
          [attr.value]="value"
          [checked]="checked"
+         [disabled]="disabled"
   >
   <span class="{{prefixCls}}-inner"></span>
 </span>