Merge pull request #19495 from abpframework/auto-merge/rel-8-1/2624

Merge branch dev with rel-8.1

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

@@ -94,6 +94,7 @@ public abstract class AbpDatePickerBaseTagHelperService<TTagHelper> : AbpTagHelp
     {
         TagHelperOutput = TagHelperOutput = new TagHelperOutput("input", GetInputAttributes(context, output), (_, _) => Task.FromResult<TagHelperContent>(new DefaultTagHelperContent()));
 
+        AddDataPickerAttribute(TagHelperOutput);
         AddDisabledAttribute(TagHelperOutput);
         AddAutoFocusAttribute(TagHelperOutput);
         AddFormControls(context, output, TagHelperOutput);
@@ -711,6 +712,11 @@ public abstract class AbpDatePickerBaseTagHelperService<TTagHelper> : AbpTagHelp
         }
     }
 
+    protected virtual void AddDataPickerAttribute(TagHelperOutput inputTagHelperOutput)
+    {
+        inputTagHelperOutput.Attributes.Add("data-datepicker", "true");
+    }
+
     protected virtual void AddDisabledAttribute(TagHelperOutput inputTagHelperOutput)
     {
         if (inputTagHelperOutput.Attributes.ContainsName("disabled") == false &&

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

@@ -102,7 +102,7 @@ $.validator.defaults.ignore = ''; //TODO: Would be better if we can apply only f
 
                         _onOpenCallbacks.triggerAll(_publicApi);
 
-                        if ($firstVisibleInput.hasClass("datepicker")) {
+                        if ($firstVisibleInput.data("datepicker")) {
                             return; //don't pop-up date pickers...
                         }