Skip to content

fix: 日期选择器的时间应该一整天时间(例如2021/1/28) #209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/RangePicker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,12 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
(!isEqual(generateConfig, getValue(mergedValue, 0), startValue) ||
!isEqual(generateConfig, getValue(mergedValue, 1), endValue))
) {
if(values){
values = [
values[0] ? generateConfig.getStartDay(values[0]) : values[0],
values[1] ? generateConfig.getStartDay(values[1]) : values[1]
];
}
onChange(values, [startStr, endStr]);
}
}
Expand Down
4 changes: 4 additions & 0 deletions src/generate/dateFns.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import {
getMonth,
getDate,
endOfMonth,
startOfDay,
endOfDay,
getHours,
getMinutes,
getSeconds,
Expand Down Expand Up @@ -45,6 +47,8 @@ const generateConfig: GenerateConfig<Date> = {
getFixedDate: string => new Date(string),
getEndDate: date => endOfMonth(date),
getWeekDay: date => getDay(date),
getStartDay: date => startOfDay(date),
getEndDay: date => endOfDay(date),
getYear: date => getYear(date),
getMonth: date => getMonth(date),
getDate: date => getDate(date),
Expand Down
2 changes: 2 additions & 0 deletions src/generate/dayjs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ const generateConfig: GenerateConfig<Dayjs> = {
getNow: () => dayjs(),
getFixedDate: string => dayjs(string, 'YYYY-MM-DD'),
getEndDate: date => date.endOf('month'),
getStartDay: date => date.startOf('day'),
getEndDay: date => date.endOf('day'),
getWeekDay: date => {
const clone = date.locale('en');
return clone.weekday() + clone.localeData().firstDayOfWeek();
Expand Down
2 changes: 2 additions & 0 deletions src/generate/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ export type GenerateConfig<DateType> = {
getNow: () => DateType;
getFixedDate: (fixed: string) => DateType;
getEndDate: (value: DateType) => DateType;
getStartDay: (value: DateType) => DateType;
getEndDay: (value: DateType) => DateType;

// Set
addYear: (value: DateType, diff: number) => DateType;
Expand Down
8 changes: 8 additions & 0 deletions src/generate/moment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@ const generateConfig: GenerateConfig<Moment> = {
// get
getNow: () => moment(),
getFixedDate: string => moment(string, 'YYYY-MM-DD'),
getStartDay: date => {
const clone = date.clone();
return clone.startOf('day');
},
getEndDay: date => {
const clone = date.clone();
return clone.endOf('day');
},
getEndDate: date => {
const clone = date.clone();
return clone.endOf('month');
Expand Down
8 changes: 7 additions & 1 deletion tests/generate.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@ describe('Picker.Generate', () => {
describe(name, () => {
it('get', () => {
const now = generateConfig.getNow();
const fixedDate = generateConfig.getFixedDate('1990-09-03');
const fixedDate = generateConfig.getFixedDate('1990-09-03 05:02:03');
const endDate = generateConfig.getEndDate(fixedDate);
const startDayDate = generateConfig.getStartDay(fixedDate);
const endDayDate = generateConfig.getEndDay(fixedDate);
expect(generateConfig.getWeekDay(now)).toEqual(1);
expect(generateConfig.getSecond(now)).toEqual(3);
expect(generateConfig.getMinute(now)).toEqual(2);
Expand All @@ -38,9 +40,13 @@ describe('Picker.Generate', () => {
expect(generateConfig.getMonth(now)).toEqual(8);
expect(generateConfig.getMonth(fixedDate)).toEqual(8);
expect(generateConfig.getMonth(endDate)).toEqual(8);
expect(generateConfig.getMonth(startDayDate)).toEqual(8);
expect(generateConfig.getMonth(endDayDate)).toEqual(8);
expect(generateConfig.getYear(now)).toEqual(1990);
expect(generateConfig.getYear(fixedDate)).toEqual(1990);
expect(generateConfig.getYear(endDate)).toEqual(1990);
expect(generateConfig.getYear(startDayDate)).toEqual(1990);
expect(generateConfig.getYear(endDayDate)).toEqual(1990);
});

it('set', () => {
Expand Down
8 changes: 4 additions & 4 deletions tests/range.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,12 @@ describe('Picker.Range', () => {
onCalendarChange.mockReset();
wrapper.selectCell(14);

expect(isSame(onChange.mock.calls[0][0][0], '1990-09-13')).toBeTruthy();
expect(isSame(onChange.mock.calls[0][0][1], '1990-09-14')).toBeTruthy();
expect(isSame(onChange.mock.calls[0][0][0], '1990-09-13 00:00:00')).toBeTruthy();
expect(isSame(onChange.mock.calls[0][0][1], '1990-09-14 00:00:00')).toBeTruthy();
expect(onChange.mock.calls[0][1]).toEqual(['1990-09-13', '1990-09-14']);

expect(isSame(onCalendarChange.mock.calls[0][0][0], '1990-09-13')).toBeTruthy();
expect(isSame(onCalendarChange.mock.calls[0][0][1], '1990-09-14')).toBeTruthy();
expect(isSame(onCalendarChange.mock.calls[0][0][0], '1990-09-13 00:00:00')).toBeTruthy();
expect(isSame(onCalendarChange.mock.calls[0][0][1], '1990-09-14 00:00:00')).toBeTruthy();
expect(onCalendarChange.mock.calls[0][1]).toEqual(['1990-09-13', '1990-09-14']);
});
});
Expand Down