diff --git a/components/date-picker/generatePicker/generateSinglePicker.tsx b/components/date-picker/generatePicker/generateSinglePicker.tsx
index c3be3bc6c..4513c65b7 100644
--- a/components/date-picker/generatePicker/generateSinglePicker.tsx
+++ b/components/date-picker/generatePicker/generateSinglePicker.tsx
@@ -140,7 +140,7 @@ export default function generatePicker<DateType>(generateConfig: GenerateConfig<
           if (picker) {
             additionalOverrideProps.picker = picker;
           }
-          const mergedPicker = picker || p.picker;
+          const mergedPicker = picker || p.picker || 'date';
 
           additionalOverrideProps = {
             ...additionalOverrideProps,
@@ -172,6 +172,7 @@ export default function generatePicker<DateType>(generateConfig: GenerateConfig<
               transitionName={transitionName || `${rootPrefixCls.value}-slide-up`}
               {...restProps}
               {...additionalOverrideProps}
+              picker={mergedPicker}
               value={value.value}
               defaultValue={defaultValue.value}
               defaultPickerValue={defaultPickerValue.value}
@@ -206,7 +207,7 @@ export default function generatePicker<DateType>(generateConfig: GenerateConfig<
     });
   }
 
-  const DatePicker = getPicker<DatePickerProps>('date', 'ADatePicker');
+  const DatePicker = getPicker<DatePickerProps>(undefined, 'ADatePicker');
   const WeekPicker = getPicker<Omit<PickerDateProps<DateType>, 'picker'>>('week', 'AWeekPicker');
   const MonthPicker = getPicker<Omit<PickerDateProps<DateType>, 'picker'>>('month', 'AMonthPicker');
   const YearPicker = getPicker<Omit<PickerDateProps<DateType>, 'picker'>>('year', 'AYearPicker');
diff --git a/components/date-picker/index.tsx b/components/date-picker/index.tsx
index 21a09fb71..c5f053ba9 100755
--- a/components/date-picker/index.tsx
+++ b/components/date-picker/index.tsx
@@ -1,4 +1,4 @@
-import DatePicker from './moment';
-export * from './moment';
+import DatePicker from './dayjs';
+export * from './dayjs';
 
 export default DatePicker;
diff --git a/components/vc-picker/Picker.tsx b/components/vc-picker/Picker.tsx
index 75508f3e2..aaa1963ca 100644
--- a/components/vc-picker/Picker.tsx
+++ b/components/vc-picker/Picker.tsx
@@ -191,13 +191,14 @@ function Picker<DateType>() {
     // ],
     setup(props, { attrs, expose }) {
       const inputRef = ref(null);
+      const picker = computed(() => picker.value ?? 'date');
       const needConfirmButton = computed(
-        () => (props.picker === 'date' && !!props.showTime) || props.picker === 'time',
+        () => (picker.value === 'date' && !!props.showTime) || picker.value === 'time',
       );
 
       // ============================= State =============================
       const formatList = computed(() =>
-        toArray(getDefaultFormat(props.format, props.picker, props.showTime, props.use12Hours)),
+        toArray(getDefaultFormat(props.format, picker.value, props.showTime, props.use12Hours)),
       );
 
       // Panel ref
@@ -273,12 +274,11 @@ function Picker<DateType>() {
         if (props.disabled && newOpen) {
           return;
         }
-
         triggerInnerOpen(newOpen);
       };
 
       const forwardKeydown = (e: KeyboardEvent) => {
-        if (mergedOpen && operationRef.value && operationRef.value.onKeydown) {
+        if (mergedOpen.value && operationRef.value && operationRef.value.onKeydown) {
           // Let popup panel handle keyboard
           return operationRef.value.onKeydown(e);
         }
@@ -355,14 +355,11 @@ function Picker<DateType>() {
       });
 
       // Change picker should sync back with text value
-      watch(
-        () => props.picker,
-        () => {
-          if (!mergedOpen.value) {
-            resetText();
-          }
-        },
-      );
+      watch(picker, () => {
+        if (!mergedOpen.value) {
+          resetText();
+        }
+      });
 
       // Sync innerValue with control mode
       watch(mergedValue, () => {
@@ -386,7 +383,7 @@ function Picker<DateType>() {
 
       useProvidePanel({
         operationRef,
-        hideHeader: computed(() => props.picker === 'time'),
+        hideHeader: computed(() => picker.value === 'time'),
         panelRef: panelDivRef,
         onSelect: onContextSelect,
         open: mergedOpen,
diff --git a/components/vc-picker/hooks/usePickerInput.ts b/components/vc-picker/hooks/usePickerInput.ts
index 4467f91c1..5518e11f8 100644
--- a/components/vc-picker/hooks/usePickerInput.ts
+++ b/components/vc-picker/hooks/usePickerInput.ts
@@ -115,7 +115,7 @@ export default function usePickerInput({
         return;
       }
 
-      if (blurToCancel) {
+      if (blurToCancel.value) {
         setTimeout(() => {
           let { activeElement } = document;
           while (activeElement && activeElement.shadowRoot) {
diff --git a/v2-doc b/v2-doc
index fc73e64bc..47e2b4342 160000
--- a/v2-doc
+++ b/v2-doc
@@ -1 +1 @@
-Subproject commit fc73e64bcdf41be854c2f7a907c05b056ad652ab
+Subproject commit 47e2b43427506e270fc8b39aae9c5c5649da3931