Commit 2968067efc5e6817d5e54f30eedf4d165f4784a1
1 parent
35f7a4ae
Checkbox support global setting
Showing
2 changed files
with
6 additions
and
0 deletions
Show diff stats
src/components/checkbox/checkbox-group.vue
| @@ -22,6 +22,9 @@ | @@ -22,6 +22,9 @@ | ||
| 22 | size: { | 22 | size: { |
| 23 | validator (value) { | 23 | validator (value) { |
| 24 | return oneOf(value, ['small', 'large', 'default']); | 24 | return oneOf(value, ['small', 'large', 'default']); |
| 25 | + }, | ||
| 26 | + default () { | ||
| 27 | + return this.$IVIEW.size === '' ? 'default' : this.$IVIEW.size; | ||
| 25 | } | 28 | } |
| 26 | } | 29 | } |
| 27 | }, | 30 | }, |
src/components/checkbox/checkbox.vue
| @@ -63,6 +63,9 @@ | @@ -63,6 +63,9 @@ | ||
| 63 | size: { | 63 | size: { |
| 64 | validator (value) { | 64 | validator (value) { |
| 65 | return oneOf(value, ['small', 'large', 'default']); | 65 | return oneOf(value, ['small', 'large', 'default']); |
| 66 | + }, | ||
| 67 | + default () { | ||
| 68 | + return this.$IVIEW.size === '' ? 'default' : this.$IVIEW.size; | ||
| 66 | } | 69 | } |
| 67 | }, | 70 | }, |
| 68 | name: { | 71 | name: { |