Merge pull request #16567 from abpframework/auto-merge/rel-7-2/1942

Merge branch dev with rel-7.2

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

@@ -9,7 +9,7 @@ public abstract class
     where TTagHelper : AbpDatePickerBaseTagHelper<TTagHelper>
 
 {
-    private readonly IAbpDatePickerOptions _abpDatePickerOptionsImplementation;
+    private IAbpDatePickerOptions _abpDatePickerOptionsImplementation;
 
     public string Label { get; set; }
 
@@ -47,6 +47,11 @@ public abstract class
     {
         _abpDatePickerOptionsImplementation = new AbpDatePickerOptions();
     }
+    
+    public void SetDatePickerOptions(IAbpDatePickerOptions options)
+    {
+        _abpDatePickerOptionsImplementation = options;
+    }
 
     public string PickerId {
         get => _abpDatePickerOptionsImplementation.PickerId;

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

@@ -84,6 +84,11 @@ public abstract class AbpDatePickerBaseTagHelperService<TTagHelper> : AbpTagHelp
         AddReadOnlyAttribute(TagHelperOutput);
         AddPlaceholderAttribute(TagHelperOutput);
         AddInfoTextId(TagHelperOutput);
+        var optionsAttribute = GetAttributeAndModelExpression<DatePickerOptionsAttribute>(out var modelExpression);
+        if (optionsAttribute != null)
+        {
+            TagHelper.SetDatePickerOptions(optionsAttribute.GetDatePickerOptions(modelExpression.ModelExplorer));
+        }
 
         // Open and close button
         var openButtonContent = TagHelper.OpenButton
@@ -426,15 +431,6 @@ public abstract class AbpDatePickerBaseTagHelperService<TTagHelper> : AbpTagHelp
             attrList.Add(attr);
         }
 
-        var optionsAttribute = GetAttributeAndModelExpression<DatePickerOptionsAttribute>(out var modelExpression);
-        if (optionsAttribute != null)
-        {
-            foreach (var attr in ConvertDatePickerOptionsToAttributeList(optionsAttribute.GetDatePickerOptions(modelExpression.ModelExplorer)))
-            {
-                attrList.Add(attr);
-            }
-        }
-
         AddBaseTagAttributes(attrList);
 
         return attrList;
@@ -591,7 +587,7 @@ public abstract class AbpDatePickerBaseTagHelperService<TTagHelper> : AbpTagHelp
         abpButtonTagHelper.ButtonType = AbpButtonType.Outline_Secondary;
         abpButtonTagHelper.Icon = icon;
 
-        abpButtonTagHelper.Disabled = TagHelper.IsDisabled;
+        abpButtonTagHelper.Disabled = TagHelper.IsDisabled || GetAttribute<DisabledInput>() != null;
 
         if (!visible)
         {

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

@@ -643,8 +643,9 @@
                     var momentEndDate = getMoment(endDate, options);
                     if (momentStartDate.isValid()) {
                         picker.setStartDate(momentStartDate);
+                        picker.setEndDate(momentEndDate);
                     }
-                    if (momentEndDate.isValid()) {
+                    if (momentEndDate.isValid() && !singleDatePicker) {
                         picker.setEndDate(momentEndDate);
                     }
                 });
@@ -761,6 +762,7 @@
         abp.dom.initializers.initializeForms(args.$el.findWithSelf('form'), true);
         abp.dom.initializers.initializeScript(args.$el);
         abp.dom.initializers.initializeAutocompleteSelects(args.$el.findWithSelf('.auto-complete-select'));
+        abp.dom.initializers.initializeDateRangePickers(args.$el);
     });
 
     abp.dom.onNodeRemoved(function (args) {
@@ -772,6 +774,7 @@
     abp.event.on('abp.configurationInitialized', function () {
         abp.libs.bootstrapDatepicker.normalizeLanguageConfig();
     });
+    
 
     $(function () {
         abp.dom.initializers.initializeToolTips($('[data-toggle="tooltip"]'));
@@ -782,7 +785,6 @@
         abp.dom.initializers.initializeForms($('form'));
         abp.dom.initializers.initializeAutocompleteSelects($('.auto-complete-select'));
         $('[data-auto-focus="true"]').first().findWithSelf('input,select').focus();
-
     });
 
 })(jQuery);

npm/ng-packs/package.json

@@ -117,6 +117,7 @@
     "perfect-scrollbar": "^1.5.5",
     "postcss": "^8.3.9",
     "postcss-import": "14.1.0",
+    "perfect-scrollbar": "^1.5.5",
     "postcss-preset-env": "7.5.0",
     "postcss-url": "10.1.3",
     "prettier": "2.7.1",

npm/ng-packs/packages/theme-shared/src/lib/components/form-input/form-input.component.ts

@@ -36,7 +36,6 @@ export class FormInputComponent extends AbstractNgModelComponent {
   @Input() label = '';
   @Input() labelClass = 'form-label';
   @Input() inputPlaceholder = '';
-  @Input() inputType = 'text';
   @Input() inputStyle:
     | {
         [klass: string]: any;