fix(module:rangepicker): reset opposing date when in conflict with cu…

…rrent
ant-design-blazor · Apr 24, 2021 · 19834f2 · 19834f2
1 parent b8f88e0
commit 19834f2
Showing 1 changed file with 41 additions and 1 deletion.
diff --git a/components/date-picker/RangePicker.razor.cs b/components/date-picker/RangePicker.razor.cs
@@ -123,10 +123,12 @@ protected async Task OnKeyUp(KeyboardEventArgs e, int index)
                     ClearValue(index);
                 else
                 {
-                    if (BindConverter.TryConvertTo(input.Value, CultureInfo, out DateTime changeValue))
+                    if (FormatAnalyzer.TryPickerStringConvert(input.Value, out DateTime changeValue, CultureInfo, false))
                     {
                         var array = Value as Array;
                         array.SetValue(changeValue, index);
+                        if (!(await ValidateRange(index, changeValue, array)))
+                            return;
                     }
                     if (index == 0)
                     {
@@ -147,6 +149,44 @@ protected async Task OnKeyUp(KeyboardEventArgs e, int index)
             }
         }
 
+        private async Task<bool> ValidateRange(int index, DateTime newDate, Array array)
+        {
+            if (index == 0 && ((DateTime)array.GetValue(1)).CompareTo(newDate) < 0)
+            {
+                ValidationClear(1, array);
+                await Blur(0);
+                await Focus(1);
+                return false;
+            }
+            else if (index == 1 && newDate.CompareTo((DateTime)array.GetValue(0)) < 0)
+            {
+                ValidationClear(0, array);
+                await Blur(1);
+                await Focus(0);
+                return false;
+            }
+            return true;
+        }
+
+        private void ValidationClear(int index, Array array)
+        {
+            if (!IsNullable && DefaultValue != null)
+            {
+                var defaults = DefaultValue as Array;
+                array.SetValue(defaults.GetValue(index), index);
+            }
+            else
+            {
+                array.SetValue(default, index);
+            }
+            (string first, string second) = DatePickerPlaceholder.GetRangePlaceHolderByType(_pickerStatus[index]._initPicker, Locale);
+            if (index == 0)
+                _placeholders[index] = first;
+            else
+                _placeholders[index] = second;
+            _pickerStatus[index]._hadSelectValue = false;
+        }
+
         private async Task OnFocus(int index)
         {
             if (index == 0)