Merge pull request #22326 from abpframework/auto-merge/rel-9-1/3525

Merge branch dev with rel-9.1

modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml

@@ -22,7 +22,7 @@
 
 <abp-script src="/Pages/FeatureManagement/feature-management-modal.js" />
 
-<form method="post" asp-page="/FeatureManagement/FeatureManagementModal" data-script-class="abp.modals.FeatureManagement">
+<form method="post" asp-page="/FeatureManagement/FeatureManagementModal" data-script-class="abp.modals.FeatureManagement" id="FeatureManagementForm">
     <abp-modal id="featureManagmentModal" size="Large">
         <abp-modal-header title="@(L["Features"].Value + Model.ProviderKeyDisplayName)"></abp-modal-header>
         @if (Model.FeatureListResultDto != null && Model.FeatureListResultDto.Groups.Any())

modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/feature-management-modal.js

@@ -4,6 +4,7 @@ var abp = abp || {};
 
     let l = abp.localization.getResource("AbpFeatureManagement");
     abp.modals.FeatureManagement = function () {
+
         abp.ResourceLoader.loadScript('/client-proxies/featureManagement-proxy.js');
         $('#ResetToDefaults').click(function (e) {
             abp.message.confirm(l('AreYouSureToResetToDefault'))
@@ -15,6 +16,7 @@ var abp = abp || {};
                             abp.notify.success(l('ResetedToDefault'));
                         });
                         setTimeout(function () {
+                            $("#FeatureManagementForm").trigger('abp-ajax-success');
                             $('#featureManagmentModal').modal('hide');
                         }, 500);
                     }