diff --git a/src/checkbox-group/index.js b/src/checkbox-group/index.js index 40bee352e..55f24579b 100644 --- a/src/checkbox-group/index.js +++ b/src/checkbox-group/index.js @@ -10,6 +10,7 @@ export default createComponent({ max: Number, disabled: Boolean, iconSize: [Number, String], + checkedColor: String, value: { type: Array, default: () => [] diff --git a/src/checkbox/README.md b/src/checkbox/README.md index 48f13c4b2..d882fb8ed 100644 --- a/src/checkbox/README.md +++ b/src/checkbox/README.md @@ -151,9 +151,9 @@ export default { | shape | Can be set to `square` | *string* | `round` | - | | v-model | Check status | *boolean* | `false` | - | | disabled | Disable checkbox | *boolean* | `false` | - | -| icon-size | Icon size | *string \| number* | `20px` | - | | label-disabled | Whether to disable label click | *boolean* | `false` | - | | label-position | Can be set to `left` | *string* | `right` | - | +| icon-size | Icon size | *string \| number* | `20px` | - | | checked-color | Checked color | *string* | `#1989fa` | - | - | ### CheckboxGroup Props @@ -161,9 +161,10 @@ export default { | Attribute | Description | Type | Default | Version | |------|------|------|------|------| | v-model | Names of all checked checkboxes | *any[]* | - | - | +| max | Maximum amount of checked options | *number* | `0`(Unlimited) | - | | disabled | Disable all checkboxes | *boolean* | `false` | - | | icon-size | Icon size of all checkboxes | *string \| number* | `20px` | 2.2.3 | -| max | Maximum amount of checked options | *number* | `0`(Unlimited) | - | +| checked-color | Checked color of all checkboxes | *string* | `#1989fa` | - | 2.2.3 | ### Checkbox Events diff --git a/src/checkbox/README.zh-CN.md b/src/checkbox/README.zh-CN.md index 9c4ca9fc5..f23e09b8a 100644 --- a/src/checkbox/README.zh-CN.md +++ b/src/checkbox/README.zh-CN.md @@ -153,9 +153,9 @@ export default { | shape | 形状,可选值为 `square` | *string* | `round` | - | | v-model | 是否为选中状态 | *boolean* | `false` | - | | disabled | 是否禁用复选框 | *boolean* | `false` | - | -| icon-size | 当前复选框的图标大小,默认单位为`px` | *string \| number* | `20px` | - | | label-disabled | 是否禁用复选框文本点击 | *boolean* | `false` | - | | label-position | 文本位置,可选值为 `left` | *string* | `right` | - | +| icon-size | 图标大小,默认单位为`px` | *string \| number* | `20px` | - | | checked-color | 选中状态颜色 | *string* | `#1989fa` | - | ### CheckboxGroup Props @@ -164,8 +164,9 @@ export default { |------|------|------|------|------| | v-model | 所有选中项的标识符 | *any[]* | - | - | | disabled | 是否禁用所有复选框 | *boolean* | `false` | - | +| max | 最大可选数,0 为无限制 | *number* | `0` | - | | icon-size | 所有复选框的图标大小,默认单位为`px` | *string \| number* | `20px` | 2.2.3 | -| max | 设置最大可选数,0 为无限制 | *number* | `0` | - | +| checked-color | 所有复选框的选中状态颜色 | *string* | `#1989fa` | 2.2.3 | ### Checkbox Events diff --git a/src/checkbox/test/__snapshots__/index.spec.js.snap b/src/checkbox/test/__snapshots__/index.spec.js.snap index 5bd649fd9..311746d8d 100644 --- a/src/checkbox/test/__snapshots__/index.spec.js.snap +++ b/src/checkbox/test/__snapshots__/index.spec.js.snap @@ -1,11 +1,20 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP +exports[`checked-color prop 1`] = ` +