Commit 20cfa1b6da97362425dc2f658e424b951b994860
1 parent
604ae4d3
DatePicker support global setting
Showing
1 changed file
with
6 additions
and
1 deletions
Show diff stats
src/components/date-picker/picker.vue
| @@ -171,6 +171,9 @@ | @@ -171,6 +171,9 @@ | ||
| 171 | size: { | 171 | size: { |
| 172 | validator (value) { | 172 | validator (value) { |
| 173 | return oneOf(value, ['small', 'large', 'default']); | 173 | return oneOf(value, ['small', 'large', 'default']); |
| 174 | + }, | ||
| 175 | + default () { | ||
| 176 | + return this.$IVIEW.size === '' ? 'default' : this.$IVIEW.size; | ||
| 174 | } | 177 | } |
| 175 | }, | 178 | }, |
| 176 | placeholder: { | 179 | placeholder: { |
| @@ -185,7 +188,9 @@ | @@ -185,7 +188,9 @@ | ||
| 185 | }, | 188 | }, |
| 186 | transfer: { | 189 | transfer: { |
| 187 | type: Boolean, | 190 | type: Boolean, |
| 188 | - default: false | 191 | + default () { |
| 192 | + return this.$IVIEW.transfer === '' ? false : this.$IVIEW.transfer; | ||
| 193 | + } | ||
| 189 | }, | 194 | }, |
| 190 | name: { | 195 | name: { |
| 191 | type: String | 196 | type: String |