other / mew-iview

Commit 79ac2457fde182867a27522a1a1ae437bf5643b1

Authored by Sergio Crisostomo
1 parent b42322fe

Allow DatePicker to receive TimePicker options

Showing 4 changed files with 12 additions and 0 deletions   Show diff stats
Inline Side-by-side
src/components/date-picker/panel/Date/date-panel-mixin.js
  Show/Hide comments   View file @79ac245
... ... @@ -32,6 +32,10 @@ export default {
32 32 type: Array,
33 33 default: () => [initTimeDate(), initTimeDate()]
34 34 },
  35 + timePickerOptions: {
  36 + default: () => ({}),
  37 + type: Object,
  38 + },
35 39 showWeekNumbers: {
36 40 type: Boolean,
37 41 default: false
... ...
src/components/date-picker/panel/Date/date-range.vue
  Show/Hide comments   View file @79ac245
... ... @@ -91,6 +91,7 @@
91 91 :value="dates"
92 92 :format="format"
93 93 :time-disabled="timeDisabled"
  94 + v-bind="timePickerOptions"
94 95 @on-pick="handleRangePick"
95 96 @on-pick-click="handlePickClick"
96 97 @on-pick-clear="handlePickClear"
... ...
src/components/date-picker/panel/Date/date.vue
  Show/Hide comments   View file @79ac245
... ... @@ -50,6 +50,7 @@
50 50 :value="dates"
51 51 :format="format"
52 52 :time-disabled="timeDisabled"
  53 + v-bind="timePickerOptions"
53 54 @on-pick="handlePick"
54 55 @on-pick-click="handlePickClick"
55 56 @on-pick-clear="handlePickClear"
... ...
src/components/date-picker/picker.vue
  Show/Hide comments   View file @79ac245
... ... @@ -48,6 +48,8 @@
48 48 :show-week-numbers="showWeekNumbers"
49 49 :picker-type="type"
50 50  
  51 + :time-picker-options="timePickerOptions"
  52 +
51 53 v-bind="ownPickerProps"
52 54  
53 55 @on-pick="onPick"
... ... @@ -113,6 +115,10 @@
113 115 type: Boolean,
114 116 default: false
115 117 },
  118 + timePickerOptions: {
  119 + default: () => ({}),
  120 + type: Object,
  121 + },
116 122 splitPanels: {
117 123 type: Boolean,
118 124 default: false
... ...