Merge pull request #16659 from abpframework/auto-merge/rel-7-2/1959

Merge branch dev with rel-7.2

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerBaseTagHelperService.cs

@@ -22,11 +22,42 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form.DatePicker;
 public abstract class AbpDatePickerBaseTagHelperService<TTagHelper> : AbpTagHelperService<TTagHelper>
     where TTagHelper : AbpDatePickerBaseTagHelper<TTagHelper>
 {
-    protected readonly Dictionary<Type,Func<object,string>> SupportedInputTypes = new() {
+    protected readonly Dictionary<Type, Func<object, string>> SupportedInputTypes = new() 
-        {typeof(string), o => DateTime.Parse((string)o).ToString("O")},
+    {
-        {typeof(DateTime), o => ((DateTime) o).ToString("O")},
+        {
+            typeof(string), o =>
+            {
+                if(o is string s && DateTime.TryParse(s, out var dt))
+                {
+                    return dt.ToString("O");
+                }
+
+                return string.Empty;
+            }
+        },
+        {
+            typeof(DateTime), o =>
+            {
+                if(o is DateTime dt && dt != default)
+                {
+                    return dt.ToString("O");
+                }
+                
+                return string.Empty;
+            }
+        },
         {typeof(DateTime?), o => ((DateTime?) o)?.ToString("O")},
-        {typeof(DateTimeOffset), o => ((DateTimeOffset) o).ToString("O")},
+        {
+            typeof(DateTimeOffset), o =>
+            {
+                if(o is DateTimeOffset dto && dto != default)
+                {
+                    return dto.ToString("O");
+                }
+                
+                return string.Empty;
+            }
+        },
         {typeof(DateTimeOffset?), o => ((DateTimeOffset?) o)?.ToString("O")}
     };
 

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerTagHelperService.cs

@@ -63,11 +63,14 @@ public class AbpDatePickerTagHelperService : AbpDatePickerBaseTagHelperService<A
 
     protected override void AddBaseTagAttributes(TagHelperAttributeList attributes)
     {
-        if (TagHelper.AspFor != null && 
+        if (TagHelper.AspFor?.Model != null &&
-            TagHelper.AspFor.Model != null && 
             SupportedInputTypes.TryGetValue(TagHelper.AspFor.Metadata.ModelType, out var convertFunc))
         {
-            attributes.Add("data-date", convertFunc(TagHelper.AspFor.Model));
+            var convert = convertFunc(TagHelper.AspFor.Model);
+            if(!convert.IsNullOrWhiteSpace())
+            {
+                attributes.Add("data-date", convert);
+            }
         }
     }
 

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/dom-event-handlers.js

@@ -619,9 +619,7 @@
                     options.separator = separator;
                 }
 
-                if(options.autoUpdateInput){
+                fillInput($input, startDate, endDate, options);
-                    fillInput($input, startDate, endDate, options);
-                }
                 
                 $input.on('apply.daterangepicker', function (ev, picker) {
                     if (singleDatePicker) {