Merge pull request #2580 from Xotic750/2.0

Fix: Missing steps attribute in time range.
This commit is contained in:
Aresn 2017-12-11 09:39:29 +08:00 committed by GitHub
commit 6af235b13a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -8,6 +8,7 @@
</div> </div>
<time-spinner <time-spinner
ref="timeSpinner" ref="timeSpinner"
:steps="steps"
:show-seconds="showSeconds" :show-seconds="showSeconds"
:hours="hours" :hours="hours"
:minutes="minutes" :minutes="minutes"
@ -26,6 +27,7 @@
</div> </div>
<time-spinner <time-spinner
ref="timeSpinnerEnd" ref="timeSpinnerEnd"
:steps="steps"
:show-seconds="showSeconds" :show-seconds="showSeconds"
:hours="hoursEnd" :hours="hoursEnd"
:minutes="minutesEnd" :minutes="minutesEnd"
@ -60,6 +62,12 @@
name: 'TimePicker', name: 'TimePicker',
mixins: [ Mixin, Locale ], mixins: [ Mixin, Locale ],
components: { TimeSpinner, Confirm }, components: { TimeSpinner, Confirm },
props: {
steps: {
type: Array,
default: () => []
}
},
data () { data () {
return { return {
prefixCls: prefixCls, prefixCls: prefixCls,