github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

Checkbox: Using the max attribute can limit the number of items that can be checked (#14742) (#15585)

pull/15761/head
MASONGZHI 2019-05-28 20:41:13 +08:00 committed by luckyCao
parent 384c56381c
commit c04021e4dc
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/checkbox/src/checkbox-button.vue
View File

@ -35,7 +35,7 @@
@focus="focus = true" @focus="focus = true"
@blur="focus = false"> @blur="focus = false">
<span class="el-checkbox-button__inner" <span class="el-checkbox-button__inner"
v-if="$slots.default || label" v-if="$slots.default || label"
:style="isChecked ? activeStyle : null"> :style="isChecked ? activeStyle : null">
<slot>{{label}}</slot> <slot>{{label}}</slot>
@ -150,9 +150,17 @@
return this._checkboxGroup.checkboxGroupSize || this._elFormItemSize || (this.$ELEMENT || {}).size; return this._checkboxGroup.checkboxGroupSize || this._elFormItemSize || (this.$ELEMENT || {}).size;
}, },
/* used to make the isDisabled judgment under max/min props */
isLimitDisabled() {
const { max, min } = this._checkboxGroup;
return !!(max || min) &&
(this.model.length >= max && !this.isChecked) ||
(this.model.length <= min && this.isChecked);
},
isDisabled() { isDisabled() {
return this._checkboxGroup return this._checkboxGroup
? this._checkboxGroup.disabled || this.disabled || (this.elForm || {}).disabled ? this._checkboxGroup.disabled || this.disabled || (this.elForm || {}).disabled || this.isLimitDisabled
: this.disabled || (this.elForm || {}).disabled; : this.disabled || (this.elForm || {}).disabled;
} }
}, },

10
packages/checkbox/src/checkbox.vue
View File

@ -136,9 +136,17 @@
return this._checkboxGroup ? this._checkboxGroup.value : this.value; return this._checkboxGroup ? this._checkboxGroup.value : this.value;
}, },
/* used to make the isDisabled judgment under max/min props */
isLimitDisabled() {
const { max, min } = this._checkboxGroup;
return !!(max || min) &&
(this.model.length >= max && !this.isChecked) ||
(this.model.length <= min && this.isChecked);
},
isDisabled() { isDisabled() {
return this.isGroup return this.isGroup
? this._checkboxGroup.disabled || this.disabled || (this.elForm || {}).disabled ? this._checkboxGroup.disabled || this.disabled || (this.elForm || {}).disabled || this.isLimitDisabled
: this.disabled || (this.elForm || {}).disabled; : this.disabled || (this.elForm || {}).disabled;
}, },

3
test/unit/specs/checkbox.spec.js
View File

@ -147,6 +147,7 @@ describe('Checkbox', () => {
} }
}, true); }, true);
expect(vm.checkList.length === 1).to.be.true; expect(vm.checkList.length === 1).to.be.true;
expect(vm.$refs.a.isDisabled).to.be.true;
vm.$refs.a.$el.click(); vm.$refs.a.$el.click();
vm.$nextTick(() => { vm.$nextTick(() => {
expect(vm.checkList.indexOf('a') !== -1).to.be.true; expect(vm.checkList.indexOf('a') !== -1).to.be.true;
@ -158,6 +159,8 @@ describe('Checkbox', () => {
vm.$nextTick(() => { vm.$nextTick(() => {
expect(vm.checkList.indexOf('c') !== -1).to.be.false; expect(vm.checkList.indexOf('c') !== -1).to.be.false;
expect(vm.checkList.indexOf('d') !== -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(); done();
}); });
}); });