Merge branch 'dev' into pagination-dev

element-plus · Jun 18, 2024 · 54845a5 · 54845a5
2 parents 94dcf75 + ff936c7
commit 54845a5
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/packages/components/date-picker/src/date-picker-com/panel-date-range.vue b/packages/components/date-picker/src/date-picker-com/panel-date-range.vue
@@ -601,19 +601,13 @@ const handleTimeInput = (value: string | null, type: ChangeType) => {
         .hour(parsedValueD.hour())
         .minute(parsedValueD.minute())
         .second(parsedValueD.second())
-      if (!maxDate.value || maxDate.value.isBefore(minDate.value)) {
-        maxDate.value = minDate.value
-      }
     } else {
       maxTimePickerVisible.value = true
       maxDate.value = (maxDate.value || rightDate.value)
         .hour(parsedValueD.hour())
         .minute(parsedValueD.minute())
         .second(parsedValueD.second())
       rightDate.value = maxDate.value
-      if (maxDate.value && maxDate.value.isBefore(minDate.value)) {
-        minDate.value = maxDate.value
-      }
     }
   }
 }
@@ -623,9 +617,15 @@ const handleTimeChange = (value: string | null, type: ChangeType) => {
   if (type === 'min') {
     leftDate.value = minDate.value!
     minTimePickerVisible.value = false
+    if (!maxDate.value || maxDate.value.isBefore(minDate.value)) {
+      maxDate.value = minDate.value
+    }
   } else {
     rightDate.value = maxDate.value!
     maxTimePickerVisible.value = false
+    if (maxDate.value && maxDate.value.isBefore(minDate.value)) {
+      minDate.value = maxDate.value
+    }
   }
 }