Commit 6af235b13ae5461420d88ebc0a9b40cd3768275c
Committed by
GitHub
GitHub
Merge pull request #2580 from Xotic750/2.0
Fix: Missing steps attribute in time range.
Showing
1 changed file
with
8 additions
and
0 deletions
Show diff stats
src/components/date-picker/panel/time-range.vue
| @@ -8,6 +8,7 @@ | @@ -8,6 +8,7 @@ | ||
| 8 | </div> | 8 | </div> |
| 9 | <time-spinner | 9 | <time-spinner |
| 10 | ref="timeSpinner" | 10 | ref="timeSpinner" |
| 11 | + :steps="steps" | ||
| 11 | :show-seconds="showSeconds" | 12 | :show-seconds="showSeconds" |
| 12 | :hours="hours" | 13 | :hours="hours" |
| 13 | :minutes="minutes" | 14 | :minutes="minutes" |
| @@ -26,6 +27,7 @@ | @@ -26,6 +27,7 @@ | ||
| 26 | </div> | 27 | </div> |
| 27 | <time-spinner | 28 | <time-spinner |
| 28 | ref="timeSpinnerEnd" | 29 | ref="timeSpinnerEnd" |
| 30 | + :steps="steps" | ||
| 29 | :show-seconds="showSeconds" | 31 | :show-seconds="showSeconds" |
| 30 | :hours="hoursEnd" | 32 | :hours="hoursEnd" |
| 31 | :minutes="minutesEnd" | 33 | :minutes="minutesEnd" |
| @@ -60,6 +62,12 @@ | @@ -60,6 +62,12 @@ | ||
| 60 | name: 'TimePicker', | 62 | name: 'TimePicker', |
| 61 | mixins: [ Mixin, Locale ], | 63 | mixins: [ Mixin, Locale ], |
| 62 | components: { TimeSpinner, Confirm }, | 64 | components: { TimeSpinner, Confirm }, |
| 65 | + props: { | ||
| 66 | + steps: { | ||
| 67 | + type: Array, | ||
| 68 | + default: () => [] | ||
| 69 | + } | ||
| 70 | + }, | ||
| 63 | data () { | 71 | data () { |
| 64 | return { | 72 | return { |
| 65 | prefixCls: prefixCls, | 73 | prefixCls: prefixCls, |