Merge branch 'dev-cjw' into 'dev'

fix: 修复日期组件默认值异常问题 See merge request itc-framework/ma/2024/front!9
2024-07-31 11:28:12 +00:00
parent 5927e9217f 7362719422
commit 63babbd93d
1 changed files with 1 additions and 1 deletions
--- a/src/components/DatePicker/src/DatePicker.vue
+++ b/src/components/DatePicker/src/DatePicker.vue
@ -46,7 +46,7 @@ const picker = computed(() => {
 watch(
    () => props.value,
    (val) => {
-        modelValue.value = dayjs(val || undefined);
+        modelValue.value = val ? dayjs(val) : undefined;
    },
    {
        immediate: true,