From 6850c1da89fbe7e1d79be5e580ffc885201c4b2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Mon, 16 Oct 2017 18:32:47 +0800
Subject: [PATCH] Scroll add `height` prop

---
 src/components/date-picker/base/date-table.vue | 2 +-
 src/components/scroll/scroll.vue               | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/date-picker/base/date-table.vue b/src/components/date-picker/base/date-table.vue
index aa66e280..23be43a2 100644
--- a/src/components/date-picker/base/date-table.vue
+++ b/src/components/date-picker/base/date-table.vue
@@ -93,7 +93,7 @@
                 const weekStartDay = Number(this.t('i.datepicker.weekStartDay'));
                 const translatedDays = ['sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'].map(item => {
                     return this.t('i.datepicker.weeks.' + item);
-                })
+                });
                 const weekDays = translatedDays.splice(weekStartDay, 7 - weekStartDay).concat(translatedDays.splice(0, weekStartDay));
                 return weekDays;
             },
diff --git a/src/components/scroll/scroll.vue b/src/components/scroll/scroll.vue
index 041994d7..a16d3658 100644
--- a/src/components/scroll/scroll.vue
+++ b/src/components/scroll/scroll.vue
@@ -2,6 +2,7 @@
     <div :class="wrapClasses" style="touch-action: none;">
         <div
             :class="scrollContainerClasses"
+            :style="{height: height + 'px'}"
             @scroll="handleScroll"
             @wheel="onWheel"
             @touchstart="onPointerDown"
@@ -35,6 +36,10 @@
         mixins: [],
         components: {loader},
         props: {
+            height: {
+                type: [Number, String],
+                default: 300
+            },
             onReachTop: {
                 type: Function,
                 default: () => Promise.resolve()