From 35f81fb2088c89b0501a1b583785b0845369f7ac Mon Sep 17 00:00:00 2001
From: chenyunjie <kikyous@163.com>
Date: Sat, 27 Aug 2022 11:15:46 +0800
Subject: [PATCH] fix(Calendar): range type defaultDate when set allowSameDay
(#10971)
---
packages/vant/src/calendar/Calendar.tsx | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/packages/vant/src/calendar/Calendar.tsx b/packages/vant/src/calendar/Calendar.tsx
index ae45dd1b0..823ee3856 100644
--- a/packages/vant/src/calendar/Calendar.tsx
+++ b/packages/vant/src/calendar/Calendar.tsx
@@ -134,7 +134,7 @@ export default defineComponent({
};
const getInitialDate = (defaultDate = props.defaultDate) => {
- const { type, minDate, maxDate } = props;
+ const { type, minDate, maxDate, allowSameDay } = props;
if (defaultDate === null) {
return defaultDate;
@@ -151,7 +151,10 @@ export default defineComponent({
minDate,
getPrevDay(maxDate)
);
- const end = limitDateRange(defaultDate[1] || now, getNextDay(minDate));
+ const end = limitDateRange(
+ defaultDate[1] || now,
+ allowSameDay ? minDate : getNextDay(minDate)
+ );
return [start, end];
}