Skip to content

fix(DateRangePicker): onConfirm will be triggered in both panels #5969

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix(DateRangePicker): onConfirm will be triggered in both panels #5969

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
21 changes: 16 additions & 5 deletions packages/components/date-picker/DateRangePicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,12 @@ export default defineComponent({

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

const confirmValue = {
date: nextValue.map((v) => dayjs(v).toDate()),
e: e || null,
partial: (activeIndex.value ? 'end' : 'start') as DateRangePickerPartial,
};

// 当两端都有有效值时更改 value
if (notValidIndex === -1 && nextValue.length === 2) {
// 二次修改时当其中一侧不符合上次区间规范时，清空另一侧数据
Expand All @@ -266,11 +272,8 @@ export default defineComponent({
cacheValue.value = nextValue;
inputValue.value = nextValue;
} else {
props?.onConfirm?.({
date: nextValue.map((v) => dayjs(v).toDate()),
e: e || null,
partial: activeIndex.value ? 'end' : 'start',
});
props?.onConfirm?.(confirmValue);

onChange?.(
formatDate(nextValue, {
format: formatRef.value.format,
Expand All @@ -293,12 +296,20 @@ export default defineComponent({

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

const confirmValue = {
date: nextValue.map((v) => dayjs(v).toDate()),
e: e || null,
partial: (activeIndex.value ? 'end' : 'start') as DateRangePickerPartial,
};

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

props?.onConfirm?.(confirmValue);
} else if (nextValue.length === 2) {
popupVisible.value = false;
}
Expand Down
Loading