Checkbox: Using the max attribute can limit the number of items that …

…can be checked (#14742)
ElemeFE · May 16, 2019 · 878c1c1 · 878c1c1
1 parent 16a6059
commit 878c1c1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/packages/checkbox/src/checkbox-button.vue b/packages/checkbox/src/checkbox-button.vue
@@ -35,7 +35,7 @@
       @focus="focus = true"
       @blur="focus = false">
 
-    <span class="el-checkbox-button__inner" 
+    <span class="el-checkbox-button__inner"
       v-if="$slots.default || label"
       :style="isChecked ? activeStyle : null">
       <slot>{{label}}</slot>
@@ -152,7 +152,7 @@
 
       isDisabled() {
         return this._checkboxGroup
-          ? this._checkboxGroup.disabled || this.disabled || (this.elForm || {}).disabled
+          ? this._checkboxGroup.disabled || this.disabled || (this.elForm || {}).disabled || (this.model.length >= this._checkboxGroup.max && !this.isChecked) || (this.model.length <= this._checkboxGroup.min && this.isChecked)
           : this.disabled || (this.elForm || {}).disabled;
       }
     },

diff --git a/packages/checkbox/src/checkbox.vue b/packages/checkbox/src/checkbox.vue
@@ -138,7 +138,7 @@
 
       isDisabled() {
         return this.isGroup
-          ? this._checkboxGroup.disabled || this.disabled || (this.elForm || {}).disabled
+          ? this._checkboxGroup.disabled || this.disabled || (this.elForm || {}).disabled || (this.model.length >= this._checkboxGroup.max && !this.isChecked) || (this.model.length <= this._checkboxGroup.min && this.isChecked)
           : this.disabled || (this.elForm || {}).disabled;
       },
 

diff --git a/test/unit/specs/checkbox.spec.js b/test/unit/specs/checkbox.spec.js
@@ -147,6 +147,7 @@ describe('Checkbox', () => {
       }
     }, true);
     expect(vm.checkList.length === 1).to.be.true;
+    expect(vm.$refs.a.isDisabled).to.be.true;
     vm.$refs.a.$el.click();
     vm.$nextTick(() => {
       expect(vm.checkList.indexOf('a') !== -1).to.be.true;
@@ -158,6 +159,8 @@ describe('Checkbox', () => {
         vm.$nextTick(() => {
           expect(vm.checkList.indexOf('c') !== -1).to.be.false;
           expect(vm.checkList.indexOf('d') !== -1).to.be.false;
+          expect(vm.$refs.c.isDisabled).to.be.true;
+          expect(vm.$refs.d.isDisabled).to.be.true;
           done();
         });
       });