Skip to content

feat: 支持二次更改时间选择器时可单次变更日期 #1498

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.

Sign up for GitHub

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

Merged
xiaosansiji merged 1 commit into from
Sep 13, 2022
Merged

feat: 支持二次更改时间选择器时可单次变更日期 #1498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 27 additions & 17 deletions src/date-picker/DateRangePicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ export default defineComponent({
// 面板展开重置数据
if (visible) {
isSelected.value = false;
isFirstValueSelected.value = false;
cacheValue.value = formatDate(value.value || [], {
format: formatRef.value.format,
targetFormat: formatRef.value.format,
Expand Down Expand Up @@ -85,6 +84,13 @@ export default defineComponent({
year.value = value.value.map((v: string) => parseToDayjs(v || new Date(), formatRef.value.format).year());
month.value = value.value.map((v: string) => parseToDayjs(v || new Date(), formatRef.value.format).month());
}
} else {
isHoverCell.value = false;
isFirstValueSelected.value = false;
inputValue.value = formatDate(value.value, {
format: formatRef.value.format,
targetFormat: formatRef.value.format,
});
}
});

Expand Down Expand Up @@ -147,8 +153,8 @@ export default defineComponent({
// 确保两端都是有效值
const notValidIndex = nextValue.findIndex((v) => !v || !isValidDate(v, formatRef.value.format));

// 首次点击不关闭、确保两端都有有效值并且无时间选择器时点击后自动关闭
if (notValidIndex === -1 && nextValue.length === 2 && !props.enableTimePicker && isFirstValueSelected.value) {
// 当两端都有有效值时更改 value
if (notValidIndex === -1 && nextValue.length === 2) {
onChange?.(
formatDate(nextValue, {
format: formatRef.value.format,
Expand All @@ -159,14 +165,16 @@ export default defineComponent({
trigger: 'pick',
},
);
isFirstValueSelected.value = false;
popupVisible.value = false;
} else if (notValidIndex !== -1) {
activeIndex.value = notValidIndex;
}

// 首次点击不关闭、确保两端都有有效值并且无时间选择器时点击后自动关闭
if (!isFirstValueSelected.value) {
let nextIndex = notValidIndex;
if (nextIndex === -1) nextIndex = activeIndex.value ? 0 : 1;
activeIndex.value = nextIndex;
isFirstValueSelected.value = true;
} else {
activeIndex.value = activeIndex.value ? 0 : 1;
isFirstValueSelected.value = true;
popupVisible.value = false;
}
}

Expand Down Expand Up @@ -261,8 +269,8 @@ export default defineComponent({

const notValidIndex = nextValue.findIndex((v) => !v || !isValidDate(v, formatRef.value.format));

// 首次点击不关闭、确保两端都有有效值并且无时间选择器时点击后自动关闭
if (notValidIndex === -1 && nextValue.length === 2 && isFirstValueSelected.value) {
// 当两端都有有效值时更改 value
if (notValidIndex === -1 && nextValue.length === 2) {
onChange?.(
formatDate(nextValue, {
format: formatRef.value.format,
Expand All @@ -275,14 +283,16 @@ export default defineComponent({
);
year.value = nextValue.map((v) => dayjs(v, formatRef.value.format).year());
month.value = nextValue.map((v) => dayjs(v, formatRef.value.format).month());
popupVisible.value = false;
isFirstValueSelected.value = false;
} else if (notValidIndex !== -1) {
activeIndex.value = notValidIndex;
}

// 首次点击不关闭、确保两端都有有效值并且无时间选择器时点击后自动关闭
if (!isFirstValueSelected.value) {
let nextIndex = notValidIndex;
if (nextIndex === -1) nextIndex = activeIndex.value ? 0 : 1;
activeIndex.value = nextIndex;
isFirstValueSelected.value = true;
} else {
activeIndex.value = activeIndex.value ? 0 : 1;
isFirstValueSelected.value = true;
popupVisible.value = false;
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/date-picker/DateRangePickerPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ export default defineComponent({
if (props.enableTimePicker) return;

// 首次点击不关闭、确保两端都有有效值并且无时间选择器时点击后自动关闭
if (nextValue.length === 2 && !props.enableTimePicker && isFirstValueSelected.value) {
if (nextValue.length === 2 && isFirstValueSelected.value) {
onChange?.(
formatDate(nextValue, {
format: formatRef.value.format,
Expand Down
7 changes: 0 additions & 7 deletions src/date-picker/hooks/useRange.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,13 +121,6 @@ export default function useRange(props: TdDateRangePickerProps, { emit }: any) {
popupVisible.value = true;
return;
}
if (!visible) {
isHoverCell.value = false;
inputValue.value = formatDate(value.value, {
format: formatRef.value.format,
targetFormat: formatRef.value.format,
});
}

popupVisible.value = visible;
},
Expand Down