Commit 6850c1da89fbe7e1d79be5e580ffc885201c4b2e

Authored by 梁灏
1 parent 74624787

Scroll add `height` prop

src/components/date-picker/base/date-table.vue
... ... @@ -93,7 +93,7 @@
93 93 const weekStartDay = Number(this.t('i.datepicker.weekStartDay'));
94 94 const translatedDays = ['sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'].map(item => {
95 95 return this.t('i.datepicker.weeks.' + item);
96   - })
  96 + });
97 97 const weekDays = translatedDays.splice(weekStartDay, 7 - weekStartDay).concat(translatedDays.splice(0, weekStartDay));
98 98 return weekDays;
99 99 },
... ...
src/components/scroll/scroll.vue
... ... @@ -2,6 +2,7 @@
2 2 <div :class="wrapClasses" style="touch-action: none;">
3 3 <div
4 4 :class="scrollContainerClasses"
  5 + :style="{height: height + 'px'}"
5 6 @scroll="handleScroll"
6 7 @wheel="onWheel"
7 8 @touchstart="onPointerDown"
... ... @@ -35,6 +36,10 @@
35 36 mixins: [],
36 37 components: {loader},
37 38 props: {
  39 + height: {
  40 + type: [Number, String],
  41 + default: 300
  42 + },
38 43 onReachTop: {
39 44 type: Function,
40 45 default: () => Promise.resolve()
... ...