update the master branch to the latest

src/components/date-picker/picker/date-picker.js

@@ -0,0 +1,28 @@
+import Picker from '../picker.vue';
+import DatePickerPanel from '../panel/Date/date.vue';
+import RangeDatePickerPanel from '../panel/Date/date-range.vue';
+
+import { oneOf } from '../../../utils/assist';
+
+export default {
+    name: 'CalendarPicker',
+    mixins: [Picker],
+    props: {
+        type: {
+            validator (value) {
+                return oneOf(value, ['year', 'month', 'date', 'daterange', 'datetime', 'datetimerange']);
+            },
+            default: 'date'
+        },
+    },
+    components: { DatePickerPanel, RangeDatePickerPanel },
+    computed: {
+        panel(){
+            const isRange =  this.type === 'daterange' || this.type === 'datetimerange';
+            return isRange ? 'RangeDatePickerPanel' : 'DatePickerPanel';
+        },
+        ownPickerProps(){
+            return this.options;
+        }
+    },
+};

src/components/date-picker/picker/time-picker.js

@@ -0,0 +1,43 @@
+import Picker from '../picker.vue';
+import TimePickerPanel from '../panel/Time/time.vue';
+import RangeTimePickerPanel from '../panel/Time/time-range.vue';
+import Options from '../time-mixins';
+
+import { findComponentsDownward, oneOf } from '../../../utils/assist';
+
+export default {
+    mixins: [Picker, Options],
+    components: { TimePickerPanel, RangeTimePickerPanel },
+    props: {
+        type: {
+            validator (value) {
+                return oneOf(value, ['time', 'timerange']);
+            },
+            default: 'time'
+        },
+    },
+    computed: {
+        panel(){
+            const isRange =  this.type === 'timerange';
+            return isRange ? 'RangeTimePickerPanel' : 'TimePickerPanel';
+        },
+        ownPickerProps(){
+            return {
+                disabledHours: this.disabledHours,
+                disabledMinutes: this.disabledMinutes,
+                disabledSeconds: this.disabledSeconds,
+                hideDisabledOptions: this.hideDisabledOptions
+            };
+        }
+    },
+    watch: {
+        visible(visible){
+            if (visible) {
+                this.$nextTick(() => {
+                    const spinners = findComponentsDownward(this, 'TimeSpinner');
+                    spinners.forEach(instance => instance.updateScroll());
+                });
+            }
+        }
+    }
+};