From 79ac2457fde182867a27522a1a1ae437bf5643b1 Mon Sep 17 00:00:00 2001
From: Sergio Crisostomo <sergiosbox@gmail.com>
Date: Sat, 3 Mar 2018 12:51:53 +0100
Subject: [PATCH] Allow DatePicker to receive TimePicker options

---
 src/components/date-picker/panel/Date/date-panel-mixin.js | 4 ++++
 src/components/date-picker/panel/Date/date-range.vue      | 1 +
 src/components/date-picker/panel/Date/date.vue            | 1 +
 src/components/date-picker/picker.vue                     | 6 ++++++
 4 files changed, 12 insertions(+)

diff --git a/src/components/date-picker/panel/Date/date-panel-mixin.js b/src/components/date-picker/panel/Date/date-panel-mixin.js
index 892ce890..29360002 100644
--- a/src/components/date-picker/panel/Date/date-panel-mixin.js
+++ b/src/components/date-picker/panel/Date/date-panel-mixin.js
@@ -32,6 +32,10 @@ export default {
             type: Array,
             default: () => [initTimeDate(), initTimeDate()]
         },
+        timePickerOptions: {
+            default: () => ({}),
+            type: Object,
+        },
         showWeekNumbers: {
             type: Boolean,
             default: false
diff --git a/src/components/date-picker/panel/Date/date-range.vue b/src/components/date-picker/panel/Date/date-range.vue
index c72b7885..8ef28065 100644
--- a/src/components/date-picker/panel/Date/date-range.vue
+++ b/src/components/date-picker/panel/Date/date-range.vue
@@ -91,6 +91,7 @@
                     :value="dates"
                     :format="format"
                     :time-disabled="timeDisabled"
+                    v-bind="timePickerOptions"
                     @on-pick="handleRangePick"
                     @on-pick-click="handlePickClick"
                     @on-pick-clear="handlePickClear"
diff --git a/src/components/date-picker/panel/Date/date.vue b/src/components/date-picker/panel/Date/date.vue
index e1157920..9a595b9a 100644
--- a/src/components/date-picker/panel/Date/date.vue
+++ b/src/components/date-picker/panel/Date/date.vue
@@ -50,6 +50,7 @@
                     :value="dates"
                     :format="format"
                     :time-disabled="timeDisabled"
+                    v-bind="timePickerOptions"
                     @on-pick="handlePick"
                     @on-pick-click="handlePickClick"
                     @on-pick-clear="handlePickClear"
diff --git a/src/components/date-picker/picker.vue b/src/components/date-picker/picker.vue
index f879b1f6..978c1847 100644
--- a/src/components/date-picker/picker.vue
+++ b/src/components/date-picker/picker.vue
@@ -48,6 +48,8 @@
                         :show-week-numbers="showWeekNumbers"
                         :picker-type="type"
 
+                        :time-picker-options="timePickerOptions"
+
                         v-bind="ownPickerProps"
 
                         @on-pick="onPick"
@@ -113,6 +115,10 @@
                 type: Boolean,
                 default: false
             },
+            timePickerOptions: {
+                default: () => ({}),
+                type: Object,
+            },
             splitPanels: {
                 type: Boolean,
                 default: false