mirrors/element
1
0
Fork 0
mirror of https://github.com/ElemeFE/element.git synced 2025-12-16 11:44:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

DatePicker: Daylight Saving Time (#7599)

Browse Source 
* date-table: fix daylight saving time highlight

* test: update date-picker range test
This commit is contained in:
Jiewei Qian
2017-10-20 14:06:44 +11:00
committed by 杨奕
parent 8313016dae
commit af46f968ab
5 changed files with 121 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/date-picker/src/basic/month-table.vue
View File

@@ -49,14 +49,13 @@
<script type="text/babel">
import Locale from 'element-ui/src/mixins/locale';
import { isDate, range, getDayCountOfMonth } from '../util';
import { isDate, range, getDayCountOfMonth, nextDate } from '../util';
import { hasClass } from 'element-ui/src/utils/dom';
const datesInMonth = (year, month) => {
const numOfDays = getDayCountOfMonth(year, month);
const firstDay = new Date(year, month, 1);
const ONE_DAY = 8.64e7;
return range(numOfDays).map(n => new Date(firstDay.getTime() + n * ONE_DAY));
return range(numOfDays).map(n => nextDate(firstDay, n));
};
export default {