github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2374 from QingWei-Li/fix/datepicker/firstdayofweek 

DatePicker: fix firstDayOfWeek is not work when the daterange type, f…
pull/2395/head
baiyaaaaa 2017-01-13 14:48:36 +08:00 committed by GitHub
parent d5f4603f59 024ff2a96c
commit 123069ddd5
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/date-picker/src/panel/date-range.vue
View File

@ -100,6 +100,7 @@
:range-state="rangeState" :range-state="rangeState"
:disabled-date="disabledDate" :disabled-date="disabledDate"
@changerange="handleChangeRange" @changerange="handleChangeRange"
:first-day-of-week="firstDayOfWeek"
@pick="handleRangePick"> @pick="handleRangePick">
</date-table> </date-table>
</div> </div>
@ -125,7 +126,9 @@
:range-state="rangeState" :range-state="rangeState"
:disabled-date="disabledDate" :disabled-date="disabledDate"
@changerange="handleChangeRange" @changerange="handleChangeRange"
@pick="handleRangePick"></date-table> :first-day-of-week="firstDayOfWeek"
@pick="handleRangePick">
</date-table>
</div> </div>
</div> </div>
</div> </div>
@ -232,6 +235,7 @@
value: '', value: '',
visible: '', visible: '',
disabledDate: '', disabledDate: '',
firstDayOfWeek: 7,
minTimePickerVisible: false, minTimePickerVisible: false,
maxTimePickerVisible: false, maxTimePickerVisible: false,
width: 0 width: 0