drip-public/iview
6
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Scroll add height prop

Browse source
This commit is contained in:
梁灏 2017-10-16 18:32:47 +08:00
parent 74624787ef
commit 6850c1da89
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/date-picker/base/date-table.vue
View file

@ -93,7 +93,7 @@
const weekStartDay = Number(this.t('i.datepicker.weekStartDay')); const weekStartDay = Number(this.t('i.datepicker.weekStartDay'));
const translatedDays = ['sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'].map(item => { const translatedDays = ['sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'].map(item => {
return this.t('i.datepicker.weeks.' + item); return this.t('i.datepicker.weeks.' + item);
}) });
const weekDays = translatedDays.splice(weekStartDay, 7 - weekStartDay).concat(translatedDays.splice(0, weekStartDay)); const weekDays = translatedDays.splice(weekStartDay, 7 - weekStartDay).concat(translatedDays.splice(0, weekStartDay));
return weekDays; return weekDays;
}, },

5
src/components/scroll/scroll.vue
View file

@ -2,6 +2,7 @@
<div :class="wrapClasses" style="touch-action: none;"> <div :class="wrapClasses" style="touch-action: none;">
<div <div
:class="scrollContainerClasses" :class="scrollContainerClasses"
:style="{height: height + 'px'}"
@scroll="handleScroll" @scroll="handleScroll"
@wheel="onWheel" @wheel="onWheel"
@touchstart="onPointerDown" @touchstart="onPointerDown"
@ -35,6 +36,10 @@
mixins: [], mixins: [],
components: {loader}, components: {loader},
props: { props: {
height: {
type: [Number, String],
default: 300
},
onReachTop: { onReachTop: {
type: Function, type: Function,
default: () => Promise.resolve() default: () => Promise.resolve()