Merge pull request #3091 from SergioCrisostomo/datepicker
Allow DatePicker to receive TimePicker options
This commit is contained in:
commit
c3beef276c
4 changed files with 12 additions and 0 deletions
|
@ -32,6 +32,10 @@ export default {
|
||||||
type: Array,
|
type: Array,
|
||||||
default: () => [initTimeDate(), initTimeDate()]
|
default: () => [initTimeDate(), initTimeDate()]
|
||||||
},
|
},
|
||||||
|
timePickerOptions: {
|
||||||
|
default: () => ({}),
|
||||||
|
type: Object,
|
||||||
|
},
|
||||||
showWeekNumbers: {
|
showWeekNumbers: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: false
|
default: false
|
||||||
|
|
|
@ -91,6 +91,7 @@
|
||||||
:value="dates"
|
:value="dates"
|
||||||
:format="format"
|
:format="format"
|
||||||
:time-disabled="timeDisabled"
|
:time-disabled="timeDisabled"
|
||||||
|
v-bind="timePickerOptions"
|
||||||
@on-pick="handleRangePick"
|
@on-pick="handleRangePick"
|
||||||
@on-pick-click="handlePickClick"
|
@on-pick-click="handlePickClick"
|
||||||
@on-pick-clear="handlePickClear"
|
@on-pick-clear="handlePickClear"
|
||||||
|
|
|
@ -50,6 +50,7 @@
|
||||||
:value="dates"
|
:value="dates"
|
||||||
:format="format"
|
:format="format"
|
||||||
:time-disabled="timeDisabled"
|
:time-disabled="timeDisabled"
|
||||||
|
v-bind="timePickerOptions"
|
||||||
@on-pick="handlePick"
|
@on-pick="handlePick"
|
||||||
@on-pick-click="handlePickClick"
|
@on-pick-click="handlePickClick"
|
||||||
@on-pick-clear="handlePickClear"
|
@on-pick-clear="handlePickClear"
|
||||||
|
|
|
@ -48,6 +48,8 @@
|
||||||
:show-week-numbers="showWeekNumbers"
|
:show-week-numbers="showWeekNumbers"
|
||||||
:picker-type="type"
|
:picker-type="type"
|
||||||
|
|
||||||
|
:time-picker-options="timePickerOptions"
|
||||||
|
|
||||||
v-bind="ownPickerProps"
|
v-bind="ownPickerProps"
|
||||||
|
|
||||||
@on-pick="onPick"
|
@on-pick="onPick"
|
||||||
|
@ -113,6 +115,10 @@
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: false
|
default: false
|
||||||
},
|
},
|
||||||
|
timePickerOptions: {
|
||||||
|
default: () => ({}),
|
||||||
|
type: Object,
|
||||||
|
},
|
||||||
splitPanels: {
|
splitPanels: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: false
|
default: false
|
||||||
|
|
Loading…
Add table
Reference in a new issue