From 128769be1cf5bb5ada291f6ac7a16e720f609605 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= Date: Tue, 28 Jan 2020 22:12:12 +0800 Subject: [PATCH] feat(Checkbox): max can be string type --- src/checkbox-group/index.js | 2 +- src/checkbox/README.md | 2 +- src/checkbox/README.zh-CN.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/checkbox-group/index.js b/src/checkbox-group/index.js index f9c5e0e50..72acf8fee 100644 --- a/src/checkbox-group/index.js +++ b/src/checkbox-group/index.js @@ -7,7 +7,7 @@ export default createComponent({ mixins: [ParentMixin('vanCheckbox')], props: { - max: Number, + max: [Number, String], disabled: Boolean, iconSize: [Number, String], checkedColor: String, diff --git a/src/checkbox/README.md b/src/checkbox/README.md index 7f380afc9..d5503d875 100644 --- a/src/checkbox/README.md +++ b/src/checkbox/README.md @@ -202,7 +202,7 @@ export default { | Attribute | Description | Type | Default | |------|------|------|------| | v-model | Names of all checked checkboxes | *any[]* | - | -| max | Maximum amount of checked options | *number* | `0`(Unlimited) | +| max | Maximum amount of checked options | *string \| number* | `0`(Unlimited) | | disabled | Disable all checkboxes | *boolean* | `false` | | icon-size `v2.2.3` | Icon size of all checkboxes | *string \| number* | `20px` | | checked-color `v2.2.3` | Checked color of all checkboxes | *string* | `#1989fa` | - | diff --git a/src/checkbox/README.zh-CN.md b/src/checkbox/README.zh-CN.md index d782add0b..74b99c5da 100644 --- a/src/checkbox/README.zh-CN.md +++ b/src/checkbox/README.zh-CN.md @@ -219,7 +219,7 @@ export default { |------|------|------|------| | v-model | 所有选中项的标识符 | *any[]* | - | | disabled | 是否禁用所有复选框 | *boolean* | `false` | -| max | 最大可选数，0 为无限制 | *number* | `0` | +| max | 最大可选数，0 为无限制 | *string \| number* | `0` | | icon-size `v2.2.3` | 所有复选框的图标大小，默认单位为`px` | *string \| number* | `20px` | | checked-color `v2.2.3` | 所有复选框的选中状态颜色 | *string* | `#1989fa` |