From 1b68533b176a5cd0a89d04ee2e43a39337c19d2c Mon Sep 17 00:00:00 2001 From: HQ-Lin Date: Tue, 27 Sep 2022 15:31:39 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20datepicker=20?= =?UTF-8?q?=E4=BC=A0=E5=85=A5=20lambda=20=E5=87=BD=E6=95=B0=E8=A2=AB?= =?UTF-8?q?=E9=A2=91=E7=B9=81=E8=A7=A6=E5=8F=91=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/_common | 2 +- src/date-picker/panel/RangePanel.tsx | 20 ++++++++++---------- src/date-picker/panel/SinglePanel.tsx | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/_common b/src/_common index f3994fc94..b451f4c3e 160000 --- a/src/_common +++ b/src/_common @@ -1 +1 @@ -Subproject commit f3994fc94b44f94a07d09e7eba0bc1cf91bdc0b6 +Subproject commit b451f4c3efc6b0d6a2618ab65365ae7b8038a8f7 diff --git a/src/date-picker/panel/RangePanel.tsx b/src/date-picker/panel/RangePanel.tsx index 8b94f8e84..cd716b852 100644 --- a/src/date-picker/panel/RangePanel.tsx +++ b/src/date-picker/panel/RangePanel.tsx @@ -61,19 +61,19 @@ export default defineComponent({ // 是否隐藏预选状态,只有 value 有值的时候需要隐藏 const hidePreselection = !props.panelPreselection && props.value.length === 2; - const disableDateOptions = computed(() => useDisableDate({ + const disableDateOptions = useDisableDate({ format, mode: props.mode, disableDate: props.disableDate, start: - props.isFirstValueSelected && props.activeIndex === 1 - ? new Date(parseToDayjs(props.value[0], format, 'start').toDate().setHours(0, 0, 0)) - : undefined, + props.isFirstValueSelected && props.activeIndex === 1 + ? new Date(parseToDayjs(props.value[0], format, 'start').toDate().setHours(0, 0, 0)) + : undefined, end: - props.isFirstValueSelected && props.activeIndex === 0 - ? new Date(parseToDayjs(props.value[1], format).toDate().setHours(23, 59, 59)) - : undefined, - })); + props.isFirstValueSelected && props.activeIndex === 0 + ? new Date(parseToDayjs(props.value[1], format).toDate().setHours(23, 59, 59)) + : undefined, + }); const startTableData = computed(() => useTableData({ isRange: true, @@ -91,7 +91,7 @@ export default defineComponent({ month: props.month[0], mode: props.mode, firstDayOfWeek: props.firstDayOfWeek || global.value.firstDayOfWeek, - ...disableDateOptions.value, + ...disableDateOptions, })); const endTableData = computed(() => useTableData({ @@ -110,7 +110,7 @@ export default defineComponent({ month: props.month[1], mode: props.mode, firstDayOfWeek: props.firstDayOfWeek || global.value.firstDayOfWeek, - ...disableDateOptions.value, + ...disableDateOptions, })); const panelContentProps = computed(() => ({ diff --git a/src/date-picker/panel/SinglePanel.tsx b/src/date-picker/panel/SinglePanel.tsx index b569b5d30..58ba172c6 100644 --- a/src/date-picker/panel/SinglePanel.tsx +++ b/src/date-picker/panel/SinglePanel.tsx @@ -50,11 +50,11 @@ export default defineComponent({ enableTimePicker: props.enableTimePicker, }); - const disableDateOptions = computed(() => useDisableDate({ + const disableDateOptions = useDisableDate({ format, mode: props.mode, disableDate: props.disableDate, - })); + }); const tableData = computed(() => useTableData({ year: props.year, @@ -62,7 +62,7 @@ export default defineComponent({ mode: props.mode, start: props.value ? parseToDayjs(props.value, format).toDate() : undefined, firstDayOfWeek: props.firstDayOfWeek || global.value.firstDayOfWeek, - ...disableDateOptions.value, + ...disableDateOptions, })); const panelContentProps = computed(() => ({