From f7e89998e9b3dceae306280dde2584e2061a0766 Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Sat, 12 Mar 2022 11:00:36 +0800 Subject: [PATCH] fix: datePicker valueFormat log warning, close #5323 --- components/calendar/generateCalendar.tsx | 4 ++-- .../date-picker/generatePicker/generateSinglePicker.tsx | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/components/calendar/generateCalendar.tsx b/components/calendar/generateCalendar.tsx index 44a2cb5bc..bd71a8d7e 100644 --- a/components/calendar/generateCalendar.tsx +++ b/components/calendar/generateCalendar.tsx @@ -127,7 +127,7 @@ function generateCalendar< ? (generateConfig.toDate(props.value, props.valueFormat) as DateType) : (props.value as DateType); } - return props.value as DateType; + return null; }); const defaultValue = computed(() => { if (props.defaultValue) { @@ -135,7 +135,7 @@ function generateCalendar< ? (generateConfig.toDate(props.defaultValue, props.valueFormat) as DateType) : (props.defaultValue as DateType); } - return props.defaultValue as DateType; + return null; }); // Value diff --git a/components/date-picker/generatePicker/generateSinglePicker.tsx b/components/date-picker/generatePicker/generateSinglePicker.tsx index cae366cd2..c23eb0840 100644 --- a/components/date-picker/generatePicker/generateSinglePicker.tsx +++ b/components/date-picker/generatePicker/generateSinglePicker.tsx @@ -119,7 +119,7 @@ export default function generateSinglePicker( ? generateConfig.toDate(props.value as string | DateType, props.valueFormat) : props.value; } - return props.value; + return null; }); const defaultValue = computed(() => { if (props.defaultValue) { @@ -127,7 +127,7 @@ export default function generateSinglePicker( ? generateConfig.toDate(props.defaultValue as string | DateType, props.valueFormat) : props.defaultValue; } - return props.defaultValue; + return null; }); const defaultPickerValue = computed(() => { if (props.defaultPickerValue) { @@ -138,7 +138,7 @@ export default function generateSinglePicker( ) : props.defaultPickerValue; } - return props.defaultPickerValue; + return null; }); return () => {