From 39adcf48824ba18f4fdc0bd3ea92e07eb57e79a6 Mon Sep 17 00:00:00 2001
From: Noblet Ouways <91417411+Dsaquel@users.noreply.github.com>
Date: Thu, 11 Dec 2025 22:56:27 +0100
Subject: [PATCH] fix(components): [date-picker] sync input value with
 time-picker (#20713)

* fix(components): [date-picker] sync input value with time-picker

* test: set test case
---
 .../__tests__/date-picker-panel.test.tsx      | 21 +++++++++++++++++++
 .../src/date-picker-com/panel-date-range.vue  |  4 ++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/packages/components/date-picker-panel/__tests__/date-picker-panel.test.tsx b/packages/components/date-picker-panel/__tests__/date-picker-panel.test.tsx
index 7d6785d001..7151c2b01b 100644
--- a/packages/components/date-picker-panel/__tests__/date-picker-panel.test.tsx
+++ b/packages/components/date-picker-panel/__tests__/date-picker-panel.test.tsx
@@ -627,6 +627,27 @@ describe('DatePickerPanel', () => {
         expect((right.timeInput as HTMLInputElement).value).toBe('AM 01:01:01')
       })
 
+      it('should get the display date in disabled-hours callback', async () => {
+        const modelValue = ['2025-05-12 00:00:00', '2025-05-24 00:00:00']
+        const disabledHours = (_role: string, date: dayjs.Dayjs) => {
+          expect(dayjs(date).isSame(modelValue[1])).toBe(true)
+        }
+        const wrapper = mount(() => (
+          <DatePickerPanel
+            model-value={modelValue}
+            type="datetimerange"
+            //@ts-expect-error
+            disabledHours={disabledHours}
+          />
+        ))
+
+        const timeInput = wrapper.findAll(
+          '.el-date-range-picker__editors-wrap input'
+        )[3]
+        await timeInput.trigger('blur')
+        await timeInput.trigger('focus')
+      })
+
       it('input date', async () => {
         const value = ref<string[]>([])
         const wrapper = mount(() => (
diff --git a/packages/components/date-picker-panel/src/date-picker-com/panel-date-range.vue b/packages/components/date-picker-panel/src/date-picker-com/panel-date-range.vue
index 3a6129115f..b5593cafab 100644
--- a/packages/components/date-picker-panel/src/date-picker-com/panel-date-range.vue
+++ b/packages/components/date-picker-panel/src/date-picker-com/panel-date-range.vue
@@ -59,7 +59,7 @@
                 :visible="minTimePickerVisible"
                 :format="timeFormat"
                 datetime-role="start"
-                :parsed-value="leftDate"
+                :parsed-value="minDate || leftDate"
                 @pick="handleMinTimePick"
               />
             </span>
@@ -101,7 +101,7 @@
                 datetime-role="end"
                 :visible="maxTimePickerVisible"
                 :format="timeFormat"
-                :parsed-value="rightDate"
+                :parsed-value="maxDate || rightDate"
                 @pick="handleMaxTimePick"
               />
             </span>