Merge branch 'dev' of https://github.com/abpframework/abp into refactor/locale

docs/en/Community-Articles/2020-11-02-How-To-Add-New-Language/POST.md

@@ -0,0 +1,46 @@
+# How to add a new language to your ABP project?
+
+Adding a new language to your ABP project is pretty simple.  Let's add the German language to our ABP project:
+
+
+
+1. Go to your solution's root folder and write the following CLI command. This command will generate an empty translation file from English.
+    ```bash
+    abp translate -c de-DE
+    ```
+    
+    Check out for [the complete supported culture codes](https://docs.microsoft.com/en-us/bingmaps/rest-services/common-parameters-and-types/supported-culture-codes).
+    (For internal development `D:\Github\abp` and `D:\Github\volo\abp`)
+    
+2. Fill the `target` fields in your target language.
+
+    ![Fill target fields](language-target.png)
+
+3. Copy `abp-translation.json` your solution's root folder (Do not change the filename!)
+
+4. Run the following command. This command will create the necessary `json` files.
+     ```bash
+     abp translate --apply
+     ```
+
+5. Open your solution and add the new language to the language list. To do this;
+
+    * open `MyProjectNameDomainModule.cs` and in `ConfigureServices` you'll find `Configure<AbpLocalizationOptions>`. If you have `HttpApi.Host` project then you need to add this in `MyProjectNameHttpApiHostModule.cs`
+
+    ```
+    options.Languages.Add(new LanguageInfo("de-DE", "de-DE", "Deutsche", "de"));
+    ```
+
+    ![Add to languages](add-to-languages.png)
+
+    The last parameter is the flag icon. You can find the list of flag icons on https://flagicons.lipis.dev/
+
+  6. The last step is running the DbMigrator project. It will seed the database for the new language. 
+        ![The database table](database-table.png)
+
+
+
+Close the IIS Express / Kestrel to invalidate the language cache and run the project. You will see the new language on your website.
+
+![See the final result](website-new-language.png)
+

framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LanguageSwitch.razor

@@ -5,17 +5,17 @@
 @inject IJSRuntime JsRuntime
 @if (_otherLanguages != null && _otherLanguages.Any())
 {
-    <Dropdown>
+    <BarDropdown>
-        <DropdownToggle Color="Color.None">
+        <BarDropdownToggle>
             @_currentLanguage.DisplayName
-        </DropdownToggle>
+        </BarDropdownToggle>
-        <DropdownMenu>
+        <BarDropdownMenu RightAligned="true">
             @foreach (var language in _otherLanguages)
             {
-                <DropdownItem Clicked="() => ChangeLanguageAsync(language)">@language.DisplayName</DropdownItem>
+                <BarDropdownItem Clicked="() => ChangeLanguageAsync(language)">@language.DisplayName</BarDropdownItem>
             }
-        </DropdownMenu>
+        </BarDropdownMenu>
-    </Dropdown>
+    </BarDropdown>
 }
 @code {
     private IReadOnlyList<LanguageInfo> _otherLanguages;

framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor

@@ -26,9 +26,6 @@
                         <DropdownItem Clicked="@(() => NavigateTo(menuItem.Url))">@menuItem.DisplayName</DropdownItem>
                     }
                 }
-                <a class="dropdown-item" href="@ServerAccountUrl">
-                    @UiLocalizer["ManageYourAccount"]
-                </a>
                 <DropdownDivider />
                 <DropdownItem Clicked="BeginSignOut">Logout</DropdownItem>
             </DropdownMenu>

framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor.cs

@@ -1,50 +1,33 @@
 using System;
 using System.Threading.Tasks;
-using Localization.Resources.AbpUi;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Routing;
-using Microsoft.Extensions.Localization;
-using Microsoft.Extensions.Options;
-using Volo.Abp.Http.Client;
 using Volo.Abp.UI.Navigation;
 
 namespace Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.Themes.Basic
 {
     public partial class LoginDisplay : IDisposable
     {
-        [Inject] 
-        protected IMenuManager MenuManager { get; set; }
-        
-        [Inject]
-        protected IStringLocalizer<AbpUiResource> UiLocalizer { get; set; }
-        
         [Inject]
-        protected IOptions<AbpRemoteServiceOptions> RemoteServiceOptions { get; set; }
+        protected IMenuManager MenuManager { get; set; }
-        
-        protected ApplicationMenu Menu { get; set; }
 
-        protected string ServerUrl { get; set; }
+        protected ApplicationMenu Menu { get; set; }
-        protected string ServerAccountUrl { get; set; }
 
         protected async override Task OnInitializedAsync()
         {
             Menu = await MenuManager.GetAsync(StandardMenus.User);
-            
+
-            ServerUrl = RemoteServiceOptions.Value.RemoteServices.Default?.BaseUrl?.TrimEnd('/');
-            ServerAccountUrl = ServerUrl + "/Account/Manage?returnUrl=" + Navigation.Uri;
-            
             Navigation.LocationChanged += OnLocationChanged;
         }
 
         protected virtual void OnLocationChanged(object sender, LocationChangedEventArgs e)
         {
-            ServerAccountUrl = ServerUrl + "/Account/Manage?returnUrl=" + Navigation.Uri;
             StateHasChanged();
         }
-        
+
         public void Dispose()
         {
             Navigation.LocationChanged -= OnLocationChanged;
         }
     }
-}
+}

framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/NavToolbar.razor

@@ -1,8 +1,8 @@
 <ul class="navbar-nav">
     @foreach (var render in ToolbarItemRenders)
     {
-        <li class="nav-item">
+        <BarItem>
             @render
-        </li>
+        </BarItem>
     }
 </ul>

framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/ExceptionHandling/UserExceptionInformer.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Volo.Abp.AspNetCore.ExceptionHandling;

framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/SimpleUiMessageService.cs → framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo/Abp/AspNetCore/Components/WebAssembly/Messages/SimpleUiMessageService.cs

@@ -3,7 +3,7 @@ using System.Threading.Tasks;
 using Microsoft.JSInterop;
 using Volo.Abp.DependencyInjection;
 
-namespace Volo.Abp.AspNetCore.Components.WebAssembly
+namespace Volo.Abp.AspNetCore.Components.WebAssembly.Messages
 {
     public class SimpleUiMessageService : IUiMessageService, ITransientDependency
     {

framework/src/Volo.Abp.AspNetCore.Components/Volo/Abp/AspNetCore/Components/AbpComponentBase.cs

@@ -5,6 +5,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
+using Volo.Abp.AspNetCore.Components.WebAssembly;
 using Volo.Abp.Localization;
 using Volo.Abp.ObjectMapping;
 using Volo.Abp.Users;
@@ -53,6 +54,12 @@ namespace Volo.Abp.AspNetCore.Components
         protected ICurrentUser CurrentUser => LazyGetRequiredService(ref _currentUser);
         private ICurrentUser _currentUser;
 
+        protected IUiMessageService Message => LazyGetNonScopedRequiredService(ref _message);
+        private IUiMessageService _message;
+
+        protected IUiNotificationService Notify => LazyGetNonScopedRequiredService(ref _notify);
+        private IUiNotificationService _notify;
+
         protected IObjectMapper ObjectMapper
         {
             get
@@ -90,6 +97,21 @@ namespace Volo.Abp.AspNetCore.Components
             return reference;
         }
 
+        protected TService LazyGetNonScopedRequiredService<TService>(ref TService reference) => LazyGetNonScopedRequiredService(typeof(TService), ref reference);
+
+        protected TRef LazyGetNonScopedRequiredService<TRef>(Type serviceType, ref TRef reference)
+        {
+            if (reference == null)
+            {
+                reference = (TRef)NonScopedServices.GetRequiredService(serviceType);
+            }
+
+            return reference;
+        }
+
+        [Inject]
+        protected IServiceProvider NonScopedServices { get; set; }
+
         protected virtual IStringLocalizer CreateLocalizer()
         {
             if (LocalizationResource != null)

framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/ExceptionHandling/DefaultHttpExceptionStatusCodeFinder.cs

@@ -22,7 +22,13 @@ namespace Volo.Abp.AspNetCore.ExceptionHandling
 
         public virtual HttpStatusCode GetStatusCode(HttpContext httpContext, Exception exception)
         {
-            if (exception is IHasErrorCode exceptionWithErrorCode && 
+            if (exception is IHasHttpStatusCode exceptionWithHttpStatusCode &&
+                exceptionWithHttpStatusCode.HttpStatusCode > 0)
+            {
+                return (HttpStatusCode) exceptionWithHttpStatusCode.HttpStatusCode;
+            }
+
+            if (exception is IHasErrorCode exceptionWithErrorCode &&
                 !exceptionWithErrorCode.Code.IsNullOrWhiteSpace())
             {
                 if (Options.ErrorCodeToHttpStatusCodeMappings.TryGetValue(exceptionWithErrorCode.Code, out var status))
@@ -39,7 +45,7 @@ namespace Volo.Abp.AspNetCore.ExceptionHandling
             }
 
             //TODO: Handle SecurityException..?
-            
+
             if (exception is AbpValidationException)
             {
                 return HttpStatusCode.BadRequest;
@@ -59,8 +65,8 @@ namespace Volo.Abp.AspNetCore.ExceptionHandling
             {
                 return HttpStatusCode.Forbidden;
             }
-            
+
             return HttpStatusCode.InternalServerError;
         }
     }
-}
+}

framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs

@@ -15,6 +15,7 @@ using Volo.Abp.Application.Services;
 using Volo.Abp.AspNetCore.Components;
 using Volo.Abp.AspNetCore.Components.WebAssembly;
 using Volo.Abp.Authorization;
+using Volo.Abp.BlazoriseUI.Components;
 using Volo.Abp.ObjectMapping;
 
 namespace Volo.Abp.BlazoriseUI
@@ -170,9 +171,7 @@ namespace Volo.Abp.BlazoriseUI
         where TUpdateViewModel : class, new()
     {
         [Inject] protected TAppService AppService { get; set; }
-        [Inject] protected IUiMessageService UiMessageService { get; set; }
         [Inject] protected IStringLocalizer<AbpUiResource> UiLocalizer { get; set; }
-        [Inject] protected IAuthorizationService AuthorizationService { get; set; }
 
         protected virtual int PageSize { get; } = LimitedResultRequestDto.DefaultMaxResultCount;
 
@@ -189,6 +188,7 @@ namespace Volo.Abp.BlazoriseUI
         protected Validations CreateValidationsRef;
         protected Validations EditValidationsRef;
         protected List<BreadcrumbItem> BreadcrumbItems = new List<BreadcrumbItem>(2);
+        protected DataGridEntityActionsColumn<TListViewModel> EntityActionsColumn;
 
         protected string CreatePolicyName { get; set; }
         protected string UpdatePolicyName { get; set; }
@@ -281,9 +281,7 @@ namespace Volo.Abp.BlazoriseUI
 
         protected virtual async Task OpenCreateModalAsync()
         {
-            await OnOpeningCreateModalAsync();
+            CreateValidationsRef?.ClearAll();
-
-            CreateValidationsRef.ClearAll();
 
             await CheckCreatePolicyAsync();
 
@@ -296,11 +294,6 @@ namespace Volo.Abp.BlazoriseUI
             CreateModal.Show();
         }
 
-        protected virtual Task OnOpeningCreateModalAsync()
-        {
-            return Task.CompletedTask;
-        }
-
         protected virtual Task CloseCreateModalAsync()
         {
             CreateModal.Hide();
@@ -309,9 +302,7 @@ namespace Volo.Abp.BlazoriseUI
 
         protected virtual async Task OpenEditModalAsync(TKey id)
         {
-            await OnOpeningEditModalAsync(id);
+            EditValidationsRef?.ClearAll();
-
-            EditValidationsRef.ClearAll();
 
             await CheckUpdatePolicyAsync();
 
@@ -325,11 +316,6 @@ namespace Volo.Abp.BlazoriseUI
             EditModal.Show();
         }
 
-        protected virtual Task OnOpeningEditModalAsync(TKey id)
-        {
-            return Task.CompletedTask;
-        }
-
         protected virtual TUpdateViewModel MapToEditingEntity(TGetOutputDto entityDto)
         {
             return ObjectMapper.Map<TGetOutputDto, TUpdateViewModel>(entityDto);
@@ -363,7 +349,7 @@ namespace Volo.Abp.BlazoriseUI
 
         protected virtual async Task CreateEntityAsync()
         {
-            if (CreateValidationsRef.ValidateAll())
+            if (CreateValidationsRef?.ValidateAll() ?? true)
             {
                 await OnCreatingEntityAsync();
 
@@ -390,7 +376,7 @@ namespace Volo.Abp.BlazoriseUI
 
         protected virtual async Task UpdateEntityAsync()
         {
-            if (EditValidationsRef.ValidateAll())
+            if (EditValidationsRef?.ValidateAll() ?? true)
             {
                 await OnUpdatingEntityAsync();
 
@@ -419,11 +405,6 @@ namespace Volo.Abp.BlazoriseUI
         {
             await CheckDeletePolicyAsync();
 
-            if (!await UiMessageService.ConfirmAsync(GetDeleteConfirmationMessage(entity)))
-            {
-                return;
-            }
-
             await AppService.DeleteAsync(entity.Id);
             await GetEntitiesAsync();
         }

framework/src/Volo.Abp.BlazoriseUI/BlazoriseUiNotificationService.cs

@@ -1,7 +1,5 @@
 using System;
 using System.Threading.Tasks;
-using Localization.Resources.AbpUi;
-using Microsoft.Extensions.Localization;
 using Volo.Abp.AspNetCore.Components.WebAssembly;
 using Volo.Abp.DependencyInjection;
 
@@ -15,14 +13,6 @@ namespace Volo.Abp.BlazoriseUI
         /// </summary>
         public event EventHandler<UiNotificationEventArgs> NotificationReceived;
 
-        private readonly IStringLocalizer<AbpUiResource> localizer;
-
-        public BlazoriseUiNotificationService(
-            IStringLocalizer<AbpUiResource> localizer)
-        {
-            this.localizer = localizer;
-        }
-
         public Task Info(string message, string title = null, Action<UiNotificationOptions> options = null)
         {
             var uiNotificationOptions = CreateDefaultOptions();
@@ -65,9 +55,7 @@ namespace Volo.Abp.BlazoriseUI
 
         protected virtual UiNotificationOptions CreateDefaultOptions()
         {
-            return new UiNotificationOptions
+            return new UiNotificationOptions();
-            {
-            };
         }
     }
 }

framework/src/Volo.Abp.BlazoriseUI/Components/ActionType.cs

@@ -0,0 +1,8 @@
+namespace Volo.Abp.BlazoriseUI.Components
+{
+    public enum ActionType
+    {
+        Dropdown,
+        Button
+    }
+}

framework/src/Volo.Abp.BlazoriseUI/Components/DataGridEntityActionsColumn.cs

@@ -0,0 +1,30 @@
+using System.Linq;
+using System.Threading.Tasks;
+using Blazorise.DataGrid;
+using Localization.Resources.AbpUi;
+using Microsoft.AspNetCore.Components;
+using Microsoft.Extensions.Localization;
+
+namespace Volo.Abp.BlazoriseUI.Components
+{
+    public class DataGridEntityActionsColumn<TItem> : DataGridColumn<TItem>
+    {
+        [Inject]
+        public IStringLocalizer<AbpUiResource> UiLocalizer { get; set; }
+
+        protected override async Task OnInitializedAsync()
+        {
+            await base.OnInitializedAsync();
+            await SetDefaultValuesAsync();
+        }
+
+        protected virtual ValueTask SetDefaultValuesAsync()
+        {
+            Caption = UiLocalizer["Actions"];
+            Width = "150px";
+            Sortable = false;
+            Field = typeof(TItem).GetProperties().First().Name;
+            return ValueTask.CompletedTask;
+        }
+    }
+}

framework/src/Volo.Abp.BlazoriseUI/Components/EntityAction.razor

@@ -0,0 +1,21 @@
+@typeparam TItem
+@using Blazorise
+
+@if (ParentActions.Type == ActionType.Dropdown)
+{
+    if (IsVisible && Primary == false)
+    {
+        <DropdownItem Clicked="@ActionClickedAsync">@Text</DropdownItem>
+    }
+}
+else
+{
+    if (IsVisible)
+    {
+        <Blazorise.Button Block="true"
+                          Color="@Color"
+                          Clicked="@ActionClickedAsync">
+            @Text
+        </Blazorise.Button>
+    }
+}

framework/src/Volo.Abp.BlazoriseUI/Components/EntityAction.razor.cs

@@ -0,0 +1,75 @@
+using System;
+using System.Threading.Tasks;
+using Blazorise;
+using Localization.Resources.AbpUi;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Components;
+using Microsoft.Extensions.Localization;
+using Volo.Abp.AspNetCore.Components.WebAssembly;
+
+namespace Volo.Abp.BlazoriseUI.Components
+{
+    public partial class EntityAction<TItem> : ComponentBase
+    {
+        internal bool IsVisible = true;
+
+        [Parameter]
+        public string Text { get; set; }
+
+        [Parameter]
+        public bool Primary { get; set; }
+
+        [Parameter]
+        public EventCallback Clicked { get; set; }
+
+        [Parameter]
+        public string RequiredPolicy { get; set; }
+
+        [Parameter]
+        public Color Color { get; set; }
+
+        [Parameter]
+        public Func<string> ConfirmationMessage { get; set; }
+
+        [CascadingParameter]
+        public EntityActions<TItem> ParentActions { get; set; }
+
+        [Inject]
+        protected IAuthorizationService AuthorizationService { get; set; }
+
+        [Inject]
+        protected IUiMessageService UiMessageService { get; set; }
+
+        protected async override Task OnInitializedAsync()
+        {
+            await base.OnInitializedAsync();
+            await SetDefaultValuesAsync();
+            if (!RequiredPolicy.IsNullOrEmpty())
+            {
+                IsVisible = await AuthorizationService.IsGrantedAsync(RequiredPolicy);
+            }
+            ParentActions.AddAction(this);
+        }
+
+        protected internal virtual async Task ActionClickedAsync()
+        {
+            if (ConfirmationMessage != null)
+            {
+                if (await UiMessageService.ConfirmAsync(ConfirmationMessage()))
+                {
+                    await Clicked.InvokeAsync();
+                }
+            }
+            else
+            {
+                await Clicked.InvokeAsync();
+            }
+        }
+
+        protected virtual ValueTask SetDefaultValuesAsync()
+        {
+            Color = Color.Primary;
+            return ValueTask.CompletedTask;
+        }
+    }
+}

framework/src/Volo.Abp.BlazoriseUI/Components/EntityActions.razor

@@ -0,0 +1,30 @@
+@typeparam TItem
+<CascadingValue Value="this">
+    @if (Type == ActionType.Dropdown)
+    {
+        <Dropdown>
+            @if (HasPrimaryAction)
+            {
+                <Blazorise.Button Block="true"
+                                  Color="@PrimaryAction.Color"
+                                  Clicked="async ()=> await PrimaryAction.ActionClickedAsync()">
+                    @PrimaryAction.Text
+                </Blazorise.Button>
+                <DropdownToggle Color="@ToggleColor" Split="true" />
+            }
+            else
+            {
+                <DropdownToggle Color="@ToggleColor">
+                    @ToggleText
+                </DropdownToggle>
+            }
+            <DropdownMenu>
+                @ChildContent
+            </DropdownMenu>
+        </Dropdown>
+    }
+    else
+    {
+        @ChildContent
+    }
+</CascadingValue>

framework/src/Volo.Abp.BlazoriseUI/Components/EntityActions.razor.cs

@@ -0,0 +1,48 @@
+using System.Collections.Generic;
+using System.Linq;
+using Blazorise;
+using Localization.Resources.AbpUi;
+using Microsoft.AspNetCore.Components;
+using Microsoft.Extensions.Localization;
+
+namespace Volo.Abp.BlazoriseUI.Components
+{
+    public partial class EntityActions<TItem> : ComponentBase
+    {
+        protected readonly List<EntityAction<TItem>> Actions = new List<EntityAction<TItem>>();
+        protected bool HasPrimaryAction => Actions.Any(t => t.Primary);
+        protected EntityAction<TItem> PrimaryAction => Actions.FirstOrDefault(t => t.Primary);
+        protected internal ActionType Type => Actions.Count(t => t.IsVisible) > 1 ? ActionType.Dropdown : ActionType.Button;
+
+        [Parameter]
+        public Color ToggleColor { get; set; } = Color.Primary;
+
+        [Parameter]
+        public string ToggleText { get; set; }
+
+        [Parameter]
+        public RenderFragment ChildContent { get; set; }
+
+        [Parameter]
+        public DataGridEntityActionsColumn<TItem> EntityActionsColumn { get; set; }
+
+        [Inject]
+        public IStringLocalizer<AbpUiResource> UiLocalizer { get; set; }
+
+        internal void AddAction(EntityAction<TItem> action)
+        {
+            Actions.Add(action);
+            if (EntityActionsColumn != null)
+            {
+                EntityActionsColumn.Displayable = Actions.Any(t => t.IsVisible);
+            }
+            StateHasChanged();
+        }
+
+        protected override void OnInitialized()
+        {
+            base.OnInitialized();
+            ToggleText = UiLocalizer["Actions"];
+        }
+    }
+}

framework/src/Volo.Abp.Core/Volo/Abp/ExceptionHandling/IHasHttpStatusCode.cs

@@ -0,0 +1,7 @@
+namespace Volo.Abp.ExceptionHandling
+{
+    public interface IHasHttpStatusCode
+    {
+        int HttpStatusCode { get; }
+    }
+}

framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/AbpRemoteCallException.cs

@@ -5,8 +5,10 @@ using Volo.Abp.ExceptionHandling;
 namespace Volo.Abp.Http.Client
 {
     [Serializable]
-    public class AbpRemoteCallException : AbpException, IHasErrorCode, IHasErrorDetails
+    public class AbpRemoteCallException : AbpException, IHasErrorCode, IHasErrorDetails, IHasHttpStatusCode
     {
+        public int HttpStatusCode { get; set; }
+
         public string Code => Error?.Code;
 
         public string Details => Error?.Details;

framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs

@@ -252,10 +252,22 @@ namespace Volo.Abp.Http.Client.DynamicProxying
                     await response.Content.ReadAsStringAsync()
                 );
 
-                throw new AbpRemoteCallException(errorResponse.Error);
+                throw new AbpRemoteCallException(errorResponse.Error)
+                {
+                    HttpStatusCode = (int) response.StatusCode
+                };
             }
 
-            throw new AbpException($"Remote service returns error! HttpStatusCode: {response.StatusCode}, ReasonPhrase: {response.ReasonPhrase}");
+            throw new AbpRemoteCallException(
+                new RemoteServiceErrorInfo
+                {
+                    Message = response.ReasonPhrase,
+                    Code = response.StatusCode.ToString()
+                }
+            )
+            {
+                HttpStatusCode = (int) response.StatusCode
+            };
         }
 
         protected virtual CancellationToken GetCancellationToken()

framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/PropertyApiDescriptionModel.cs

@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel.DataAnnotations;
 using System.Reflection;
 
 namespace Volo.Abp.Http.Modeling
@@ -12,6 +13,8 @@ namespace Volo.Abp.Http.Modeling
 
         public string TypeSimple { get; set; }
 
+        public bool IsRequired { get; set; }
+
         //TODO: Validation rules for this property
         public static PropertyApiDescriptionModel Create(PropertyInfo propertyInfo)
         {
@@ -19,7 +22,8 @@ namespace Volo.Abp.Http.Modeling
             {
                 Name = propertyInfo.Name,
                 Type = ApiTypeNameHelper.GetTypeName(propertyInfo.PropertyType),
-                TypeSimple = ApiTypeNameHelper.GetSimpleTypeName(propertyInfo.PropertyType)
+                TypeSimple = ApiTypeNameHelper.GetSimpleTypeName(propertyInfo.PropertyType),
+                IsRequired = propertyInfo.IsDefined(typeof(RequiredAttribute), true)
             };
         }
     }

framework/src/Volo.Abp.Localization/Volo/Abp/Localization/AbpStringLocalizerFactory.cs

@@ -58,14 +58,11 @@ namespace Volo.Abp.Localization
                 resource.Contributors.Add((ILocalizationResourceContributor) Activator.CreateInstance(globalContributor));
             }
 
-            using (var scope = ServiceProvider.CreateScope())
+            var context = new LocalizationResourceInitializationContext(resource, ServiceProvider);
-            {
-                var context = new LocalizationResourceInitializationContext(resource, scope.ServiceProvider);
 
-                foreach (var contributor in resource.Contributors)
+            foreach (var contributor in resource.Contributors)
-                {
+            {
-                    contributor.Initialize(context);
+                contributor.Initialize(context);
-                }
             }
 
             return new StringLocalizerCacheItem(
@@ -109,4 +106,4 @@ namespace Volo.Abp.Localization
             return Create(AbpLocalizationOptions.DefaultResourceType);
         }
     }
-}
+}

framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json

@@ -3,7 +3,7 @@
   "name": "asp.net",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.shared": "^3.3.0",
+    "@abp/aspnetcore.mvc.ui.theme.shared": "^3.3.1",
     "highlight.js": "^9.13.1"
   },
   "devDependencies": {}

framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/yarn.lock

@@ -2,30 +2,30 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.shared@^3.3.0":
+"@abp/aspnetcore.mvc.ui.theme.shared@^3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.3.0.tgz#6c998bad95e46905e5a1487ab2370905cdf4376a"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.3.1.tgz#c3123ea8f6c8428d034d9ac2782aa1bff27bd740"
-  integrity sha512-Tt6SK3EUj8jfZKSzeIVkRuWyAGRoDTqeoS5VVkNZLoIfLzwiimHw2o2AlPRtCMa0jqLropHtaT/kNl+EU24AZw==
+  integrity sha512-j2uZapDTKSjH74uZcIR4y09hr6w+OAdybQhL1bx4fb0D3XlmOdOwRrsqXieJNwAggbUn00EX2Usiey3N/wV1rA==
-  dependencies:
+  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~3.3.0"
+    "@abp/aspnetcore.mvc.ui" "~3.3.1"
-    "@abp/bootstrap" "~3.3.0"
+    "@abp/bootstrap" "~3.3.1"
-    "@abp/bootstrap-datepicker" "~3.3.0"
+    "@abp/bootstrap-datepicker" "~3.3.1"
-    "@abp/datatables.net-bs4" "~3.3.0"
+    "@abp/datatables.net-bs4" "~3.3.1"
-    "@abp/font-awesome" "~3.3.0"
+    "@abp/font-awesome" "~3.3.1"
-    "@abp/jquery-form" "~3.3.0"
+    "@abp/jquery-form" "~3.3.1"
-    "@abp/jquery-validation-unobtrusive" "~3.3.0"
+    "@abp/jquery-validation-unobtrusive" "~3.3.1"
-    "@abp/lodash" "~3.3.0"
+    "@abp/lodash" "~3.3.1"
-    "@abp/luxon" "~3.3.0"
+    "@abp/luxon" "~3.3.1"
-    "@abp/malihu-custom-scrollbar-plugin" "~3.3.0"
+    "@abp/malihu-custom-scrollbar-plugin" "~3.3.1"
-    "@abp/select2" "~3.3.0"
+    "@abp/select2" "~3.3.1"
-    "@abp/sweetalert" "~3.3.0"
+    "@abp/sweetalert" "~3.3.1"
-    "@abp/timeago" "~3.3.0"
+    "@abp/timeago" "~3.3.1"
-    "@abp/toastr" "~3.3.0"
+    "@abp/toastr" "~3.3.1"
-
+
-"@abp/aspnetcore.mvc.ui@~3.3.0":
+"@abp/aspnetcore.mvc.ui@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.3.0.tgz#07f7d0f7f689a3ac75a69e12681ebd3d08fa0644"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.3.1.tgz#946d5fb68d73842270e2553fba475163d2ca57a5"
-  integrity sha512-EbUISgnR8qHYdu/tSro8QjUWj17M6gOkugMI7N0fiPNbtLHgKG2GHWxIsVEf5ic1O2j/PWKOQ+FPBLZ4v3jFrw==
+  integrity sha512-W/Yxe20Upkha0XaHPQwQ3+LxdUZI21BiARcbBUnIUzRUrFBpvjD0A9/T8bsi+KpIqOYLAwtrE1TJoSuZGscoIw==
   dependencies:
     ansi-colors "^4.1.1"
     extend-object "^1.0.0"
@@ -34,145 +34,145 @@
     path "^0.12.7"
     rimraf "^3.0.2"
 
-"@abp/bootstrap-datepicker@~3.3.0":
+"@abp/bootstrap-datepicker@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.3.0.tgz#d7d11e591818a6ec654127d88602cfdfddf81b1f"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.3.1.tgz#c0f5763e0bfb1e293ef1b22f2a14014ec345dbc3"
-  integrity sha512-PUsS48o5Cwufn8O8d34UBsjLF6/HrgdhsGTUzrVIhGapiyuYD/QrvqWYWRUj1Jeeb4nrsRVem2DnM1isy+CUCA==
+  integrity sha512-MnX2vI75gEDtlwnKhI6ptH657dh5TuXoin1XeaEhOa5rGbLwhSu4IFqRmlLBedFBOf+1zwcvFs30vsQlNKJ6Nw==
   dependencies:
     bootstrap-datepicker "^1.9.0"
 
-"@abp/bootstrap@~3.3.0":
+"@abp/bootstrap@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.3.0.tgz#1314549e7a940c58fdff521a9ddf153f3414fffa"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.3.1.tgz#5b173918511b6ad1fb8ac570ea2e2fcb874970e0"
-  integrity sha512-CVjSwbZPjio0VJWxdo+PRkvUYGtv51DgVrqjgHK7m7tGFwHAK38cDHAl+mqmIp7dgPG1Z+E0o41JteT3Za1Bkw==
+  integrity sha512-CfnwXAV2XRK3gYpeEQjgVzEocU6pqdGZXwATwOKifHWBZNG8ubDyMgBed+oVCvJgRvLRrniR5jFK2vhm8Du+EQ==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     bootstrap "^4.5.0"
     bootstrap-v4-rtl "4.4.1-2"
 
-"@abp/core@~3.3.0":
+"@abp/core@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.3.0.tgz#c88c28df19f96349b9a32b7ebe402e6d267c34e5"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.3.1.tgz#b1da2160b0fc4a309dc4a65ee937c814de16b2de"
-  integrity sha512-y9P86zPAm55fAyKwDaoxv+IrApA339aaGEpN9364upeeNBsO8mYf9hoM136VovQaWNIABFHRD7R+9KskwPAuNA==
+  integrity sha512-6/6FHTLZrWh821O6xr4Sk1BlIt9gTAT19NnykQRV9U8S7rl4BQv2QF055R8Wg3lnVKWJ1ajiAbd3gerjH/pL6g==
   dependencies:
-    "@abp/utils" "^3.3.0"
+    "@abp/utils" "^3.3.1"
 
-"@abp/datatables.net-bs4@~3.3.0":
+"@abp/datatables.net-bs4@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.3.0.tgz#e4cc85f3c1c195d9e8b07532eb7c53619f40a787"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.3.1.tgz#fd0f5f5579ff94d635d19c1bf46ac0593639e3f4"
-  integrity sha512-StuwT8jGfDWGNXmYgRELuErXxSE+qjVoiSAkd27mZqDbYSTipq4OZSAHr6WNmoqMgP6QlCgjGgXcz4Pr8Pxuaw==
+  integrity sha512-C9BUlbsk9liJ+hmFpTKoearJNZISDy5TInTbnixL8WfXfIaAWdZRs+ADvhKO9+oWMxkbxhGI8ueYQ29Z1UJzMg==
   dependencies:
-    "@abp/datatables.net" "~3.3.0"
+    "@abp/datatables.net" "~3.3.1"
     datatables.net-bs4 "^1.10.21"
 
-"@abp/datatables.net@~3.3.0":
+"@abp/datatables.net@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.3.0.tgz#a2b2cedc06beb325e62ce6faba899c935564b9a7"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.3.1.tgz#2ec7406712607f08f0ae9a6ce0ee7bfd0cc73278"
-  integrity sha512-y0RGrLxI7VgWFAFtHAraDnrEJ5pkUIJ3zxEScS43RUbArhxk+5pIpxQbmU0WgHpk72H7WXdqtL486Kw8PSj1Nw==
+  integrity sha512-prsMkh//XCymCG/aYEEtzV/922RJIZ0+PcnRvhJzXvrX4DK2y3ZWM44QNR/9/rpkYUJqRcVoHqbt1DuxbHDLXQ==
   dependencies:
-    "@abp/jquery" "~3.3.0"
+    "@abp/jquery" "~3.3.1"
     datatables.net "^1.10.21"
 
-"@abp/font-awesome@~3.3.0":
+"@abp/font-awesome@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.3.0.tgz#f9307334c34309456c47cc407fbe079821ace45e"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.3.1.tgz#268a21685a6b810b15848169b78c3dfb11d582c6"
-  integrity sha512-7/uZ2qXooHQZG35F6ERKsjI8m0gn8/BgE2cOB7Zhu5KRtSTOHOOXX4YWEfoHYLEMuo3xKTTJ2gHM3jiCJEpVtg==
+  integrity sha512-Eg2dwtcsyLo5E6PC21vK5R8YFe32UFSN4DpNrqAP9I85daR8ZbT0US8SbfCcI5nhiZlRi3EWj/cUgz2IEJHaaQ==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     "@fortawesome/fontawesome-free" "^5.13.0"
 
-"@abp/jquery-form@~3.3.0":
+"@abp/jquery-form@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.3.0.tgz#43fc5655b4e3cac7c0558fb36dd9ef188fe64412"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.3.1.tgz#4e8c2e50e711a7bbe4f40e74210472b21afd0ecf"
-  integrity sha512-fH4IPf/cU3ojWtVsPZjtymzK0xWqqgmvnSk5zy4AB4MOCKyYtPrn5OAMUvq8A4uZ0mGIRAQ8Z72wPKZA1rws5A==
+  integrity sha512-HBic6SzOSprYAug/Qbgcd+MiPRwtXczS2/x9IUmPFeUhvuqJJoYPWrhI5xC6WKNcJ/5MjExiEbeEXMXp8PwJTA==
   dependencies:
-    "@abp/jquery" "~3.3.0"
+    "@abp/jquery" "~3.3.1"
     jquery-form "^4.3.0"
 
-"@abp/jquery-validation-unobtrusive@~3.3.0":
+"@abp/jquery-validation-unobtrusive@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.3.0.tgz#0840f3114626a1d6efff54f4791776ebfdf56e76"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.3.1.tgz#e42d61a172b6ef5cbdbb305ab5d93e3dad5159a1"
-  integrity sha512-foKM9FDAY2RZGz5EQ2FcQt/FiL8sMc+uwd+2KeAdIejLyPgeSH/lLio6agd2Xun4e/xlBJB185Ga1eKcdHIGAw==
+  integrity sha512-SH8zmrR3HshCNP0zIgi4j6PMhgCzmCKk5xXxD+8kg+LAv+bm1iP0K5srgX4WlEffRma80QIeNKPpe/lW04EgFw==
   dependencies:
-    "@abp/jquery-validation" "~3.3.0"
+    "@abp/jquery-validation" "~3.3.1"
     jquery-validation-unobtrusive "^3.2.11"
 
-"@abp/jquery-validation@~3.3.0":
+"@abp/jquery-validation@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.3.0.tgz#2199968638d7bab9bfb6ba5e9f27d9d607c09a24"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.3.1.tgz#05164e342fdb83f40a17f000b40c27df2604c394"
-  integrity sha512-jxw274hx8i9+dkRrDz7aUpWSGESnJ2wuA6e3IAQIlubFf+7q0o4vosXD5bubinn4qaRGcSiYC15armfefgmFCw==
+  integrity sha512-oKN3wQUY1PB7IhelFIJVjRqAZx/AVlpUF0GV6k/9eNBK+ZoLpW1ebE1q9tsLhXf7QS1N7S45aEHB8OpjRopDew==
   dependencies:
-    "@abp/jquery" "~3.3.0"
+    "@abp/jquery" "~3.3.1"
     jquery-validation "^1.19.2"
 
-"@abp/jquery@~3.3.0":
+"@abp/jquery@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.3.0.tgz#b99a9436bf3c2394917e761a2dcdfe4f1af9ff3d"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.3.1.tgz#2e8431a52641ab85d1372a32518307bbf8fba1a0"
-  integrity sha512-WrjDQCBOi83kjtMYjXCJVWSbnFxKLW/KtDADkjTF7TxIGccsNWx6E8npzdCEnDnlOJ5Rk9+1QIu07pWedOjBSg==
+  integrity sha512-mSAUYLzhJSvq8ixhAFkU5Q2LRDTkJAGHq47alb2nNEodZNr1q1i+875nP3dE/4MLT/foG0H+j+r4RGuYx4fGAA==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     jquery "~3.5.1"
 
-"@abp/lodash@~3.3.0":
+"@abp/lodash@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.3.0.tgz#5402a779ef1e8ecd585644a68607425587560305"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.3.1.tgz#5c2602f03bde7fbf7841c01bb7178b3ca3429d87"
-  integrity sha512-QFm9hpWs0/J5TFFiE7vO5oxTsLgMcibmgg/CxYvmQZXhHGZpx3mdoAzC48CvRu8quxr6Xo8pIxlCyYXniR6/Dw==
+  integrity sha512-5fitYkotzaXGaEbwctVYT4HcfKZ1ghAnvrQLYI+2MYgIQmtipBhXFEG030zIXWThEoIGKOBuwVzmOYtwiX7+8w==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     lodash "^4.17.15"
 
-"@abp/luxon@~3.3.0":
+"@abp/luxon@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.3.0.tgz#2d669786308df997c6738dd205363edaae670d15"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.3.1.tgz#2e477be6a9f76394331399a762552bf610168e8e"
-  integrity sha512-1oSUuzgehSBxaxJLfD06ktXK4jisILPKFnEaKCBuPiKiQSDFvdQbepHAYJcpU1Jye6sVrheUKDUyJhnSwDb+0w==
+  integrity sha512-bp74vBmObbqUXsOc4VRWml5ivEyIzwHLR4oycLvWG0bQZn65yt7db7DVYTQL1PCWbEAKf6eULlnF6JvZpSVgeg==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     luxon "^1.24.1"
 
-"@abp/malihu-custom-scrollbar-plugin@~3.3.0":
+"@abp/malihu-custom-scrollbar-plugin@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.3.0.tgz#3bb48e0d68c0b76f3460eb19706927af2168a6c3"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.3.1.tgz#df833f2b8421f4dce681c13d2d5976680a27e4c8"
-  integrity sha512-44JvJOfxJ5ihfNCPyc5U8D8N8CmLh8UBMkzjH7YJQZJO+7PGgjx+uEqbQhTtBDftUz5C5oFkGoQ7i2pil7YSYQ==
+  integrity sha512-bJRQTevunQulXo+EC1HWqYgV30RVmFcS218DtdZLm2x/xWFBhvr+2DLzLS2Gq8JJXNGQMFbHnCWixn5si4V/KA==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     malihu-custom-scrollbar-plugin "^3.1.5"
 
-"@abp/select2@~3.3.0":
+"@abp/select2@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.3.0.tgz#207460dd128a1620c332af5eea2df88bfdfd0520"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.3.1.tgz#65ac0ae3ac8783d4e0422717ce743d573bf559e4"
-  integrity sha512-dbOnzQVARBQp/ynJvNyJqE1ArtsWCV8nGMUablB1ILPonsJy+0ADJ+GXWa1nIsHdj3zPW0MLi8pdqpepRCTAFg==
+  integrity sha512-efxhM/QxAmnyfGNcokZIK7vD6wYJkFGSnZEDj9QSrZ6DyUYf8H+jlK38JViDGe0RCMqts0R4B6IaKT0RbbIGmw==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     select2 "^4.0.13"
 
-"@abp/sweetalert@~3.3.0":
+"@abp/sweetalert@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.3.0.tgz#457a05af37819fc54082254022551ed0233c471e"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.3.1.tgz#b6a41f8459d4407c4aee04e2f200b84e3fa8d534"
-  integrity sha512-6KXwPVC1zwNwlZBS9x0uPLTmieu3nmBp0G+ZH1aP+GTMphSa0ejI7nuPFqUeqfEMg+an1yj51SKKUfKtmlx6Zg==
+  integrity sha512-olDU9Lh5o0sNCxRXROwt8QhHpuB5+fjojVWVUOiag0UMLVA9k/fp38diyn64qddSHWCafpqjeO32IXDKEQckZA==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     sweetalert "^2.1.2"
 
-"@abp/timeago@~3.3.0":
+"@abp/timeago@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.3.0.tgz#f0da23577630cec21255fc9c71dd2f7a3a3a3388"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.3.1.tgz#9759e09728fea082d28cd430cdc1af5b93f14720"
-  integrity sha512-f5sb4vxgGPyIzTj6lxDzUx/qJiC8pAqWPasdxHDMzhKlkRuFWO+GfblR5DC/sj9fQPcyV8+yX/VQPY3JW8i62Q==
+  integrity sha512-sIgSj3hZBl+oyO6rHc55YrIfqb4d2d2RlT6HU+OIsa2/BUAjTcW6WdPVUjXTreth2jyxEjXkfOKA3Sv5DvraGg==
   dependencies:
-    "@abp/jquery" "~3.3.0"
+    "@abp/jquery" "~3.3.1"
     timeago "^1.6.7"
 
-"@abp/toastr@~3.3.0":
+"@abp/toastr@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.3.0.tgz#c4f7d761eb4d93e993cb8e8cb54a0d670b20bdd3"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.3.1.tgz#06cf0b46e6430fae516aaff8707a5f5b16d6ed1d"
-  integrity sha512-GGqtVUCX8WalpkCnhiYUs+XxxBnhxGOLe87qFe/2tr0XNDJ3BSHXxiKynDetjlNAq/Qnf4U5P4Eg9FnHWFdWZg==
+  integrity sha512-LTf2NGwcG9ke571HMO7N4syhJijagnw/eIDl6ezflIQI/BnQqBKpXJ8xckCCqgryxfraBu4APMuSkPoDs2Ce5g==
   dependencies:
-    "@abp/jquery" "~3.3.0"
+    "@abp/jquery" "~3.3.1"
     toastr "^2.1.4"
 
-"@abp/utils@^3.3.0":
+"@abp/utils@^3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.3.0.tgz#44ccacf4c415227e94981d907017de1c6f7225bb"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.3.1.tgz#f1759161ac8af10e57b50ac90538a24a51b64ebd"
-  integrity sha512-/JIcygVJu/Ob1G5IicL2XgOVjIIePC2t3QzgEbwaq6NDGMHiOm2quyS8Lj7TfjBeUFTJhCFEbXJMq0lGQ+KMww==
+  integrity sha512-XEYJYp94zDdln48P7X51wa4v1yg3Q+p0o2DdZxQbZxXChRkCwVC/B0uyMGPs75wkft6xiz965Xr7vcNvMo0nOA==
   dependencies:
     just-compare "^1.3.0"
 

framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json

@@ -3,8 +3,8 @@
   "name": "asp.net",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.3.0",
+    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.3.1",
-	"@abp/prismjs": "^3.3.0"
+	"@abp/prismjs": "^3.3.1"
   },
   "devDependencies": {}
 }

framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/yarn.lock

@@ -2,37 +2,37 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.basic@^3.3.0":
+"@abp/aspnetcore.mvc.ui.theme.basic@^3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.3.0.tgz#5a83ad1010ede0647cc4bbe225f0ebf8f3ac90d8"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.3.1.tgz#58ae88355b821ca72eccf1950bde544b8f0edcca"
-  integrity sha512-b0Z/CO7nLixuceC2A/rx4m6OQPwe7ELym+ZZdurUxI42ciuoC5Cnnl3FH+HCt8P3JdFjOIWl2wOXvUcc6P16oQ==
+  integrity sha512-AUIJQIBb+5of0Na1cxmyacni6ToYBpmtU+NJH9/cTC3UUAPylj8TiAX9yobAPn8dbrcXTm+dh9T8i49rXTtxoA==
-  dependencies:
+  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.3.0"
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.3.1"
-
+
-"@abp/aspnetcore.mvc.ui.theme.shared@~3.3.0":
+"@abp/aspnetcore.mvc.ui.theme.shared@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.3.0.tgz#6c998bad95e46905e5a1487ab2370905cdf4376a"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.3.1.tgz#c3123ea8f6c8428d034d9ac2782aa1bff27bd740"
-  integrity sha512-Tt6SK3EUj8jfZKSzeIVkRuWyAGRoDTqeoS5VVkNZLoIfLzwiimHw2o2AlPRtCMa0jqLropHtaT/kNl+EU24AZw==
+  integrity sha512-j2uZapDTKSjH74uZcIR4y09hr6w+OAdybQhL1bx4fb0D3XlmOdOwRrsqXieJNwAggbUn00EX2Usiey3N/wV1rA==
-  dependencies:
+  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~3.3.0"
+    "@abp/aspnetcore.mvc.ui" "~3.3.1"
-    "@abp/bootstrap" "~3.3.0"
+    "@abp/bootstrap" "~3.3.1"
-    "@abp/bootstrap-datepicker" "~3.3.0"
+    "@abp/bootstrap-datepicker" "~3.3.1"
-    "@abp/datatables.net-bs4" "~3.3.0"
+    "@abp/datatables.net-bs4" "~3.3.1"
-    "@abp/font-awesome" "~3.3.0"
+    "@abp/font-awesome" "~3.3.1"
-    "@abp/jquery-form" "~3.3.0"
+    "@abp/jquery-form" "~3.3.1"
-    "@abp/jquery-validation-unobtrusive" "~3.3.0"
+    "@abp/jquery-validation-unobtrusive" "~3.3.1"
-    "@abp/lodash" "~3.3.0"
+    "@abp/lodash" "~3.3.1"
-    "@abp/luxon" "~3.3.0"
+    "@abp/luxon" "~3.3.1"
-    "@abp/malihu-custom-scrollbar-plugin" "~3.3.0"
+    "@abp/malihu-custom-scrollbar-plugin" "~3.3.1"
-    "@abp/select2" "~3.3.0"
+    "@abp/select2" "~3.3.1"
-    "@abp/sweetalert" "~3.3.0"
+    "@abp/sweetalert" "~3.3.1"
-    "@abp/timeago" "~3.3.0"
+    "@abp/timeago" "~3.3.1"
-    "@abp/toastr" "~3.3.0"
+    "@abp/toastr" "~3.3.1"
-
+
-"@abp/aspnetcore.mvc.ui@~3.3.0":
+"@abp/aspnetcore.mvc.ui@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.3.0.tgz#07f7d0f7f689a3ac75a69e12681ebd3d08fa0644"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.3.1.tgz#946d5fb68d73842270e2553fba475163d2ca57a5"
-  integrity sha512-EbUISgnR8qHYdu/tSro8QjUWj17M6gOkugMI7N0fiPNbtLHgKG2GHWxIsVEf5ic1O2j/PWKOQ+FPBLZ4v3jFrw==
+  integrity sha512-W/Yxe20Upkha0XaHPQwQ3+LxdUZI21BiARcbBUnIUzRUrFBpvjD0A9/T8bsi+KpIqOYLAwtrE1TJoSuZGscoIw==
   dependencies:
     ansi-colors "^4.1.1"
     extend-object "^1.0.0"
@@ -41,162 +41,162 @@
     path "^0.12.7"
     rimraf "^3.0.2"
 
-"@abp/bootstrap-datepicker@~3.3.0":
+"@abp/bootstrap-datepicker@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.3.0.tgz#d7d11e591818a6ec654127d88602cfdfddf81b1f"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.3.1.tgz#c0f5763e0bfb1e293ef1b22f2a14014ec345dbc3"
-  integrity sha512-PUsS48o5Cwufn8O8d34UBsjLF6/HrgdhsGTUzrVIhGapiyuYD/QrvqWYWRUj1Jeeb4nrsRVem2DnM1isy+CUCA==
+  integrity sha512-MnX2vI75gEDtlwnKhI6ptH657dh5TuXoin1XeaEhOa5rGbLwhSu4IFqRmlLBedFBOf+1zwcvFs30vsQlNKJ6Nw==
   dependencies:
     bootstrap-datepicker "^1.9.0"
 
-"@abp/bootstrap@~3.3.0":
+"@abp/bootstrap@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.3.0.tgz#1314549e7a940c58fdff521a9ddf153f3414fffa"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.3.1.tgz#5b173918511b6ad1fb8ac570ea2e2fcb874970e0"
-  integrity sha512-CVjSwbZPjio0VJWxdo+PRkvUYGtv51DgVrqjgHK7m7tGFwHAK38cDHAl+mqmIp7dgPG1Z+E0o41JteT3Za1Bkw==
+  integrity sha512-CfnwXAV2XRK3gYpeEQjgVzEocU6pqdGZXwATwOKifHWBZNG8ubDyMgBed+oVCvJgRvLRrniR5jFK2vhm8Du+EQ==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     bootstrap "^4.5.0"
     bootstrap-v4-rtl "4.4.1-2"
 
-"@abp/clipboard@~3.3.0":
+"@abp/clipboard@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-3.3.0.tgz#44029c7bac7fe4f693ab3963515d300c49aa2d5e"
+  resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-3.3.1.tgz#057381ecb3f5fb0744f2a742a4aff54294800439"
-  integrity sha512-YZKqjwZGue7o39GiuZf8WPEjt4ydQCSCG109fkIJQgbwjqkseeWPExJcYnogMSA4qWr4Ip1m3CQ17Yqtl1n8JA==
+  integrity sha512-iLtmLD/HXpHVWmLvbt2zY0EjZPmRLneCsT/gw07RWvy8iu+Hk8Cta8CD/Ak8RP5NdZkoYTO3Ojxdm7JUH0XN2g==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     clipboard "^2.0.6"
 
-"@abp/core@~3.3.0":
+"@abp/core@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.3.0.tgz#c88c28df19f96349b9a32b7ebe402e6d267c34e5"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.3.1.tgz#b1da2160b0fc4a309dc4a65ee937c814de16b2de"
-  integrity sha512-y9P86zPAm55fAyKwDaoxv+IrApA339aaGEpN9364upeeNBsO8mYf9hoM136VovQaWNIABFHRD7R+9KskwPAuNA==
+  integrity sha512-6/6FHTLZrWh821O6xr4Sk1BlIt9gTAT19NnykQRV9U8S7rl4BQv2QF055R8Wg3lnVKWJ1ajiAbd3gerjH/pL6g==
   dependencies:
-    "@abp/utils" "^3.3.0"
+    "@abp/utils" "^3.3.1"
 
-"@abp/datatables.net-bs4@~3.3.0":
+"@abp/datatables.net-bs4@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.3.0.tgz#e4cc85f3c1c195d9e8b07532eb7c53619f40a787"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.3.1.tgz#fd0f5f5579ff94d635d19c1bf46ac0593639e3f4"
-  integrity sha512-StuwT8jGfDWGNXmYgRELuErXxSE+qjVoiSAkd27mZqDbYSTipq4OZSAHr6WNmoqMgP6QlCgjGgXcz4Pr8Pxuaw==
+  integrity sha512-C9BUlbsk9liJ+hmFpTKoearJNZISDy5TInTbnixL8WfXfIaAWdZRs+ADvhKO9+oWMxkbxhGI8ueYQ29Z1UJzMg==
   dependencies:
-    "@abp/datatables.net" "~3.3.0"
+    "@abp/datatables.net" "~3.3.1"
     datatables.net-bs4 "^1.10.21"
 
-"@abp/datatables.net@~3.3.0":
+"@abp/datatables.net@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.3.0.tgz#a2b2cedc06beb325e62ce6faba899c935564b9a7"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.3.1.tgz#2ec7406712607f08f0ae9a6ce0ee7bfd0cc73278"
-  integrity sha512-y0RGrLxI7VgWFAFtHAraDnrEJ5pkUIJ3zxEScS43RUbArhxk+5pIpxQbmU0WgHpk72H7WXdqtL486Kw8PSj1Nw==
+  integrity sha512-prsMkh//XCymCG/aYEEtzV/922RJIZ0+PcnRvhJzXvrX4DK2y3ZWM44QNR/9/rpkYUJqRcVoHqbt1DuxbHDLXQ==
   dependencies:
-    "@abp/jquery" "~3.3.0"
+    "@abp/jquery" "~3.3.1"
     datatables.net "^1.10.21"
 
-"@abp/font-awesome@~3.3.0":
+"@abp/font-awesome@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.3.0.tgz#f9307334c34309456c47cc407fbe079821ace45e"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.3.1.tgz#268a21685a6b810b15848169b78c3dfb11d582c6"
-  integrity sha512-7/uZ2qXooHQZG35F6ERKsjI8m0gn8/BgE2cOB7Zhu5KRtSTOHOOXX4YWEfoHYLEMuo3xKTTJ2gHM3jiCJEpVtg==
+  integrity sha512-Eg2dwtcsyLo5E6PC21vK5R8YFe32UFSN4DpNrqAP9I85daR8ZbT0US8SbfCcI5nhiZlRi3EWj/cUgz2IEJHaaQ==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     "@fortawesome/fontawesome-free" "^5.13.0"
 
-"@abp/jquery-form@~3.3.0":
+"@abp/jquery-form@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.3.0.tgz#43fc5655b4e3cac7c0558fb36dd9ef188fe64412"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.3.1.tgz#4e8c2e50e711a7bbe4f40e74210472b21afd0ecf"
-  integrity sha512-fH4IPf/cU3ojWtVsPZjtymzK0xWqqgmvnSk5zy4AB4MOCKyYtPrn5OAMUvq8A4uZ0mGIRAQ8Z72wPKZA1rws5A==
+  integrity sha512-HBic6SzOSprYAug/Qbgcd+MiPRwtXczS2/x9IUmPFeUhvuqJJoYPWrhI5xC6WKNcJ/5MjExiEbeEXMXp8PwJTA==
   dependencies:
-    "@abp/jquery" "~3.3.0"
+    "@abp/jquery" "~3.3.1"
     jquery-form "^4.3.0"
 
-"@abp/jquery-validation-unobtrusive@~3.3.0":
+"@abp/jquery-validation-unobtrusive@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.3.0.tgz#0840f3114626a1d6efff54f4791776ebfdf56e76"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.3.1.tgz#e42d61a172b6ef5cbdbb305ab5d93e3dad5159a1"
-  integrity sha512-foKM9FDAY2RZGz5EQ2FcQt/FiL8sMc+uwd+2KeAdIejLyPgeSH/lLio6agd2Xun4e/xlBJB185Ga1eKcdHIGAw==
+  integrity sha512-SH8zmrR3HshCNP0zIgi4j6PMhgCzmCKk5xXxD+8kg+LAv+bm1iP0K5srgX4WlEffRma80QIeNKPpe/lW04EgFw==
   dependencies:
-    "@abp/jquery-validation" "~3.3.0"
+    "@abp/jquery-validation" "~3.3.1"
     jquery-validation-unobtrusive "^3.2.11"
 
-"@abp/jquery-validation@~3.3.0":
+"@abp/jquery-validation@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.3.0.tgz#2199968638d7bab9bfb6ba5e9f27d9d607c09a24"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.3.1.tgz#05164e342fdb83f40a17f000b40c27df2604c394"
-  integrity sha512-jxw274hx8i9+dkRrDz7aUpWSGESnJ2wuA6e3IAQIlubFf+7q0o4vosXD5bubinn4qaRGcSiYC15armfefgmFCw==
+  integrity sha512-oKN3wQUY1PB7IhelFIJVjRqAZx/AVlpUF0GV6k/9eNBK+ZoLpW1ebE1q9tsLhXf7QS1N7S45aEHB8OpjRopDew==
   dependencies:
-    "@abp/jquery" "~3.3.0"
+    "@abp/jquery" "~3.3.1"
     jquery-validation "^1.19.2"
 
-"@abp/jquery@~3.3.0":
+"@abp/jquery@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.3.0.tgz#b99a9436bf3c2394917e761a2dcdfe4f1af9ff3d"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.3.1.tgz#2e8431a52641ab85d1372a32518307bbf8fba1a0"
-  integrity sha512-WrjDQCBOi83kjtMYjXCJVWSbnFxKLW/KtDADkjTF7TxIGccsNWx6E8npzdCEnDnlOJ5Rk9+1QIu07pWedOjBSg==
+  integrity sha512-mSAUYLzhJSvq8ixhAFkU5Q2LRDTkJAGHq47alb2nNEodZNr1q1i+875nP3dE/4MLT/foG0H+j+r4RGuYx4fGAA==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     jquery "~3.5.1"
 
-"@abp/lodash@~3.3.0":
+"@abp/lodash@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.3.0.tgz#5402a779ef1e8ecd585644a68607425587560305"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.3.1.tgz#5c2602f03bde7fbf7841c01bb7178b3ca3429d87"
-  integrity sha512-QFm9hpWs0/J5TFFiE7vO5oxTsLgMcibmgg/CxYvmQZXhHGZpx3mdoAzC48CvRu8quxr6Xo8pIxlCyYXniR6/Dw==
+  integrity sha512-5fitYkotzaXGaEbwctVYT4HcfKZ1ghAnvrQLYI+2MYgIQmtipBhXFEG030zIXWThEoIGKOBuwVzmOYtwiX7+8w==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     lodash "^4.17.15"
 
-"@abp/luxon@~3.3.0":
+"@abp/luxon@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.3.0.tgz#2d669786308df997c6738dd205363edaae670d15"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.3.1.tgz#2e477be6a9f76394331399a762552bf610168e8e"
-  integrity sha512-1oSUuzgehSBxaxJLfD06ktXK4jisILPKFnEaKCBuPiKiQSDFvdQbepHAYJcpU1Jye6sVrheUKDUyJhnSwDb+0w==
+  integrity sha512-bp74vBmObbqUXsOc4VRWml5ivEyIzwHLR4oycLvWG0bQZn65yt7db7DVYTQL1PCWbEAKf6eULlnF6JvZpSVgeg==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     luxon "^1.24.1"
 
-"@abp/malihu-custom-scrollbar-plugin@~3.3.0":
+"@abp/malihu-custom-scrollbar-plugin@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.3.0.tgz#3bb48e0d68c0b76f3460eb19706927af2168a6c3"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.3.1.tgz#df833f2b8421f4dce681c13d2d5976680a27e4c8"
-  integrity sha512-44JvJOfxJ5ihfNCPyc5U8D8N8CmLh8UBMkzjH7YJQZJO+7PGgjx+uEqbQhTtBDftUz5C5oFkGoQ7i2pil7YSYQ==
+  integrity sha512-bJRQTevunQulXo+EC1HWqYgV30RVmFcS218DtdZLm2x/xWFBhvr+2DLzLS2Gq8JJXNGQMFbHnCWixn5si4V/KA==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     malihu-custom-scrollbar-plugin "^3.1.5"
 
-"@abp/prismjs@^3.3.0":
+"@abp/prismjs@^3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-3.3.0.tgz#88381eb65612c68d13dac02eb7e177a264a025ff"
+  resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-3.3.1.tgz#3abe550b34aa957248f6b1e4543aab990561351e"
-  integrity sha512-YwVmPDtvWq8JwjZ4sGqnR2fhkzlcfhH2qO1RQsv9wpfFe61Mh/3mIC1QKFq5mW52cM3f8I51oC7z9HMbBo8n4A==
+  integrity sha512-4+BHvKDcJa8A3yKccUqyfDgr1eqVMGt9e9ie8HPHOGTG2y1XMAYipZJ22E+T8QvUxaeBBkkmpQ4dyAOpndHJJw==
   dependencies:
-    "@abp/clipboard" "~3.3.0"
+    "@abp/clipboard" "~3.3.1"
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     prismjs "^1.20.0"
 
-"@abp/select2@~3.3.0":
+"@abp/select2@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.3.0.tgz#207460dd128a1620c332af5eea2df88bfdfd0520"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.3.1.tgz#65ac0ae3ac8783d4e0422717ce743d573bf559e4"
-  integrity sha512-dbOnzQVARBQp/ynJvNyJqE1ArtsWCV8nGMUablB1ILPonsJy+0ADJ+GXWa1nIsHdj3zPW0MLi8pdqpepRCTAFg==
+  integrity sha512-efxhM/QxAmnyfGNcokZIK7vD6wYJkFGSnZEDj9QSrZ6DyUYf8H+jlK38JViDGe0RCMqts0R4B6IaKT0RbbIGmw==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     select2 "^4.0.13"
 
-"@abp/sweetalert@~3.3.0":
+"@abp/sweetalert@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.3.0.tgz#457a05af37819fc54082254022551ed0233c471e"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.3.1.tgz#b6a41f8459d4407c4aee04e2f200b84e3fa8d534"
-  integrity sha512-6KXwPVC1zwNwlZBS9x0uPLTmieu3nmBp0G+ZH1aP+GTMphSa0ejI7nuPFqUeqfEMg+an1yj51SKKUfKtmlx6Zg==
+  integrity sha512-olDU9Lh5o0sNCxRXROwt8QhHpuB5+fjojVWVUOiag0UMLVA9k/fp38diyn64qddSHWCafpqjeO32IXDKEQckZA==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     sweetalert "^2.1.2"
 
-"@abp/timeago@~3.3.0":
+"@abp/timeago@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.3.0.tgz#f0da23577630cec21255fc9c71dd2f7a3a3a3388"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.3.1.tgz#9759e09728fea082d28cd430cdc1af5b93f14720"
-  integrity sha512-f5sb4vxgGPyIzTj6lxDzUx/qJiC8pAqWPasdxHDMzhKlkRuFWO+GfblR5DC/sj9fQPcyV8+yX/VQPY3JW8i62Q==
+  integrity sha512-sIgSj3hZBl+oyO6rHc55YrIfqb4d2d2RlT6HU+OIsa2/BUAjTcW6WdPVUjXTreth2jyxEjXkfOKA3Sv5DvraGg==
   dependencies:
-    "@abp/jquery" "~3.3.0"
+    "@abp/jquery" "~3.3.1"
     timeago "^1.6.7"
 
-"@abp/toastr@~3.3.0":
+"@abp/toastr@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.3.0.tgz#c4f7d761eb4d93e993cb8e8cb54a0d670b20bdd3"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.3.1.tgz#06cf0b46e6430fae516aaff8707a5f5b16d6ed1d"
-  integrity sha512-GGqtVUCX8WalpkCnhiYUs+XxxBnhxGOLe87qFe/2tr0XNDJ3BSHXxiKynDetjlNAq/Qnf4U5P4Eg9FnHWFdWZg==
+  integrity sha512-LTf2NGwcG9ke571HMO7N4syhJijagnw/eIDl6ezflIQI/BnQqBKpXJ8xckCCqgryxfraBu4APMuSkPoDs2Ce5g==
   dependencies:
-    "@abp/jquery" "~3.3.0"
+    "@abp/jquery" "~3.3.1"
     toastr "^2.1.4"
 
-"@abp/utils@^3.3.0":
+"@abp/utils@^3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.3.0.tgz#44ccacf4c415227e94981d907017de1c6f7225bb"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.3.1.tgz#f1759161ac8af10e57b50ac90538a24a51b64ebd"
-  integrity sha512-/JIcygVJu/Ob1G5IicL2XgOVjIIePC2t3QzgEbwaq6NDGMHiOm2quyS8Lj7TfjBeUFTJhCFEbXJMq0lGQ+KMww==
+  integrity sha512-XEYJYp94zDdln48P7X51wa4v1yg3Q+p0o2DdZxQbZxXChRkCwVC/B0uyMGPs75wkft6xiz965Xr7vcNvMo0nOA==
   dependencies:
     just-compare "^1.3.0"
 

modules/account/src/Volo.Abp.Account.Blazor/AbpAccountComponentBase.cs

@@ -0,0 +1,14 @@
+using Volo.Abp.Account.Localization;
+using Volo.Abp.AspNetCore.Components;
+
+namespace Volo.Abp.Account.Blazor
+{
+    public abstract class AbpAccountComponentBase : AbpComponentBase
+    {
+        protected AbpAccountComponentBase()
+        {
+            LocalizationResource = typeof(AccountResource);
+            ObjectMapperContext = typeof(AbpAccountBlazorModule);
+        }
+    }
+}

modules/account/src/Volo.Abp.Account.Blazor/Pages/Account/Manage.razor → modules/account/src/Volo.Abp.Account.Blazor/Pages/Account/AccountManage.razor

@@ -1,5 +1,7 @@
 @page "/account/manage-profile"
-@inherits AccountManageBase
+@using Microsoft.AspNetCore.Components.Forms 
+@inherits AbpAccountComponentBase
+
 <Row>
     <Column ColumnSize="ColumnSize.Is12">
         <Tabs @bind-SelectedTab="@SelectedTab" TabPosition="TabPosition.Left" Pills="true">
@@ -14,15 +16,15 @@
                         <EditForm id="ChangePasswordForm" Model="@ChangePasswordModel" OnValidSubmit="ChangePasswordAsync">
                             <Field>
                                 <FieldLabel>@L["DisplayName:CurrentPassword"]</FieldLabel>
-                                <TextEdit Role="TextRole.Password" @bind-text="@ChangePasswordModel.CurrentPassword"/>
+                                <TextEdit Role="@TextRole.Password" @bind-Text="@ChangePasswordModel.CurrentPassword"/>
                             </Field>
                             <Field>
                                 <FieldLabel>@L["DisplayName:NewPassword"]</FieldLabel>
-                                <TextEdit Role="TextRole.Password" @bind-text="@ChangePasswordModel.NewPassword"/>
+                                <TextEdit Role="@TextRole.Password" @bind-Text="@ChangePasswordModel.NewPassword"/>
                             </Field>
                             <Field>
                                 <FieldLabel>@L["DisplayName:NewPasswordConfirm"]</FieldLabel>
-                                <TextEdit Role="TextRole.Password" @bind-text="@ChangePasswordModel.NewPasswordConfirm"/>
+                                <TextEdit Role="@TextRole.Password" @bind-Text="@ChangePasswordModel.NewPasswordConfirm"/>
                             </Field>
                             <Field>
                                 <Button form="ChangePasswordForm" Color="Color.Primary" Clicked="@ChangePasswordAsync">@L["Save"]</Button>
@@ -36,25 +38,25 @@
                         <EditForm id="UpdatePersonalInfoForm" Model="@PersonalInfoModel" OnValidSubmit="UpdatePersonalInfoAsync">
                             <Field>
                                 <FieldLabel>@L["DisplayName:UserName"]</FieldLabel>
-                                <TextEdit @bind-text="@PersonalInfoModel.UserName"/>
+                                <TextEdit @bind-Text="@PersonalInfoModel.UserName"/>
                             </Field>
                             <Fields>
                                 <Field ColumnSize="ColumnSize.Is6">
                                     <FieldLabel>@L["DisplayName:Name"]</FieldLabel>
-                                    <TextEdit @bind-text="@PersonalInfoModel.Name"/>
+                                    <TextEdit @bind-Text="@PersonalInfoModel.Name"/>
                                 </Field>
                                 <Field ColumnSize="ColumnSize.Is6">
                                     <FieldLabel>@L["DisplayName:Surname"]</FieldLabel>
-                                    <TextEdit @bind-text="@PersonalInfoModel.Surname"/>
+                                    <TextEdit @bind-Text="@PersonalInfoModel.Surname"/>
                                 </Field>
                             </Fields>
                             <Field>
                                 <FieldLabel>@L["DisplayName:Email"]</FieldLabel>
-                                <TextEdit @bind-text="@PersonalInfoModel.Email"/>
+                                <TextEdit @bind-Text="@PersonalInfoModel.Email"/>
                             </Field>
                             <Field>
                                 <FieldLabel>@L["DisplayName:PhoneNumber"]</FieldLabel>
-                                <TextEdit @bind-text="@PersonalInfoModel.PhoneNumber"/>
+                                <TextEdit @bind-Text="@PersonalInfoModel.PhoneNumber"/>
                             </Field>
                             <Field>
                                 <Button form="UpdatePersonalInfoForm" Color="Color.Primary" Clicked="@UpdatePersonalInfoAsync">@L["Save"]</Button>

modules/account/src/Volo.Abp.Account.Blazor/Pages/Account/Manage.razor.cs → modules/account/src/Volo.Abp.Account.Blazor/Pages/Account/AccountManage.razor.cs

@@ -1,33 +1,22 @@
 using System.Threading.Tasks;
-using Localization.Resources.AbpUi;
 using Microsoft.AspNetCore.Components;
-using Microsoft.Extensions.Localization;
-using Volo.Abp.Account.Localization;
 using Volo.Abp.AspNetCore.Components.WebAssembly;
 using Volo.Abp.Identity;
-using Volo.Abp.ObjectMapping;
 
 namespace Volo.Abp.Account.Blazor.Pages.Account
 {
-    public abstract class AccountManageBase : OwningComponentBase
+    public partial class AccountManage
     {
-        [Inject] protected IAccountAppService AccountAppService { get; set; }
         [Inject] protected IProfileAppService ProfileAppService { get; set; }
-        
+                
-        [Inject] protected IObjectMapper<AbpAccountBlazorModule> ObjectMapper { get; set; }
-        
         [Inject] protected IUiMessageService UiMessageService { get; set; }
 
-        [Inject] protected IStringLocalizer<AbpUiResource> UiLocalizer { get; set; }
-        
-        [Inject] protected IStringLocalizer<AccountResource> L { get; set; }
-
         protected string SelectedTab = "Password";
 
         protected ChangePasswordModel ChangePasswordModel;
 
         protected PersonalInfoModel PersonalInfoModel;
-        
+
         protected async override Task OnInitializedAsync()
         {
             await GetUserInformations();

modules/account/src/Volo.Abp.Account.Blazor/Volo.Abp.Account.Blazor.csproj

@@ -17,10 +17,4 @@
     <ProjectReference Include="..\Volo.Abp.Account.HttpApi.Client\Volo.Abp.Account.HttpApi.Client.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Content Update="Pages\Account\Manage.razor">
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-    </Content>
-  </ItemGroup>
-
 </Project>

modules/blogging/app/Volo.BloggingTestApp/package.json

@@ -3,7 +3,7 @@
   "name": "volo.blogtestapp",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.3.0",
+    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.3.1",
-    "@abp/blogging": "^3.3.0"
+    "@abp/blogging": "^3.3.1"
   }
 }

modules/blogging/app/Volo.BloggingTestApp/yarn.lock

@@ -2,37 +2,37 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.basic@^3.3.0":
+"@abp/aspnetcore.mvc.ui.theme.basic@^3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.3.0.tgz#5a83ad1010ede0647cc4bbe225f0ebf8f3ac90d8"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.3.1.tgz#58ae88355b821ca72eccf1950bde544b8f0edcca"
-  integrity sha512-b0Z/CO7nLixuceC2A/rx4m6OQPwe7ELym+ZZdurUxI42ciuoC5Cnnl3FH+HCt8P3JdFjOIWl2wOXvUcc6P16oQ==
+  integrity sha512-AUIJQIBb+5of0Na1cxmyacni6ToYBpmtU+NJH9/cTC3UUAPylj8TiAX9yobAPn8dbrcXTm+dh9T8i49rXTtxoA==
-  dependencies:
+  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.3.0"
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.3.1"
-
+
-"@abp/aspnetcore.mvc.ui.theme.shared@~3.3.0":
+"@abp/aspnetcore.mvc.ui.theme.shared@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.3.0.tgz#6c998bad95e46905e5a1487ab2370905cdf4376a"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.3.1.tgz#c3123ea8f6c8428d034d9ac2782aa1bff27bd740"
-  integrity sha512-Tt6SK3EUj8jfZKSzeIVkRuWyAGRoDTqeoS5VVkNZLoIfLzwiimHw2o2AlPRtCMa0jqLropHtaT/kNl+EU24AZw==
+  integrity sha512-j2uZapDTKSjH74uZcIR4y09hr6w+OAdybQhL1bx4fb0D3XlmOdOwRrsqXieJNwAggbUn00EX2Usiey3N/wV1rA==
-  dependencies:
+  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~3.3.0"
+    "@abp/aspnetcore.mvc.ui" "~3.3.1"
-    "@abp/bootstrap" "~3.3.0"
+    "@abp/bootstrap" "~3.3.1"
-    "@abp/bootstrap-datepicker" "~3.3.0"
+    "@abp/bootstrap-datepicker" "~3.3.1"
-    "@abp/datatables.net-bs4" "~3.3.0"
+    "@abp/datatables.net-bs4" "~3.3.1"
-    "@abp/font-awesome" "~3.3.0"
+    "@abp/font-awesome" "~3.3.1"
-    "@abp/jquery-form" "~3.3.0"
+    "@abp/jquery-form" "~3.3.1"
-    "@abp/jquery-validation-unobtrusive" "~3.3.0"
+    "@abp/jquery-validation-unobtrusive" "~3.3.1"
-    "@abp/lodash" "~3.3.0"
+    "@abp/lodash" "~3.3.1"
-    "@abp/luxon" "~3.3.0"
+    "@abp/luxon" "~3.3.1"
-    "@abp/malihu-custom-scrollbar-plugin" "~3.3.0"
+    "@abp/malihu-custom-scrollbar-plugin" "~3.3.1"
-    "@abp/select2" "~3.3.0"
+    "@abp/select2" "~3.3.1"
-    "@abp/sweetalert" "~3.3.0"
+    "@abp/sweetalert" "~3.3.1"
-    "@abp/timeago" "~3.3.0"
+    "@abp/timeago" "~3.3.1"
-    "@abp/toastr" "~3.3.0"
+    "@abp/toastr" "~3.3.1"
-
+
-"@abp/aspnetcore.mvc.ui@~3.3.0":
+"@abp/aspnetcore.mvc.ui@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.3.0.tgz#07f7d0f7f689a3ac75a69e12681ebd3d08fa0644"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.3.1.tgz#946d5fb68d73842270e2553fba475163d2ca57a5"
-  integrity sha512-EbUISgnR8qHYdu/tSro8QjUWj17M6gOkugMI7N0fiPNbtLHgKG2GHWxIsVEf5ic1O2j/PWKOQ+FPBLZ4v3jFrw==
+  integrity sha512-W/Yxe20Upkha0XaHPQwQ3+LxdUZI21BiARcbBUnIUzRUrFBpvjD0A9/T8bsi+KpIqOYLAwtrE1TJoSuZGscoIw==
   dependencies:
     ansi-colors "^4.1.1"
     extend-object "^1.0.0"
@@ -41,214 +41,214 @@
     path "^0.12.7"
     rimraf "^3.0.2"
 
-"@abp/blogging@^3.3.0":
+"@abp/blogging@^3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/blogging/-/blogging-3.3.0.tgz#144b0bfe15b70900f1bd99f4646f3d2c0bb89d52"
+  resolved "https://registry.yarnpkg.com/@abp/blogging/-/blogging-3.3.1.tgz#37d10f8c9230c27dc2a25fbec66c216915236444"
-  integrity sha512-Fc7/SUTBg8qAIzwgKVLu4bUZZlmyKXK55LS8NXbhw6E4H54QJWdXTssP5/ChaKZRbxF6DOh/yIiTnSfu2WuUaQ==
+  integrity sha512-BhMGPd8O2XTl5XEU63QAe0o0f8o+64yhXyIs/Ax1OyG32Qf9pgbutlRBIWhqmqKQzP9N/pPWWskPyJZOrMeWcg==
   dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.3.0"
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.3.1"
-    "@abp/owl.carousel" "~3.3.0"
+    "@abp/owl.carousel" "~3.3.1"
-    "@abp/prismjs" "~3.3.0"
+    "@abp/prismjs" "~3.3.1"
-    "@abp/tui-editor" "~3.3.0"
+    "@abp/tui-editor" "~3.3.1"
 
-"@abp/bootstrap-datepicker@~3.3.0":
+"@abp/bootstrap-datepicker@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.3.0.tgz#d7d11e591818a6ec654127d88602cfdfddf81b1f"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.3.1.tgz#c0f5763e0bfb1e293ef1b22f2a14014ec345dbc3"
-  integrity sha512-PUsS48o5Cwufn8O8d34UBsjLF6/HrgdhsGTUzrVIhGapiyuYD/QrvqWYWRUj1Jeeb4nrsRVem2DnM1isy+CUCA==
+  integrity sha512-MnX2vI75gEDtlwnKhI6ptH657dh5TuXoin1XeaEhOa5rGbLwhSu4IFqRmlLBedFBOf+1zwcvFs30vsQlNKJ6Nw==
   dependencies:
     bootstrap-datepicker "^1.9.0"
 
-"@abp/bootstrap@~3.3.0":
+"@abp/bootstrap@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.3.0.tgz#1314549e7a940c58fdff521a9ddf153f3414fffa"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.3.1.tgz#5b173918511b6ad1fb8ac570ea2e2fcb874970e0"
-  integrity sha512-CVjSwbZPjio0VJWxdo+PRkvUYGtv51DgVrqjgHK7m7tGFwHAK38cDHAl+mqmIp7dgPG1Z+E0o41JteT3Za1Bkw==
+  integrity sha512-CfnwXAV2XRK3gYpeEQjgVzEocU6pqdGZXwATwOKifHWBZNG8ubDyMgBed+oVCvJgRvLRrniR5jFK2vhm8Du+EQ==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     bootstrap "^4.5.0"
     bootstrap-v4-rtl "4.4.1-2"
 
-"@abp/clipboard@~3.3.0":
+"@abp/clipboard@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-3.3.0.tgz#44029c7bac7fe4f693ab3963515d300c49aa2d5e"
+  resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-3.3.1.tgz#057381ecb3f5fb0744f2a742a4aff54294800439"
-  integrity sha512-YZKqjwZGue7o39GiuZf8WPEjt4ydQCSCG109fkIJQgbwjqkseeWPExJcYnogMSA4qWr4Ip1m3CQ17Yqtl1n8JA==
+  integrity sha512-iLtmLD/HXpHVWmLvbt2zY0EjZPmRLneCsT/gw07RWvy8iu+Hk8Cta8CD/Ak8RP5NdZkoYTO3Ojxdm7JUH0XN2g==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     clipboard "^2.0.6"
 
-"@abp/codemirror@~3.3.0":
+"@abp/codemirror@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/codemirror/-/codemirror-3.3.0.tgz#a9ac33155a92241dc6f35c9de104639fdc2c199f"
+  resolved "https://registry.yarnpkg.com/@abp/codemirror/-/codemirror-3.3.1.tgz#5f810ad81cb306dc7bf6078c79ec6878a556ab5d"
-  integrity sha512-C5/L0Hv0F7fzQt14NAyL0QQhhPrUcLkgFSxja/SknrA9nSIMoTg+r37Ny436GEHqoj8Jjj8u3jqErYhrOqd9cA==
+  integrity sha512-SHhHaoHXnc+PT5sst+5gP9pvYu+Nx+5pBudAGOGtugSV7QmZffrD42iCi64/D8b+eYeU1QN/FxS3hRQ0IDt1DA==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     codemirror "^5.54.0"
 
-"@abp/core@~3.3.0":
+"@abp/core@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.3.0.tgz#c88c28df19f96349b9a32b7ebe402e6d267c34e5"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.3.1.tgz#b1da2160b0fc4a309dc4a65ee937c814de16b2de"
-  integrity sha512-y9P86zPAm55fAyKwDaoxv+IrApA339aaGEpN9364upeeNBsO8mYf9hoM136VovQaWNIABFHRD7R+9KskwPAuNA==
+  integrity sha512-6/6FHTLZrWh821O6xr4Sk1BlIt9gTAT19NnykQRV9U8S7rl4BQv2QF055R8Wg3lnVKWJ1ajiAbd3gerjH/pL6g==
   dependencies:
-    "@abp/utils" "^3.3.0"
+    "@abp/utils" "^3.3.1"
 
-"@abp/datatables.net-bs4@~3.3.0":
+"@abp/datatables.net-bs4@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.3.0.tgz#e4cc85f3c1c195d9e8b07532eb7c53619f40a787"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.3.1.tgz#fd0f5f5579ff94d635d19c1bf46ac0593639e3f4"
-  integrity sha512-StuwT8jGfDWGNXmYgRELuErXxSE+qjVoiSAkd27mZqDbYSTipq4OZSAHr6WNmoqMgP6QlCgjGgXcz4Pr8Pxuaw==
+  integrity sha512-C9BUlbsk9liJ+hmFpTKoearJNZISDy5TInTbnixL8WfXfIaAWdZRs+ADvhKO9+oWMxkbxhGI8ueYQ29Z1UJzMg==
   dependencies:
-    "@abp/datatables.net" "~3.3.0"
+    "@abp/datatables.net" "~3.3.1"
     datatables.net-bs4 "^1.10.21"
 
-"@abp/datatables.net@~3.3.0":
+"@abp/datatables.net@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.3.0.tgz#a2b2cedc06beb325e62ce6faba899c935564b9a7"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.3.1.tgz#2ec7406712607f08f0ae9a6ce0ee7bfd0cc73278"
-  integrity sha512-y0RGrLxI7VgWFAFtHAraDnrEJ5pkUIJ3zxEScS43RUbArhxk+5pIpxQbmU0WgHpk72H7WXdqtL486Kw8PSj1Nw==
+  integrity sha512-prsMkh//XCymCG/aYEEtzV/922RJIZ0+PcnRvhJzXvrX4DK2y3ZWM44QNR/9/rpkYUJqRcVoHqbt1DuxbHDLXQ==
   dependencies:
-    "@abp/jquery" "~3.3.0"
+    "@abp/jquery" "~3.3.1"
     datatables.net "^1.10.21"
 
-"@abp/font-awesome@~3.3.0":
+"@abp/font-awesome@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.3.0.tgz#f9307334c34309456c47cc407fbe079821ace45e"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.3.1.tgz#268a21685a6b810b15848169b78c3dfb11d582c6"
-  integrity sha512-7/uZ2qXooHQZG35F6ERKsjI8m0gn8/BgE2cOB7Zhu5KRtSTOHOOXX4YWEfoHYLEMuo3xKTTJ2gHM3jiCJEpVtg==
+  integrity sha512-Eg2dwtcsyLo5E6PC21vK5R8YFe32UFSN4DpNrqAP9I85daR8ZbT0US8SbfCcI5nhiZlRi3EWj/cUgz2IEJHaaQ==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     "@fortawesome/fontawesome-free" "^5.13.0"
 
-"@abp/highlight.js@~3.3.0":
+"@abp/highlight.js@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-3.3.0.tgz#94c773e66a75ffe5d62485c2e70c7300fad9a611"
+  resolved "https://registry.yarnpkg.com/@abp/highlight.js/-/highlight.js-3.3.1.tgz#284def87eba0601d24e9221166e12ee94e13998f"
-  integrity sha512-CMXMeEA262yOs/ip2qbXfl+Kh3tTaUlogHlypT0AZ8Q0aQGs0tJiPVtGRJQ9xng/QfOzv+XWpPgYB5UIuwU6SQ==
+  integrity sha512-6e9lAGi6uld2zIchMF12JWEdWPHUpG+npikbRxO5z5nHQhwplNk05uLVtMh5+KJKEwpsHkHMqtP5yo68gkjZ9w==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
 
-"@abp/jquery-form@~3.3.0":
+"@abp/jquery-form@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.3.0.tgz#43fc5655b4e3cac7c0558fb36dd9ef188fe64412"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.3.1.tgz#4e8c2e50e711a7bbe4f40e74210472b21afd0ecf"
-  integrity sha512-fH4IPf/cU3ojWtVsPZjtymzK0xWqqgmvnSk5zy4AB4MOCKyYtPrn5OAMUvq8A4uZ0mGIRAQ8Z72wPKZA1rws5A==
+  integrity sha512-HBic6SzOSprYAug/Qbgcd+MiPRwtXczS2/x9IUmPFeUhvuqJJoYPWrhI5xC6WKNcJ/5MjExiEbeEXMXp8PwJTA==
   dependencies:
-    "@abp/jquery" "~3.3.0"
+    "@abp/jquery" "~3.3.1"
     jquery-form "^4.3.0"
 
-"@abp/jquery-validation-unobtrusive@~3.3.0":
+"@abp/jquery-validation-unobtrusive@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.3.0.tgz#0840f3114626a1d6efff54f4791776ebfdf56e76"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.3.1.tgz#e42d61a172b6ef5cbdbb305ab5d93e3dad5159a1"
-  integrity sha512-foKM9FDAY2RZGz5EQ2FcQt/FiL8sMc+uwd+2KeAdIejLyPgeSH/lLio6agd2Xun4e/xlBJB185Ga1eKcdHIGAw==
+  integrity sha512-SH8zmrR3HshCNP0zIgi4j6PMhgCzmCKk5xXxD+8kg+LAv+bm1iP0K5srgX4WlEffRma80QIeNKPpe/lW04EgFw==
   dependencies:
-    "@abp/jquery-validation" "~3.3.0"
+    "@abp/jquery-validation" "~3.3.1"
     jquery-validation-unobtrusive "^3.2.11"
 
-"@abp/jquery-validation@~3.3.0":
+"@abp/jquery-validation@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.3.0.tgz#2199968638d7bab9bfb6ba5e9f27d9d607c09a24"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.3.1.tgz#05164e342fdb83f40a17f000b40c27df2604c394"
-  integrity sha512-jxw274hx8i9+dkRrDz7aUpWSGESnJ2wuA6e3IAQIlubFf+7q0o4vosXD5bubinn4qaRGcSiYC15armfefgmFCw==
+  integrity sha512-oKN3wQUY1PB7IhelFIJVjRqAZx/AVlpUF0GV6k/9eNBK+ZoLpW1ebE1q9tsLhXf7QS1N7S45aEHB8OpjRopDew==
   dependencies:
-    "@abp/jquery" "~3.3.0"
+    "@abp/jquery" "~3.3.1"
     jquery-validation "^1.19.2"
 
-"@abp/jquery@~3.3.0":
+"@abp/jquery@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.3.0.tgz#b99a9436bf3c2394917e761a2dcdfe4f1af9ff3d"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.3.1.tgz#2e8431a52641ab85d1372a32518307bbf8fba1a0"
-  integrity sha512-WrjDQCBOi83kjtMYjXCJVWSbnFxKLW/KtDADkjTF7TxIGccsNWx6E8npzdCEnDnlOJ5Rk9+1QIu07pWedOjBSg==
+  integrity sha512-mSAUYLzhJSvq8ixhAFkU5Q2LRDTkJAGHq47alb2nNEodZNr1q1i+875nP3dE/4MLT/foG0H+j+r4RGuYx4fGAA==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     jquery "~3.5.1"
 
-"@abp/lodash@~3.3.0":
+"@abp/lodash@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.3.0.tgz#5402a779ef1e8ecd585644a68607425587560305"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.3.1.tgz#5c2602f03bde7fbf7841c01bb7178b3ca3429d87"
-  integrity sha512-QFm9hpWs0/J5TFFiE7vO5oxTsLgMcibmgg/CxYvmQZXhHGZpx3mdoAzC48CvRu8quxr6Xo8pIxlCyYXniR6/Dw==
+  integrity sha512-5fitYkotzaXGaEbwctVYT4HcfKZ1ghAnvrQLYI+2MYgIQmtipBhXFEG030zIXWThEoIGKOBuwVzmOYtwiX7+8w==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     lodash "^4.17.15"
 
-"@abp/luxon@~3.3.0":
+"@abp/luxon@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.3.0.tgz#2d669786308df997c6738dd205363edaae670d15"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.3.1.tgz#2e477be6a9f76394331399a762552bf610168e8e"
-  integrity sha512-1oSUuzgehSBxaxJLfD06ktXK4jisILPKFnEaKCBuPiKiQSDFvdQbepHAYJcpU1Jye6sVrheUKDUyJhnSwDb+0w==
+  integrity sha512-bp74vBmObbqUXsOc4VRWml5ivEyIzwHLR4oycLvWG0bQZn65yt7db7DVYTQL1PCWbEAKf6eULlnF6JvZpSVgeg==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     luxon "^1.24.1"
 
-"@abp/malihu-custom-scrollbar-plugin@~3.3.0":
+"@abp/malihu-custom-scrollbar-plugin@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.3.0.tgz#3bb48e0d68c0b76f3460eb19706927af2168a6c3"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.3.1.tgz#df833f2b8421f4dce681c13d2d5976680a27e4c8"
-  integrity sha512-44JvJOfxJ5ihfNCPyc5U8D8N8CmLh8UBMkzjH7YJQZJO+7PGgjx+uEqbQhTtBDftUz5C5oFkGoQ7i2pil7YSYQ==
+  integrity sha512-bJRQTevunQulXo+EC1HWqYgV30RVmFcS218DtdZLm2x/xWFBhvr+2DLzLS2Gq8JJXNGQMFbHnCWixn5si4V/KA==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     malihu-custom-scrollbar-plugin "^3.1.5"
 
-"@abp/markdown-it@~3.3.0":
+"@abp/markdown-it@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/markdown-it/-/markdown-it-3.3.0.tgz#91395f9c6f98a69d955b4e5cb534e38c5f4902b9"
+  resolved "https://registry.yarnpkg.com/@abp/markdown-it/-/markdown-it-3.3.1.tgz#efacc89e49f370f9d05eaea639188115e8b5da84"
-  integrity sha512-Awt1SD6zgy72kfEbHVOBbVv/bB0o17lZBg4dNf11jqEbJMUpsW04pE5U1nc7FgsaJuTZFLm36cgnjdeGzlb/yw==
+  integrity sha512-I/UlKUynF8awg7b/hyG4Tr3/yqT/vilD1vStxqsIYHmLaBYRbd6Av+FI2iiUH/DwdPexJGWjq8xmi5nxsC2vlg==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     markdown-it "^11.0.0"
 
-"@abp/owl.carousel@~3.3.0":
+"@abp/owl.carousel@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/owl.carousel/-/owl.carousel-3.3.0.tgz#bc3b721770ac0c41066581d55228eca65fd95b07"
+  resolved "https://registry.yarnpkg.com/@abp/owl.carousel/-/owl.carousel-3.3.1.tgz#246a524459e24f5f506c40ad0e89512f164a83d8"
-  integrity sha512-wKWplt/zupf+q+iYjAEMoHo/Trjf5pPM5a9EhIb+6C1s7d+VJ8+FbxXHXA1F86MF5Eq4HVhuWFJITmEwOTqnMg==
+  integrity sha512-xoQXh+OpHlSOt36lcO1/B2j4WfjWLMB/mn1lx7AxTOPtGNfo9pF06o9Tks5jG3tCvyPvUIuLH3ZXJbmWLvptYw==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     owl.carousel "^2.3.4"
 
-"@abp/prismjs@~3.3.0":
+"@abp/prismjs@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-3.3.0.tgz#88381eb65612c68d13dac02eb7e177a264a025ff"
+  resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-3.3.1.tgz#3abe550b34aa957248f6b1e4543aab990561351e"
-  integrity sha512-YwVmPDtvWq8JwjZ4sGqnR2fhkzlcfhH2qO1RQsv9wpfFe61Mh/3mIC1QKFq5mW52cM3f8I51oC7z9HMbBo8n4A==
+  integrity sha512-4+BHvKDcJa8A3yKccUqyfDgr1eqVMGt9e9ie8HPHOGTG2y1XMAYipZJ22E+T8QvUxaeBBkkmpQ4dyAOpndHJJw==
   dependencies:
-    "@abp/clipboard" "~3.3.0"
+    "@abp/clipboard" "~3.3.1"
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     prismjs "^1.20.0"
 
-"@abp/select2@~3.3.0":
+"@abp/select2@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.3.0.tgz#207460dd128a1620c332af5eea2df88bfdfd0520"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.3.1.tgz#65ac0ae3ac8783d4e0422717ce743d573bf559e4"
-  integrity sha512-dbOnzQVARBQp/ynJvNyJqE1ArtsWCV8nGMUablB1ILPonsJy+0ADJ+GXWa1nIsHdj3zPW0MLi8pdqpepRCTAFg==
+  integrity sha512-efxhM/QxAmnyfGNcokZIK7vD6wYJkFGSnZEDj9QSrZ6DyUYf8H+jlK38JViDGe0RCMqts0R4B6IaKT0RbbIGmw==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     select2 "^4.0.13"
 
-"@abp/sweetalert@~3.3.0":
+"@abp/sweetalert@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.3.0.tgz#457a05af37819fc54082254022551ed0233c471e"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.3.1.tgz#b6a41f8459d4407c4aee04e2f200b84e3fa8d534"
-  integrity sha512-6KXwPVC1zwNwlZBS9x0uPLTmieu3nmBp0G+ZH1aP+GTMphSa0ejI7nuPFqUeqfEMg+an1yj51SKKUfKtmlx6Zg==
+  integrity sha512-olDU9Lh5o0sNCxRXROwt8QhHpuB5+fjojVWVUOiag0UMLVA9k/fp38diyn64qddSHWCafpqjeO32IXDKEQckZA==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     sweetalert "^2.1.2"
 
-"@abp/timeago@~3.3.0":
+"@abp/timeago@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.3.0.tgz#f0da23577630cec21255fc9c71dd2f7a3a3a3388"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.3.1.tgz#9759e09728fea082d28cd430cdc1af5b93f14720"
-  integrity sha512-f5sb4vxgGPyIzTj6lxDzUx/qJiC8pAqWPasdxHDMzhKlkRuFWO+GfblR5DC/sj9fQPcyV8+yX/VQPY3JW8i62Q==
+  integrity sha512-sIgSj3hZBl+oyO6rHc55YrIfqb4d2d2RlT6HU+OIsa2/BUAjTcW6WdPVUjXTreth2jyxEjXkfOKA3Sv5DvraGg==
   dependencies:
-    "@abp/jquery" "~3.3.0"
+    "@abp/jquery" "~3.3.1"
     timeago "^1.6.7"
 
-"@abp/toastr@~3.3.0":
+"@abp/toastr@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.3.0.tgz#c4f7d761eb4d93e993cb8e8cb54a0d670b20bdd3"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.3.1.tgz#06cf0b46e6430fae516aaff8707a5f5b16d6ed1d"
-  integrity sha512-GGqtVUCX8WalpkCnhiYUs+XxxBnhxGOLe87qFe/2tr0XNDJ3BSHXxiKynDetjlNAq/Qnf4U5P4Eg9FnHWFdWZg==
+  integrity sha512-LTf2NGwcG9ke571HMO7N4syhJijagnw/eIDl6ezflIQI/BnQqBKpXJ8xckCCqgryxfraBu4APMuSkPoDs2Ce5g==
   dependencies:
-    "@abp/jquery" "~3.3.0"
+    "@abp/jquery" "~3.3.1"
     toastr "^2.1.4"
 
-"@abp/tui-editor@~3.3.0":
+"@abp/tui-editor@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-3.3.0.tgz#3d8333df7e9bb4972c9fb4bba89b2f8f2aa905d0"
+  resolved "https://registry.yarnpkg.com/@abp/tui-editor/-/tui-editor-3.3.1.tgz#c1aa4891d0aba055dbaed05947c4c9e0a94cdd36"
-  integrity sha512-AwQO3D/WtrqytVOFcaQpHf3GcEThJ8+UvL9h382tb5rVbmKVkxCemRPkLF7wS1RVCJwPoZYFPXp6VNWY3nZTiw==
+  integrity sha512-dpuJ8YPmdpostILYizPIRJx1B7utBJl+P7L80Hy0ACXcXdc9HuRPe1vLoRMQ/OKfI9nLF9AbjmCEXy3h7JXYbw==
   dependencies:
-    "@abp/codemirror" "~3.3.0"
+    "@abp/codemirror" "~3.3.1"
-    "@abp/highlight.js" "~3.3.0"
+    "@abp/highlight.js" "~3.3.1"
-    "@abp/jquery" "~3.3.0"
+    "@abp/jquery" "~3.3.1"
-    "@abp/markdown-it" "~3.3.0"
+    "@abp/markdown-it" "~3.3.1"
     tui-editor "^1.4.10"
 
-"@abp/utils@^3.3.0":
+"@abp/utils@^3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.3.0.tgz#44ccacf4c415227e94981d907017de1c6f7225bb"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.3.1.tgz#f1759161ac8af10e57b50ac90538a24a51b64ebd"
-  integrity sha512-/JIcygVJu/Ob1G5IicL2XgOVjIIePC2t3QzgEbwaq6NDGMHiOm2quyS8Lj7TfjBeUFTJhCFEbXJMq0lGQ+KMww==
+  integrity sha512-XEYJYp94zDdln48P7X51wa4v1yg3Q+p0o2DdZxQbZxXChRkCwVC/B0uyMGPs75wkft6xiz965Xr7vcNvMo0nOA==
   dependencies:
     just-compare "^1.3.0"
 

modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json

@@ -3,6 +3,6 @@
   "name": "client-simulation-web",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.3.0"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.3.1"
   }
 }

modules/client-simulation/demo/Volo.ClientSimulation.Demo/yarn.lock

@@ -2,37 +2,37 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.basic@^3.3.0":
+"@abp/aspnetcore.mvc.ui.theme.basic@^3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.3.0.tgz#5a83ad1010ede0647cc4bbe225f0ebf8f3ac90d8"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.3.1.tgz#58ae88355b821ca72eccf1950bde544b8f0edcca"
-  integrity sha512-b0Z/CO7nLixuceC2A/rx4m6OQPwe7ELym+ZZdurUxI42ciuoC5Cnnl3FH+HCt8P3JdFjOIWl2wOXvUcc6P16oQ==
+  integrity sha512-AUIJQIBb+5of0Na1cxmyacni6ToYBpmtU+NJH9/cTC3UUAPylj8TiAX9yobAPn8dbrcXTm+dh9T8i49rXTtxoA==
-  dependencies:
+  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.3.0"
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.3.1"
-
+
-"@abp/aspnetcore.mvc.ui.theme.shared@~3.3.0":
+"@abp/aspnetcore.mvc.ui.theme.shared@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.3.0.tgz#6c998bad95e46905e5a1487ab2370905cdf4376a"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.3.1.tgz#c3123ea8f6c8428d034d9ac2782aa1bff27bd740"
-  integrity sha512-Tt6SK3EUj8jfZKSzeIVkRuWyAGRoDTqeoS5VVkNZLoIfLzwiimHw2o2AlPRtCMa0jqLropHtaT/kNl+EU24AZw==
+  integrity sha512-j2uZapDTKSjH74uZcIR4y09hr6w+OAdybQhL1bx4fb0D3XlmOdOwRrsqXieJNwAggbUn00EX2Usiey3N/wV1rA==
-  dependencies:
+  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~3.3.0"
+    "@abp/aspnetcore.mvc.ui" "~3.3.1"
-    "@abp/bootstrap" "~3.3.0"
+    "@abp/bootstrap" "~3.3.1"
-    "@abp/bootstrap-datepicker" "~3.3.0"
+    "@abp/bootstrap-datepicker" "~3.3.1"
-    "@abp/datatables.net-bs4" "~3.3.0"
+    "@abp/datatables.net-bs4" "~3.3.1"
-    "@abp/font-awesome" "~3.3.0"
+    "@abp/font-awesome" "~3.3.1"
-    "@abp/jquery-form" "~3.3.0"
+    "@abp/jquery-form" "~3.3.1"
-    "@abp/jquery-validation-unobtrusive" "~3.3.0"
+    "@abp/jquery-validation-unobtrusive" "~3.3.1"
-    "@abp/lodash" "~3.3.0"
+    "@abp/lodash" "~3.3.1"
-    "@abp/luxon" "~3.3.0"
+    "@abp/luxon" "~3.3.1"
-    "@abp/malihu-custom-scrollbar-plugin" "~3.3.0"
+    "@abp/malihu-custom-scrollbar-plugin" "~3.3.1"
-    "@abp/select2" "~3.3.0"
+    "@abp/select2" "~3.3.1"
-    "@abp/sweetalert" "~3.3.0"
+    "@abp/sweetalert" "~3.3.1"
-    "@abp/timeago" "~3.3.0"
+    "@abp/timeago" "~3.3.1"
-    "@abp/toastr" "~3.3.0"
+    "@abp/toastr" "~3.3.1"
-
+
-"@abp/aspnetcore.mvc.ui@~3.3.0":
+"@abp/aspnetcore.mvc.ui@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.3.0.tgz#07f7d0f7f689a3ac75a69e12681ebd3d08fa0644"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.3.1.tgz#946d5fb68d73842270e2553fba475163d2ca57a5"
-  integrity sha512-EbUISgnR8qHYdu/tSro8QjUWj17M6gOkugMI7N0fiPNbtLHgKG2GHWxIsVEf5ic1O2j/PWKOQ+FPBLZ4v3jFrw==
+  integrity sha512-W/Yxe20Upkha0XaHPQwQ3+LxdUZI21BiARcbBUnIUzRUrFBpvjD0A9/T8bsi+KpIqOYLAwtrE1TJoSuZGscoIw==
   dependencies:
     ansi-colors "^4.1.1"
     extend-object "^1.0.0"
@@ -41,145 +41,145 @@
     path "^0.12.7"
     rimraf "^3.0.2"
 
-"@abp/bootstrap-datepicker@~3.3.0":
+"@abp/bootstrap-datepicker@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.3.0.tgz#d7d11e591818a6ec654127d88602cfdfddf81b1f"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.3.1.tgz#c0f5763e0bfb1e293ef1b22f2a14014ec345dbc3"
-  integrity sha512-PUsS48o5Cwufn8O8d34UBsjLF6/HrgdhsGTUzrVIhGapiyuYD/QrvqWYWRUj1Jeeb4nrsRVem2DnM1isy+CUCA==
+  integrity sha512-MnX2vI75gEDtlwnKhI6ptH657dh5TuXoin1XeaEhOa5rGbLwhSu4IFqRmlLBedFBOf+1zwcvFs30vsQlNKJ6Nw==
   dependencies:
     bootstrap-datepicker "^1.9.0"
 
-"@abp/bootstrap@~3.3.0":
+"@abp/bootstrap@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.3.0.tgz#1314549e7a940c58fdff521a9ddf153f3414fffa"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.3.1.tgz#5b173918511b6ad1fb8ac570ea2e2fcb874970e0"
-  integrity sha512-CVjSwbZPjio0VJWxdo+PRkvUYGtv51DgVrqjgHK7m7tGFwHAK38cDHAl+mqmIp7dgPG1Z+E0o41JteT3Za1Bkw==
+  integrity sha512-CfnwXAV2XRK3gYpeEQjgVzEocU6pqdGZXwATwOKifHWBZNG8ubDyMgBed+oVCvJgRvLRrniR5jFK2vhm8Du+EQ==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     bootstrap "^4.5.0"
     bootstrap-v4-rtl "4.4.1-2"
 
-"@abp/core@~3.3.0":
+"@abp/core@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.3.0.tgz#c88c28df19f96349b9a32b7ebe402e6d267c34e5"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.3.1.tgz#b1da2160b0fc4a309dc4a65ee937c814de16b2de"
-  integrity sha512-y9P86zPAm55fAyKwDaoxv+IrApA339aaGEpN9364upeeNBsO8mYf9hoM136VovQaWNIABFHRD7R+9KskwPAuNA==
+  integrity sha512-6/6FHTLZrWh821O6xr4Sk1BlIt9gTAT19NnykQRV9U8S7rl4BQv2QF055R8Wg3lnVKWJ1ajiAbd3gerjH/pL6g==
   dependencies:
-    "@abp/utils" "^3.3.0"
+    "@abp/utils" "^3.3.1"
 
-"@abp/datatables.net-bs4@~3.3.0":
+"@abp/datatables.net-bs4@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.3.0.tgz#e4cc85f3c1c195d9e8b07532eb7c53619f40a787"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.3.1.tgz#fd0f5f5579ff94d635d19c1bf46ac0593639e3f4"
-  integrity sha512-StuwT8jGfDWGNXmYgRELuErXxSE+qjVoiSAkd27mZqDbYSTipq4OZSAHr6WNmoqMgP6QlCgjGgXcz4Pr8Pxuaw==
+  integrity sha512-C9BUlbsk9liJ+hmFpTKoearJNZISDy5TInTbnixL8WfXfIaAWdZRs+ADvhKO9+oWMxkbxhGI8ueYQ29Z1UJzMg==
   dependencies:
-    "@abp/datatables.net" "~3.3.0"
+    "@abp/datatables.net" "~3.3.1"
     datatables.net-bs4 "^1.10.21"
 
-"@abp/datatables.net@~3.3.0":
+"@abp/datatables.net@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.3.0.tgz#a2b2cedc06beb325e62ce6faba899c935564b9a7"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.3.1.tgz#2ec7406712607f08f0ae9a6ce0ee7bfd0cc73278"
-  integrity sha512-y0RGrLxI7VgWFAFtHAraDnrEJ5pkUIJ3zxEScS43RUbArhxk+5pIpxQbmU0WgHpk72H7WXdqtL486Kw8PSj1Nw==
+  integrity sha512-prsMkh//XCymCG/aYEEtzV/922RJIZ0+PcnRvhJzXvrX4DK2y3ZWM44QNR/9/rpkYUJqRcVoHqbt1DuxbHDLXQ==
   dependencies:
-    "@abp/jquery" "~3.3.0"
+    "@abp/jquery" "~3.3.1"
     datatables.net "^1.10.21"
 
-"@abp/font-awesome@~3.3.0":
+"@abp/font-awesome@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.3.0.tgz#f9307334c34309456c47cc407fbe079821ace45e"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.3.1.tgz#268a21685a6b810b15848169b78c3dfb11d582c6"
-  integrity sha512-7/uZ2qXooHQZG35F6ERKsjI8m0gn8/BgE2cOB7Zhu5KRtSTOHOOXX4YWEfoHYLEMuo3xKTTJ2gHM3jiCJEpVtg==
+  integrity sha512-Eg2dwtcsyLo5E6PC21vK5R8YFe32UFSN4DpNrqAP9I85daR8ZbT0US8SbfCcI5nhiZlRi3EWj/cUgz2IEJHaaQ==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     "@fortawesome/fontawesome-free" "^5.13.0"
 
-"@abp/jquery-form@~3.3.0":
+"@abp/jquery-form@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.3.0.tgz#43fc5655b4e3cac7c0558fb36dd9ef188fe64412"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.3.1.tgz#4e8c2e50e711a7bbe4f40e74210472b21afd0ecf"
-  integrity sha512-fH4IPf/cU3ojWtVsPZjtymzK0xWqqgmvnSk5zy4AB4MOCKyYtPrn5OAMUvq8A4uZ0mGIRAQ8Z72wPKZA1rws5A==
+  integrity sha512-HBic6SzOSprYAug/Qbgcd+MiPRwtXczS2/x9IUmPFeUhvuqJJoYPWrhI5xC6WKNcJ/5MjExiEbeEXMXp8PwJTA==
   dependencies:
-    "@abp/jquery" "~3.3.0"
+    "@abp/jquery" "~3.3.1"
     jquery-form "^4.3.0"
 
-"@abp/jquery-validation-unobtrusive@~3.3.0":
+"@abp/jquery-validation-unobtrusive@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.3.0.tgz#0840f3114626a1d6efff54f4791776ebfdf56e76"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.3.1.tgz#e42d61a172b6ef5cbdbb305ab5d93e3dad5159a1"
-  integrity sha512-foKM9FDAY2RZGz5EQ2FcQt/FiL8sMc+uwd+2KeAdIejLyPgeSH/lLio6agd2Xun4e/xlBJB185Ga1eKcdHIGAw==
+  integrity sha512-SH8zmrR3HshCNP0zIgi4j6PMhgCzmCKk5xXxD+8kg+LAv+bm1iP0K5srgX4WlEffRma80QIeNKPpe/lW04EgFw==
   dependencies:
-    "@abp/jquery-validation" "~3.3.0"
+    "@abp/jquery-validation" "~3.3.1"
     jquery-validation-unobtrusive "^3.2.11"
 
-"@abp/jquery-validation@~3.3.0":
+"@abp/jquery-validation@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.3.0.tgz#2199968638d7bab9bfb6ba5e9f27d9d607c09a24"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.3.1.tgz#05164e342fdb83f40a17f000b40c27df2604c394"
-  integrity sha512-jxw274hx8i9+dkRrDz7aUpWSGESnJ2wuA6e3IAQIlubFf+7q0o4vosXD5bubinn4qaRGcSiYC15armfefgmFCw==
+  integrity sha512-oKN3wQUY1PB7IhelFIJVjRqAZx/AVlpUF0GV6k/9eNBK+ZoLpW1ebE1q9tsLhXf7QS1N7S45aEHB8OpjRopDew==
   dependencies:
-    "@abp/jquery" "~3.3.0"
+    "@abp/jquery" "~3.3.1"
     jquery-validation "^1.19.2"
 
-"@abp/jquery@~3.3.0":
+"@abp/jquery@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.3.0.tgz#b99a9436bf3c2394917e761a2dcdfe4f1af9ff3d"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.3.1.tgz#2e8431a52641ab85d1372a32518307bbf8fba1a0"
-  integrity sha512-WrjDQCBOi83kjtMYjXCJVWSbnFxKLW/KtDADkjTF7TxIGccsNWx6E8npzdCEnDnlOJ5Rk9+1QIu07pWedOjBSg==
+  integrity sha512-mSAUYLzhJSvq8ixhAFkU5Q2LRDTkJAGHq47alb2nNEodZNr1q1i+875nP3dE/4MLT/foG0H+j+r4RGuYx4fGAA==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     jquery "~3.5.1"
 
-"@abp/lodash@~3.3.0":
+"@abp/lodash@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.3.0.tgz#5402a779ef1e8ecd585644a68607425587560305"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.3.1.tgz#5c2602f03bde7fbf7841c01bb7178b3ca3429d87"
-  integrity sha512-QFm9hpWs0/J5TFFiE7vO5oxTsLgMcibmgg/CxYvmQZXhHGZpx3mdoAzC48CvRu8quxr6Xo8pIxlCyYXniR6/Dw==
+  integrity sha512-5fitYkotzaXGaEbwctVYT4HcfKZ1ghAnvrQLYI+2MYgIQmtipBhXFEG030zIXWThEoIGKOBuwVzmOYtwiX7+8w==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     lodash "^4.17.15"
 
-"@abp/luxon@~3.3.0":
+"@abp/luxon@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.3.0.tgz#2d669786308df997c6738dd205363edaae670d15"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.3.1.tgz#2e477be6a9f76394331399a762552bf610168e8e"
-  integrity sha512-1oSUuzgehSBxaxJLfD06ktXK4jisILPKFnEaKCBuPiKiQSDFvdQbepHAYJcpU1Jye6sVrheUKDUyJhnSwDb+0w==
+  integrity sha512-bp74vBmObbqUXsOc4VRWml5ivEyIzwHLR4oycLvWG0bQZn65yt7db7DVYTQL1PCWbEAKf6eULlnF6JvZpSVgeg==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     luxon "^1.24.1"
 
-"@abp/malihu-custom-scrollbar-plugin@~3.3.0":
+"@abp/malihu-custom-scrollbar-plugin@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.3.0.tgz#3bb48e0d68c0b76f3460eb19706927af2168a6c3"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.3.1.tgz#df833f2b8421f4dce681c13d2d5976680a27e4c8"
-  integrity sha512-44JvJOfxJ5ihfNCPyc5U8D8N8CmLh8UBMkzjH7YJQZJO+7PGgjx+uEqbQhTtBDftUz5C5oFkGoQ7i2pil7YSYQ==
+  integrity sha512-bJRQTevunQulXo+EC1HWqYgV30RVmFcS218DtdZLm2x/xWFBhvr+2DLzLS2Gq8JJXNGQMFbHnCWixn5si4V/KA==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     malihu-custom-scrollbar-plugin "^3.1.5"
 
-"@abp/select2@~3.3.0":
+"@abp/select2@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.3.0.tgz#207460dd128a1620c332af5eea2df88bfdfd0520"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.3.1.tgz#65ac0ae3ac8783d4e0422717ce743d573bf559e4"
-  integrity sha512-dbOnzQVARBQp/ynJvNyJqE1ArtsWCV8nGMUablB1ILPonsJy+0ADJ+GXWa1nIsHdj3zPW0MLi8pdqpepRCTAFg==
+  integrity sha512-efxhM/QxAmnyfGNcokZIK7vD6wYJkFGSnZEDj9QSrZ6DyUYf8H+jlK38JViDGe0RCMqts0R4B6IaKT0RbbIGmw==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     select2 "^4.0.13"
 
-"@abp/sweetalert@~3.3.0":
+"@abp/sweetalert@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.3.0.tgz#457a05af37819fc54082254022551ed0233c471e"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.3.1.tgz#b6a41f8459d4407c4aee04e2f200b84e3fa8d534"
-  integrity sha512-6KXwPVC1zwNwlZBS9x0uPLTmieu3nmBp0G+ZH1aP+GTMphSa0ejI7nuPFqUeqfEMg+an1yj51SKKUfKtmlx6Zg==
+  integrity sha512-olDU9Lh5o0sNCxRXROwt8QhHpuB5+fjojVWVUOiag0UMLVA9k/fp38diyn64qddSHWCafpqjeO32IXDKEQckZA==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     sweetalert "^2.1.2"
 
-"@abp/timeago@~3.3.0":
+"@abp/timeago@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.3.0.tgz#f0da23577630cec21255fc9c71dd2f7a3a3a3388"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.3.1.tgz#9759e09728fea082d28cd430cdc1af5b93f14720"
-  integrity sha512-f5sb4vxgGPyIzTj6lxDzUx/qJiC8pAqWPasdxHDMzhKlkRuFWO+GfblR5DC/sj9fQPcyV8+yX/VQPY3JW8i62Q==
+  integrity sha512-sIgSj3hZBl+oyO6rHc55YrIfqb4d2d2RlT6HU+OIsa2/BUAjTcW6WdPVUjXTreth2jyxEjXkfOKA3Sv5DvraGg==
   dependencies:
-    "@abp/jquery" "~3.3.0"
+    "@abp/jquery" "~3.3.1"
     timeago "^1.6.7"
 
-"@abp/toastr@~3.3.0":
+"@abp/toastr@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.3.0.tgz#c4f7d761eb4d93e993cb8e8cb54a0d670b20bdd3"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.3.1.tgz#06cf0b46e6430fae516aaff8707a5f5b16d6ed1d"
-  integrity sha512-GGqtVUCX8WalpkCnhiYUs+XxxBnhxGOLe87qFe/2tr0XNDJ3BSHXxiKynDetjlNAq/Qnf4U5P4Eg9FnHWFdWZg==
+  integrity sha512-LTf2NGwcG9ke571HMO7N4syhJijagnw/eIDl6ezflIQI/BnQqBKpXJ8xckCCqgryxfraBu4APMuSkPoDs2Ce5g==
   dependencies:
-    "@abp/jquery" "~3.3.0"
+    "@abp/jquery" "~3.3.1"
     toastr "^2.1.4"
 
-"@abp/utils@^3.3.0":
+"@abp/utils@^3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.3.0.tgz#44ccacf4c415227e94981d907017de1c6f7225bb"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.3.1.tgz#f1759161ac8af10e57b50ac90538a24a51b64ebd"
-  integrity sha512-/JIcygVJu/Ob1G5IicL2XgOVjIIePC2t3QzgEbwaq6NDGMHiOm2quyS8Lj7TfjBeUFTJhCFEbXJMq0lGQ+KMww==
+  integrity sha512-XEYJYp94zDdln48P7X51wa4v1yg3Q+p0o2DdZxQbZxXChRkCwVC/B0uyMGPs75wkft6xiz965Xr7vcNvMo0nOA==
   dependencies:
     just-compare "^1.3.0"
 

modules/cms-kit/angular/package.json

@@ -15,11 +15,11 @@
   },
   "private": true,
   "dependencies": {
-    "@abp/ng.account": "~3.3.0",
+    "@abp/ng.account": "~3.3.1",
-    "@abp/ng.identity": "~3.3.0",
+    "@abp/ng.identity": "~3.3.1",
-    "@abp/ng.setting-management": "~3.3.0",
+    "@abp/ng.setting-management": "~3.3.1",
-    "@abp/ng.tenant-management": "~3.3.0",
+    "@abp/ng.tenant-management": "~3.3.1",
-    "@abp/ng.theme.basic": "~3.3.0",
+    "@abp/ng.theme.basic": "~3.3.1",
     "@angular/animations": "~10.0.0",
     "@angular/common": "~10.0.0",
     "@angular/compiler": "~10.0.0",

modules/cms-kit/angular/projects/cms-kit/package.json

@@ -4,8 +4,8 @@
   "peerDependencies": {
     "@angular/common": "^9.1.11",
     "@angular/core": "^9.1.11",
-    "@abp/ng.core": ">=3.3.0",
+    "@abp/ng.core": ">=3.3.1",
-    "@abp/ng.theme.shared": ">=3.3.0"
+    "@abp/ng.theme.shared": ">=3.3.1"
   },
   "dependencies": {
     "tslib": "^2.0.0"

modules/cms-kit/host/Volo.CmsKit.IdentityServer/package.json

@@ -3,6 +3,6 @@
   "name": "my-app-identityserver",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.3.0"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.3.1"
   }
 }

modules/cms-kit/host/Volo.CmsKit.IdentityServer/yarn.lock

@@ -2,37 +2,37 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.basic@^3.3.0":
+"@abp/aspnetcore.mvc.ui.theme.basic@^3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.3.0.tgz#5a83ad1010ede0647cc4bbe225f0ebf8f3ac90d8"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.3.1.tgz#58ae88355b821ca72eccf1950bde544b8f0edcca"
-  integrity sha512-b0Z/CO7nLixuceC2A/rx4m6OQPwe7ELym+ZZdurUxI42ciuoC5Cnnl3FH+HCt8P3JdFjOIWl2wOXvUcc6P16oQ==
+  integrity sha512-AUIJQIBb+5of0Na1cxmyacni6ToYBpmtU+NJH9/cTC3UUAPylj8TiAX9yobAPn8dbrcXTm+dh9T8i49rXTtxoA==
-  dependencies:
+  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.3.0"
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.3.1"
-
+
-"@abp/aspnetcore.mvc.ui.theme.shared@~3.3.0":
+"@abp/aspnetcore.mvc.ui.theme.shared@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.3.0.tgz#6c998bad95e46905e5a1487ab2370905cdf4376a"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.3.1.tgz#c3123ea8f6c8428d034d9ac2782aa1bff27bd740"
-  integrity sha512-Tt6SK3EUj8jfZKSzeIVkRuWyAGRoDTqeoS5VVkNZLoIfLzwiimHw2o2AlPRtCMa0jqLropHtaT/kNl+EU24AZw==
+  integrity sha512-j2uZapDTKSjH74uZcIR4y09hr6w+OAdybQhL1bx4fb0D3XlmOdOwRrsqXieJNwAggbUn00EX2Usiey3N/wV1rA==
-  dependencies:
+  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~3.3.0"
+    "@abp/aspnetcore.mvc.ui" "~3.3.1"
-    "@abp/bootstrap" "~3.3.0"
+    "@abp/bootstrap" "~3.3.1"
-    "@abp/bootstrap-datepicker" "~3.3.0"
+    "@abp/bootstrap-datepicker" "~3.3.1"
-    "@abp/datatables.net-bs4" "~3.3.0"
+    "@abp/datatables.net-bs4" "~3.3.1"
-    "@abp/font-awesome" "~3.3.0"
+    "@abp/font-awesome" "~3.3.1"
-    "@abp/jquery-form" "~3.3.0"
+    "@abp/jquery-form" "~3.3.1"
-    "@abp/jquery-validation-unobtrusive" "~3.3.0"
+    "@abp/jquery-validation-unobtrusive" "~3.3.1"
-    "@abp/lodash" "~3.3.0"
+    "@abp/lodash" "~3.3.1"
-    "@abp/luxon" "~3.3.0"
+    "@abp/luxon" "~3.3.1"
-    "@abp/malihu-custom-scrollbar-plugin" "~3.3.0"
+    "@abp/malihu-custom-scrollbar-plugin" "~3.3.1"
-    "@abp/select2" "~3.3.0"
+    "@abp/select2" "~3.3.1"
-    "@abp/sweetalert" "~3.3.0"
+    "@abp/sweetalert" "~3.3.1"
-    "@abp/timeago" "~3.3.0"
+    "@abp/timeago" "~3.3.1"
-    "@abp/toastr" "~3.3.0"
+    "@abp/toastr" "~3.3.1"
-
+
-"@abp/aspnetcore.mvc.ui@~3.3.0":
+"@abp/aspnetcore.mvc.ui@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.3.0.tgz#07f7d0f7f689a3ac75a69e12681ebd3d08fa0644"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.3.1.tgz#946d5fb68d73842270e2553fba475163d2ca57a5"
-  integrity sha512-EbUISgnR8qHYdu/tSro8QjUWj17M6gOkugMI7N0fiPNbtLHgKG2GHWxIsVEf5ic1O2j/PWKOQ+FPBLZ4v3jFrw==
+  integrity sha512-W/Yxe20Upkha0XaHPQwQ3+LxdUZI21BiARcbBUnIUzRUrFBpvjD0A9/T8bsi+KpIqOYLAwtrE1TJoSuZGscoIw==
   dependencies:
     ansi-colors "^4.1.1"
     extend-object "^1.0.0"
@@ -41,145 +41,145 @@
     path "^0.12.7"
     rimraf "^3.0.2"
 
-"@abp/bootstrap-datepicker@~3.3.0":
+"@abp/bootstrap-datepicker@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.3.0.tgz#d7d11e591818a6ec654127d88602cfdfddf81b1f"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.3.1.tgz#c0f5763e0bfb1e293ef1b22f2a14014ec345dbc3"
-  integrity sha512-PUsS48o5Cwufn8O8d34UBsjLF6/HrgdhsGTUzrVIhGapiyuYD/QrvqWYWRUj1Jeeb4nrsRVem2DnM1isy+CUCA==
+  integrity sha512-MnX2vI75gEDtlwnKhI6ptH657dh5TuXoin1XeaEhOa5rGbLwhSu4IFqRmlLBedFBOf+1zwcvFs30vsQlNKJ6Nw==
   dependencies:
     bootstrap-datepicker "^1.9.0"
 
-"@abp/bootstrap@~3.3.0":
+"@abp/bootstrap@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.3.0.tgz#1314549e7a940c58fdff521a9ddf153f3414fffa"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.3.1.tgz#5b173918511b6ad1fb8ac570ea2e2fcb874970e0"
-  integrity sha512-CVjSwbZPjio0VJWxdo+PRkvUYGtv51DgVrqjgHK7m7tGFwHAK38cDHAl+mqmIp7dgPG1Z+E0o41JteT3Za1Bkw==
+  integrity sha512-CfnwXAV2XRK3gYpeEQjgVzEocU6pqdGZXwATwOKifHWBZNG8ubDyMgBed+oVCvJgRvLRrniR5jFK2vhm8Du+EQ==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     bootstrap "^4.5.0"
     bootstrap-v4-rtl "4.4.1-2"
 
-"@abp/core@~3.3.0":
+"@abp/core@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.3.0.tgz#c88c28df19f96349b9a32b7ebe402e6d267c34e5"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.3.1.tgz#b1da2160b0fc4a309dc4a65ee937c814de16b2de"
-  integrity sha512-y9P86zPAm55fAyKwDaoxv+IrApA339aaGEpN9364upeeNBsO8mYf9hoM136VovQaWNIABFHRD7R+9KskwPAuNA==
+  integrity sha512-6/6FHTLZrWh821O6xr4Sk1BlIt9gTAT19NnykQRV9U8S7rl4BQv2QF055R8Wg3lnVKWJ1ajiAbd3gerjH/pL6g==
   dependencies:
-    "@abp/utils" "^3.3.0"
+    "@abp/utils" "^3.3.1"
 
-"@abp/datatables.net-bs4@~3.3.0":
+"@abp/datatables.net-bs4@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.3.0.tgz#e4cc85f3c1c195d9e8b07532eb7c53619f40a787"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.3.1.tgz#fd0f5f5579ff94d635d19c1bf46ac0593639e3f4"
-  integrity sha512-StuwT8jGfDWGNXmYgRELuErXxSE+qjVoiSAkd27mZqDbYSTipq4OZSAHr6WNmoqMgP6QlCgjGgXcz4Pr8Pxuaw==
+  integrity sha512-C9BUlbsk9liJ+hmFpTKoearJNZISDy5TInTbnixL8WfXfIaAWdZRs+ADvhKO9+oWMxkbxhGI8ueYQ29Z1UJzMg==
   dependencies:
-    "@abp/datatables.net" "~3.3.0"
+    "@abp/datatables.net" "~3.3.1"
     datatables.net-bs4 "^1.10.21"
 
-"@abp/datatables.net@~3.3.0":
+"@abp/datatables.net@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.3.0.tgz#a2b2cedc06beb325e62ce6faba899c935564b9a7"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.3.1.tgz#2ec7406712607f08f0ae9a6ce0ee7bfd0cc73278"
-  integrity sha512-y0RGrLxI7VgWFAFtHAraDnrEJ5pkUIJ3zxEScS43RUbArhxk+5pIpxQbmU0WgHpk72H7WXdqtL486Kw8PSj1Nw==
+  integrity sha512-prsMkh//XCymCG/aYEEtzV/922RJIZ0+PcnRvhJzXvrX4DK2y3ZWM44QNR/9/rpkYUJqRcVoHqbt1DuxbHDLXQ==
   dependencies:
-    "@abp/jquery" "~3.3.0"
+    "@abp/jquery" "~3.3.1"
     datatables.net "^1.10.21"
 
-"@abp/font-awesome@~3.3.0":
+"@abp/font-awesome@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.3.0.tgz#f9307334c34309456c47cc407fbe079821ace45e"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.3.1.tgz#268a21685a6b810b15848169b78c3dfb11d582c6"
-  integrity sha512-7/uZ2qXooHQZG35F6ERKsjI8m0gn8/BgE2cOB7Zhu5KRtSTOHOOXX4YWEfoHYLEMuo3xKTTJ2gHM3jiCJEpVtg==
+  integrity sha512-Eg2dwtcsyLo5E6PC21vK5R8YFe32UFSN4DpNrqAP9I85daR8ZbT0US8SbfCcI5nhiZlRi3EWj/cUgz2IEJHaaQ==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     "@fortawesome/fontawesome-free" "^5.13.0"
 
-"@abp/jquery-form@~3.3.0":
+"@abp/jquery-form@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.3.0.tgz#43fc5655b4e3cac7c0558fb36dd9ef188fe64412"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.3.1.tgz#4e8c2e50e711a7bbe4f40e74210472b21afd0ecf"
-  integrity sha512-fH4IPf/cU3ojWtVsPZjtymzK0xWqqgmvnSk5zy4AB4MOCKyYtPrn5OAMUvq8A4uZ0mGIRAQ8Z72wPKZA1rws5A==
+  integrity sha512-HBic6SzOSprYAug/Qbgcd+MiPRwtXczS2/x9IUmPFeUhvuqJJoYPWrhI5xC6WKNcJ/5MjExiEbeEXMXp8PwJTA==
   dependencies:
-    "@abp/jquery" "~3.3.0"
+    "@abp/jquery" "~3.3.1"
     jquery-form "^4.3.0"
 
-"@abp/jquery-validation-unobtrusive@~3.3.0":
+"@abp/jquery-validation-unobtrusive@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.3.0.tgz#0840f3114626a1d6efff54f4791776ebfdf56e76"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.3.1.tgz#e42d61a172b6ef5cbdbb305ab5d93e3dad5159a1"
-  integrity sha512-foKM9FDAY2RZGz5EQ2FcQt/FiL8sMc+uwd+2KeAdIejLyPgeSH/lLio6agd2Xun4e/xlBJB185Ga1eKcdHIGAw==
+  integrity sha512-SH8zmrR3HshCNP0zIgi4j6PMhgCzmCKk5xXxD+8kg+LAv+bm1iP0K5srgX4WlEffRma80QIeNKPpe/lW04EgFw==
   dependencies:
-    "@abp/jquery-validation" "~3.3.0"
+    "@abp/jquery-validation" "~3.3.1"
     jquery-validation-unobtrusive "^3.2.11"
 
-"@abp/jquery-validation@~3.3.0":
+"@abp/jquery-validation@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.3.0.tgz#2199968638d7bab9bfb6ba5e9f27d9d607c09a24"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.3.1.tgz#05164e342fdb83f40a17f000b40c27df2604c394"
-  integrity sha512-jxw274hx8i9+dkRrDz7aUpWSGESnJ2wuA6e3IAQIlubFf+7q0o4vosXD5bubinn4qaRGcSiYC15armfefgmFCw==
+  integrity sha512-oKN3wQUY1PB7IhelFIJVjRqAZx/AVlpUF0GV6k/9eNBK+ZoLpW1ebE1q9tsLhXf7QS1N7S45aEHB8OpjRopDew==
   dependencies:
-    "@abp/jquery" "~3.3.0"
+    "@abp/jquery" "~3.3.1"
     jquery-validation "^1.19.2"
 
-"@abp/jquery@~3.3.0":
+"@abp/jquery@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.3.0.tgz#b99a9436bf3c2394917e761a2dcdfe4f1af9ff3d"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.3.1.tgz#2e8431a52641ab85d1372a32518307bbf8fba1a0"
-  integrity sha512-WrjDQCBOi83kjtMYjXCJVWSbnFxKLW/KtDADkjTF7TxIGccsNWx6E8npzdCEnDnlOJ5Rk9+1QIu07pWedOjBSg==
+  integrity sha512-mSAUYLzhJSvq8ixhAFkU5Q2LRDTkJAGHq47alb2nNEodZNr1q1i+875nP3dE/4MLT/foG0H+j+r4RGuYx4fGAA==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     jquery "~3.5.1"
 
-"@abp/lodash@~3.3.0":
+"@abp/lodash@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.3.0.tgz#5402a779ef1e8ecd585644a68607425587560305"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.3.1.tgz#5c2602f03bde7fbf7841c01bb7178b3ca3429d87"
-  integrity sha512-QFm9hpWs0/J5TFFiE7vO5oxTsLgMcibmgg/CxYvmQZXhHGZpx3mdoAzC48CvRu8quxr6Xo8pIxlCyYXniR6/Dw==
+  integrity sha512-5fitYkotzaXGaEbwctVYT4HcfKZ1ghAnvrQLYI+2MYgIQmtipBhXFEG030zIXWThEoIGKOBuwVzmOYtwiX7+8w==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     lodash "^4.17.15"
 
-"@abp/luxon@~3.3.0":
+"@abp/luxon@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.3.0.tgz#2d669786308df997c6738dd205363edaae670d15"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.3.1.tgz#2e477be6a9f76394331399a762552bf610168e8e"
-  integrity sha512-1oSUuzgehSBxaxJLfD06ktXK4jisILPKFnEaKCBuPiKiQSDFvdQbepHAYJcpU1Jye6sVrheUKDUyJhnSwDb+0w==
+  integrity sha512-bp74vBmObbqUXsOc4VRWml5ivEyIzwHLR4oycLvWG0bQZn65yt7db7DVYTQL1PCWbEAKf6eULlnF6JvZpSVgeg==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     luxon "^1.24.1"
 
-"@abp/malihu-custom-scrollbar-plugin@~3.3.0":
+"@abp/malihu-custom-scrollbar-plugin@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.3.0.tgz#3bb48e0d68c0b76f3460eb19706927af2168a6c3"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.3.1.tgz#df833f2b8421f4dce681c13d2d5976680a27e4c8"
-  integrity sha512-44JvJOfxJ5ihfNCPyc5U8D8N8CmLh8UBMkzjH7YJQZJO+7PGgjx+uEqbQhTtBDftUz5C5oFkGoQ7i2pil7YSYQ==
+  integrity sha512-bJRQTevunQulXo+EC1HWqYgV30RVmFcS218DtdZLm2x/xWFBhvr+2DLzLS2Gq8JJXNGQMFbHnCWixn5si4V/KA==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     malihu-custom-scrollbar-plugin "^3.1.5"
 
-"@abp/select2@~3.3.0":
+"@abp/select2@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.3.0.tgz#207460dd128a1620c332af5eea2df88bfdfd0520"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.3.1.tgz#65ac0ae3ac8783d4e0422717ce743d573bf559e4"
-  integrity sha512-dbOnzQVARBQp/ynJvNyJqE1ArtsWCV8nGMUablB1ILPonsJy+0ADJ+GXWa1nIsHdj3zPW0MLi8pdqpepRCTAFg==
+  integrity sha512-efxhM/QxAmnyfGNcokZIK7vD6wYJkFGSnZEDj9QSrZ6DyUYf8H+jlK38JViDGe0RCMqts0R4B6IaKT0RbbIGmw==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     select2 "^4.0.13"
 
-"@abp/sweetalert@~3.3.0":
+"@abp/sweetalert@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.3.0.tgz#457a05af37819fc54082254022551ed0233c471e"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.3.1.tgz#b6a41f8459d4407c4aee04e2f200b84e3fa8d534"
-  integrity sha512-6KXwPVC1zwNwlZBS9x0uPLTmieu3nmBp0G+ZH1aP+GTMphSa0ejI7nuPFqUeqfEMg+an1yj51SKKUfKtmlx6Zg==
+  integrity sha512-olDU9Lh5o0sNCxRXROwt8QhHpuB5+fjojVWVUOiag0UMLVA9k/fp38diyn64qddSHWCafpqjeO32IXDKEQckZA==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     sweetalert "^2.1.2"
 
-"@abp/timeago@~3.3.0":
+"@abp/timeago@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.3.0.tgz#f0da23577630cec21255fc9c71dd2f7a3a3a3388"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.3.1.tgz#9759e09728fea082d28cd430cdc1af5b93f14720"
-  integrity sha512-f5sb4vxgGPyIzTj6lxDzUx/qJiC8pAqWPasdxHDMzhKlkRuFWO+GfblR5DC/sj9fQPcyV8+yX/VQPY3JW8i62Q==
+  integrity sha512-sIgSj3hZBl+oyO6rHc55YrIfqb4d2d2RlT6HU+OIsa2/BUAjTcW6WdPVUjXTreth2jyxEjXkfOKA3Sv5DvraGg==
   dependencies:
-    "@abp/jquery" "~3.3.0"
+    "@abp/jquery" "~3.3.1"
     timeago "^1.6.7"
 
-"@abp/toastr@~3.3.0":
+"@abp/toastr@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.3.0.tgz#c4f7d761eb4d93e993cb8e8cb54a0d670b20bdd3"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.3.1.tgz#06cf0b46e6430fae516aaff8707a5f5b16d6ed1d"
-  integrity sha512-GGqtVUCX8WalpkCnhiYUs+XxxBnhxGOLe87qFe/2tr0XNDJ3BSHXxiKynDetjlNAq/Qnf4U5P4Eg9FnHWFdWZg==
+  integrity sha512-LTf2NGwcG9ke571HMO7N4syhJijagnw/eIDl6ezflIQI/BnQqBKpXJ8xckCCqgryxfraBu4APMuSkPoDs2Ce5g==
   dependencies:
-    "@abp/jquery" "~3.3.0"
+    "@abp/jquery" "~3.3.1"
     toastr "^2.1.4"
 
-"@abp/utils@^3.3.0":
+"@abp/utils@^3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.3.0.tgz#44ccacf4c415227e94981d907017de1c6f7225bb"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.3.1.tgz#f1759161ac8af10e57b50ac90538a24a51b64ebd"
-  integrity sha512-/JIcygVJu/Ob1G5IicL2XgOVjIIePC2t3QzgEbwaq6NDGMHiOm2quyS8Lj7TfjBeUFTJhCFEbXJMq0lGQ+KMww==
+  integrity sha512-XEYJYp94zDdln48P7X51wa4v1yg3Q+p0o2DdZxQbZxXChRkCwVC/B0uyMGPs75wkft6xiz965Xr7vcNvMo0nOA==
   dependencies:
     just-compare "^1.3.0"
 

modules/cms-kit/host/Volo.CmsKit.Web.Host/package.json

@@ -3,6 +3,6 @@
   "name": "my-app",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.3.0"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.3.1"
   }
 }

modules/cms-kit/host/Volo.CmsKit.Web.Host/yarn.lock

@@ -2,37 +2,37 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.basic@^3.3.0":
+"@abp/aspnetcore.mvc.ui.theme.basic@^3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.3.0.tgz#5a83ad1010ede0647cc4bbe225f0ebf8f3ac90d8"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.3.1.tgz#58ae88355b821ca72eccf1950bde544b8f0edcca"
-  integrity sha512-b0Z/CO7nLixuceC2A/rx4m6OQPwe7ELym+ZZdurUxI42ciuoC5Cnnl3FH+HCt8P3JdFjOIWl2wOXvUcc6P16oQ==
+  integrity sha512-AUIJQIBb+5of0Na1cxmyacni6ToYBpmtU+NJH9/cTC3UUAPylj8TiAX9yobAPn8dbrcXTm+dh9T8i49rXTtxoA==
-  dependencies:
+  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.3.0"
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.3.1"
-
+
-"@abp/aspnetcore.mvc.ui.theme.shared@~3.3.0":
+"@abp/aspnetcore.mvc.ui.theme.shared@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.3.0.tgz#6c998bad95e46905e5a1487ab2370905cdf4376a"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.3.1.tgz#c3123ea8f6c8428d034d9ac2782aa1bff27bd740"
-  integrity sha512-Tt6SK3EUj8jfZKSzeIVkRuWyAGRoDTqeoS5VVkNZLoIfLzwiimHw2o2AlPRtCMa0jqLropHtaT/kNl+EU24AZw==
+  integrity sha512-j2uZapDTKSjH74uZcIR4y09hr6w+OAdybQhL1bx4fb0D3XlmOdOwRrsqXieJNwAggbUn00EX2Usiey3N/wV1rA==
-  dependencies:
+  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~3.3.0"
+    "@abp/aspnetcore.mvc.ui" "~3.3.1"
-    "@abp/bootstrap" "~3.3.0"
+    "@abp/bootstrap" "~3.3.1"
-    "@abp/bootstrap-datepicker" "~3.3.0"
+    "@abp/bootstrap-datepicker" "~3.3.1"
-    "@abp/datatables.net-bs4" "~3.3.0"
+    "@abp/datatables.net-bs4" "~3.3.1"
-    "@abp/font-awesome" "~3.3.0"
+    "@abp/font-awesome" "~3.3.1"
-    "@abp/jquery-form" "~3.3.0"
+    "@abp/jquery-form" "~3.3.1"
-    "@abp/jquery-validation-unobtrusive" "~3.3.0"
+    "@abp/jquery-validation-unobtrusive" "~3.3.1"
-    "@abp/lodash" "~3.3.0"
+    "@abp/lodash" "~3.3.1"
-    "@abp/luxon" "~3.3.0"
+    "@abp/luxon" "~3.3.1"
-    "@abp/malihu-custom-scrollbar-plugin" "~3.3.0"
+    "@abp/malihu-custom-scrollbar-plugin" "~3.3.1"
-    "@abp/select2" "~3.3.0"
+    "@abp/select2" "~3.3.1"
-    "@abp/sweetalert" "~3.3.0"
+    "@abp/sweetalert" "~3.3.1"
-    "@abp/timeago" "~3.3.0"
+    "@abp/timeago" "~3.3.1"
-    "@abp/toastr" "~3.3.0"
+    "@abp/toastr" "~3.3.1"
-
+
-"@abp/aspnetcore.mvc.ui@~3.3.0":
+"@abp/aspnetcore.mvc.ui@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.3.0.tgz#07f7d0f7f689a3ac75a69e12681ebd3d08fa0644"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.3.1.tgz#946d5fb68d73842270e2553fba475163d2ca57a5"
-  integrity sha512-EbUISgnR8qHYdu/tSro8QjUWj17M6gOkugMI7N0fiPNbtLHgKG2GHWxIsVEf5ic1O2j/PWKOQ+FPBLZ4v3jFrw==
+  integrity sha512-W/Yxe20Upkha0XaHPQwQ3+LxdUZI21BiARcbBUnIUzRUrFBpvjD0A9/T8bsi+KpIqOYLAwtrE1TJoSuZGscoIw==
   dependencies:
     ansi-colors "^4.1.1"
     extend-object "^1.0.0"
@@ -41,145 +41,145 @@
     path "^0.12.7"
     rimraf "^3.0.2"
 
-"@abp/bootstrap-datepicker@~3.3.0":
+"@abp/bootstrap-datepicker@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.3.0.tgz#d7d11e591818a6ec654127d88602cfdfddf81b1f"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.3.1.tgz#c0f5763e0bfb1e293ef1b22f2a14014ec345dbc3"
-  integrity sha512-PUsS48o5Cwufn8O8d34UBsjLF6/HrgdhsGTUzrVIhGapiyuYD/QrvqWYWRUj1Jeeb4nrsRVem2DnM1isy+CUCA==
+  integrity sha512-MnX2vI75gEDtlwnKhI6ptH657dh5TuXoin1XeaEhOa5rGbLwhSu4IFqRmlLBedFBOf+1zwcvFs30vsQlNKJ6Nw==
   dependencies:
     bootstrap-datepicker "^1.9.0"
 
-"@abp/bootstrap@~3.3.0":
+"@abp/bootstrap@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.3.0.tgz#1314549e7a940c58fdff521a9ddf153f3414fffa"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.3.1.tgz#5b173918511b6ad1fb8ac570ea2e2fcb874970e0"
-  integrity sha512-CVjSwbZPjio0VJWxdo+PRkvUYGtv51DgVrqjgHK7m7tGFwHAK38cDHAl+mqmIp7dgPG1Z+E0o41JteT3Za1Bkw==
+  integrity sha512-CfnwXAV2XRK3gYpeEQjgVzEocU6pqdGZXwATwOKifHWBZNG8ubDyMgBed+oVCvJgRvLRrniR5jFK2vhm8Du+EQ==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     bootstrap "^4.5.0"
     bootstrap-v4-rtl "4.4.1-2"
 
-"@abp/core@~3.3.0":
+"@abp/core@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.3.0.tgz#c88c28df19f96349b9a32b7ebe402e6d267c34e5"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.3.1.tgz#b1da2160b0fc4a309dc4a65ee937c814de16b2de"
-  integrity sha512-y9P86zPAm55fAyKwDaoxv+IrApA339aaGEpN9364upeeNBsO8mYf9hoM136VovQaWNIABFHRD7R+9KskwPAuNA==
+  integrity sha512-6/6FHTLZrWh821O6xr4Sk1BlIt9gTAT19NnykQRV9U8S7rl4BQv2QF055R8Wg3lnVKWJ1ajiAbd3gerjH/pL6g==
   dependencies:
-    "@abp/utils" "^3.3.0"
+    "@abp/utils" "^3.3.1"
 
-"@abp/datatables.net-bs4@~3.3.0":
+"@abp/datatables.net-bs4@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.3.0.tgz#e4cc85f3c1c195d9e8b07532eb7c53619f40a787"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.3.1.tgz#fd0f5f5579ff94d635d19c1bf46ac0593639e3f4"
-  integrity sha512-StuwT8jGfDWGNXmYgRELuErXxSE+qjVoiSAkd27mZqDbYSTipq4OZSAHr6WNmoqMgP6QlCgjGgXcz4Pr8Pxuaw==
+  integrity sha512-C9BUlbsk9liJ+hmFpTKoearJNZISDy5TInTbnixL8WfXfIaAWdZRs+ADvhKO9+oWMxkbxhGI8ueYQ29Z1UJzMg==
   dependencies:
-    "@abp/datatables.net" "~3.3.0"
+    "@abp/datatables.net" "~3.3.1"
     datatables.net-bs4 "^1.10.21"
 
-"@abp/datatables.net@~3.3.0":
+"@abp/datatables.net@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.3.0.tgz#a2b2cedc06beb325e62ce6faba899c935564b9a7"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.3.1.tgz#2ec7406712607f08f0ae9a6ce0ee7bfd0cc73278"
-  integrity sha512-y0RGrLxI7VgWFAFtHAraDnrEJ5pkUIJ3zxEScS43RUbArhxk+5pIpxQbmU0WgHpk72H7WXdqtL486Kw8PSj1Nw==
+  integrity sha512-prsMkh//XCymCG/aYEEtzV/922RJIZ0+PcnRvhJzXvrX4DK2y3ZWM44QNR/9/rpkYUJqRcVoHqbt1DuxbHDLXQ==
   dependencies:
-    "@abp/jquery" "~3.3.0"
+    "@abp/jquery" "~3.3.1"
     datatables.net "^1.10.21"
 
-"@abp/font-awesome@~3.3.0":
+"@abp/font-awesome@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.3.0.tgz#f9307334c34309456c47cc407fbe079821ace45e"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.3.1.tgz#268a21685a6b810b15848169b78c3dfb11d582c6"
-  integrity sha512-7/uZ2qXooHQZG35F6ERKsjI8m0gn8/BgE2cOB7Zhu5KRtSTOHOOXX4YWEfoHYLEMuo3xKTTJ2gHM3jiCJEpVtg==
+  integrity sha512-Eg2dwtcsyLo5E6PC21vK5R8YFe32UFSN4DpNrqAP9I85daR8ZbT0US8SbfCcI5nhiZlRi3EWj/cUgz2IEJHaaQ==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     "@fortawesome/fontawesome-free" "^5.13.0"
 
-"@abp/jquery-form@~3.3.0":
+"@abp/jquery-form@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.3.0.tgz#43fc5655b4e3cac7c0558fb36dd9ef188fe64412"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.3.1.tgz#4e8c2e50e711a7bbe4f40e74210472b21afd0ecf"
-  integrity sha512-fH4IPf/cU3ojWtVsPZjtymzK0xWqqgmvnSk5zy4AB4MOCKyYtPrn5OAMUvq8A4uZ0mGIRAQ8Z72wPKZA1rws5A==
+  integrity sha512-HBic6SzOSprYAug/Qbgcd+MiPRwtXczS2/x9IUmPFeUhvuqJJoYPWrhI5xC6WKNcJ/5MjExiEbeEXMXp8PwJTA==
   dependencies:
-    "@abp/jquery" "~3.3.0"
+    "@abp/jquery" "~3.3.1"
     jquery-form "^4.3.0"
 
-"@abp/jquery-validation-unobtrusive@~3.3.0":
+"@abp/jquery-validation-unobtrusive@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.3.0.tgz#0840f3114626a1d6efff54f4791776ebfdf56e76"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.3.1.tgz#e42d61a172b6ef5cbdbb305ab5d93e3dad5159a1"
-  integrity sha512-foKM9FDAY2RZGz5EQ2FcQt/FiL8sMc+uwd+2KeAdIejLyPgeSH/lLio6agd2Xun4e/xlBJB185Ga1eKcdHIGAw==
+  integrity sha512-SH8zmrR3HshCNP0zIgi4j6PMhgCzmCKk5xXxD+8kg+LAv+bm1iP0K5srgX4WlEffRma80QIeNKPpe/lW04EgFw==
   dependencies:
-    "@abp/jquery-validation" "~3.3.0"
+    "@abp/jquery-validation" "~3.3.1"
     jquery-validation-unobtrusive "^3.2.11"
 
-"@abp/jquery-validation@~3.3.0":
+"@abp/jquery-validation@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.3.0.tgz#2199968638d7bab9bfb6ba5e9f27d9d607c09a24"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.3.1.tgz#05164e342fdb83f40a17f000b40c27df2604c394"
-  integrity sha512-jxw274hx8i9+dkRrDz7aUpWSGESnJ2wuA6e3IAQIlubFf+7q0o4vosXD5bubinn4qaRGcSiYC15armfefgmFCw==
+  integrity sha512-oKN3wQUY1PB7IhelFIJVjRqAZx/AVlpUF0GV6k/9eNBK+ZoLpW1ebE1q9tsLhXf7QS1N7S45aEHB8OpjRopDew==
   dependencies:
-    "@abp/jquery" "~3.3.0"
+    "@abp/jquery" "~3.3.1"
     jquery-validation "^1.19.2"
 
-"@abp/jquery@~3.3.0":
+"@abp/jquery@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.3.0.tgz#b99a9436bf3c2394917e761a2dcdfe4f1af9ff3d"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.3.1.tgz#2e8431a52641ab85d1372a32518307bbf8fba1a0"
-  integrity sha512-WrjDQCBOi83kjtMYjXCJVWSbnFxKLW/KtDADkjTF7TxIGccsNWx6E8npzdCEnDnlOJ5Rk9+1QIu07pWedOjBSg==
+  integrity sha512-mSAUYLzhJSvq8ixhAFkU5Q2LRDTkJAGHq47alb2nNEodZNr1q1i+875nP3dE/4MLT/foG0H+j+r4RGuYx4fGAA==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     jquery "~3.5.1"
 
-"@abp/lodash@~3.3.0":
+"@abp/lodash@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.3.0.tgz#5402a779ef1e8ecd585644a68607425587560305"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.3.1.tgz#5c2602f03bde7fbf7841c01bb7178b3ca3429d87"
-  integrity sha512-QFm9hpWs0/J5TFFiE7vO5oxTsLgMcibmgg/CxYvmQZXhHGZpx3mdoAzC48CvRu8quxr6Xo8pIxlCyYXniR6/Dw==
+  integrity sha512-5fitYkotzaXGaEbwctVYT4HcfKZ1ghAnvrQLYI+2MYgIQmtipBhXFEG030zIXWThEoIGKOBuwVzmOYtwiX7+8w==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     lodash "^4.17.15"
 
-"@abp/luxon@~3.3.0":
+"@abp/luxon@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.3.0.tgz#2d669786308df997c6738dd205363edaae670d15"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.3.1.tgz#2e477be6a9f76394331399a762552bf610168e8e"
-  integrity sha512-1oSUuzgehSBxaxJLfD06ktXK4jisILPKFnEaKCBuPiKiQSDFvdQbepHAYJcpU1Jye6sVrheUKDUyJhnSwDb+0w==
+  integrity sha512-bp74vBmObbqUXsOc4VRWml5ivEyIzwHLR4oycLvWG0bQZn65yt7db7DVYTQL1PCWbEAKf6eULlnF6JvZpSVgeg==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     luxon "^1.24.1"
 
-"@abp/malihu-custom-scrollbar-plugin@~3.3.0":
+"@abp/malihu-custom-scrollbar-plugin@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.3.0.tgz#3bb48e0d68c0b76f3460eb19706927af2168a6c3"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.3.1.tgz#df833f2b8421f4dce681c13d2d5976680a27e4c8"
-  integrity sha512-44JvJOfxJ5ihfNCPyc5U8D8N8CmLh8UBMkzjH7YJQZJO+7PGgjx+uEqbQhTtBDftUz5C5oFkGoQ7i2pil7YSYQ==
+  integrity sha512-bJRQTevunQulXo+EC1HWqYgV30RVmFcS218DtdZLm2x/xWFBhvr+2DLzLS2Gq8JJXNGQMFbHnCWixn5si4V/KA==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     malihu-custom-scrollbar-plugin "^3.1.5"
 
-"@abp/select2@~3.3.0":
+"@abp/select2@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.3.0.tgz#207460dd128a1620c332af5eea2df88bfdfd0520"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.3.1.tgz#65ac0ae3ac8783d4e0422717ce743d573bf559e4"
-  integrity sha512-dbOnzQVARBQp/ynJvNyJqE1ArtsWCV8nGMUablB1ILPonsJy+0ADJ+GXWa1nIsHdj3zPW0MLi8pdqpepRCTAFg==
+  integrity sha512-efxhM/QxAmnyfGNcokZIK7vD6wYJkFGSnZEDj9QSrZ6DyUYf8H+jlK38JViDGe0RCMqts0R4B6IaKT0RbbIGmw==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     select2 "^4.0.13"
 
-"@abp/sweetalert@~3.3.0":
+"@abp/sweetalert@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.3.0.tgz#457a05af37819fc54082254022551ed0233c471e"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.3.1.tgz#b6a41f8459d4407c4aee04e2f200b84e3fa8d534"
-  integrity sha512-6KXwPVC1zwNwlZBS9x0uPLTmieu3nmBp0G+ZH1aP+GTMphSa0ejI7nuPFqUeqfEMg+an1yj51SKKUfKtmlx6Zg==
+  integrity sha512-olDU9Lh5o0sNCxRXROwt8QhHpuB5+fjojVWVUOiag0UMLVA9k/fp38diyn64qddSHWCafpqjeO32IXDKEQckZA==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     sweetalert "^2.1.2"
 
-"@abp/timeago@~3.3.0":
+"@abp/timeago@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.3.0.tgz#f0da23577630cec21255fc9c71dd2f7a3a3a3388"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.3.1.tgz#9759e09728fea082d28cd430cdc1af5b93f14720"
-  integrity sha512-f5sb4vxgGPyIzTj6lxDzUx/qJiC8pAqWPasdxHDMzhKlkRuFWO+GfblR5DC/sj9fQPcyV8+yX/VQPY3JW8i62Q==
+  integrity sha512-sIgSj3hZBl+oyO6rHc55YrIfqb4d2d2RlT6HU+OIsa2/BUAjTcW6WdPVUjXTreth2jyxEjXkfOKA3Sv5DvraGg==
   dependencies:
-    "@abp/jquery" "~3.3.0"
+    "@abp/jquery" "~3.3.1"
     timeago "^1.6.7"
 
-"@abp/toastr@~3.3.0":
+"@abp/toastr@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.3.0.tgz#c4f7d761eb4d93e993cb8e8cb54a0d670b20bdd3"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.3.1.tgz#06cf0b46e6430fae516aaff8707a5f5b16d6ed1d"
-  integrity sha512-GGqtVUCX8WalpkCnhiYUs+XxxBnhxGOLe87qFe/2tr0XNDJ3BSHXxiKynDetjlNAq/Qnf4U5P4Eg9FnHWFdWZg==
+  integrity sha512-LTf2NGwcG9ke571HMO7N4syhJijagnw/eIDl6ezflIQI/BnQqBKpXJ8xckCCqgryxfraBu4APMuSkPoDs2Ce5g==
   dependencies:
-    "@abp/jquery" "~3.3.0"
+    "@abp/jquery" "~3.3.1"
     toastr "^2.1.4"
 
-"@abp/utils@^3.3.0":
+"@abp/utils@^3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.3.0.tgz#44ccacf4c415227e94981d907017de1c6f7225bb"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.3.1.tgz#f1759161ac8af10e57b50ac90538a24a51b64ebd"
-  integrity sha512-/JIcygVJu/Ob1G5IicL2XgOVjIIePC2t3QzgEbwaq6NDGMHiOm2quyS8Lj7TfjBeUFTJhCFEbXJMq0lGQ+KMww==
+  integrity sha512-XEYJYp94zDdln48P7X51wa4v1yg3Q+p0o2DdZxQbZxXChRkCwVC/B0uyMGPs75wkft6xiz965Xr7vcNvMo0nOA==
   dependencies:
     just-compare "^1.3.0"
 

modules/cms-kit/host/Volo.CmsKit.Web.Unified/package.json

@@ -3,6 +3,6 @@
   "name": "my-app",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.3.0"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.3.1"
   }
 }

modules/cms-kit/host/Volo.CmsKit.Web.Unified/yarn.lock

@@ -2,37 +2,37 @@
 # yarn lockfile v1
 
 
-"@abp/aspnetcore.mvc.ui.theme.basic@^3.3.0":
+"@abp/aspnetcore.mvc.ui.theme.basic@^3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.3.0.tgz#5a83ad1010ede0647cc4bbe225f0ebf8f3ac90d8"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.3.1.tgz#58ae88355b821ca72eccf1950bde544b8f0edcca"
-  integrity sha512-b0Z/CO7nLixuceC2A/rx4m6OQPwe7ELym+ZZdurUxI42ciuoC5Cnnl3FH+HCt8P3JdFjOIWl2wOXvUcc6P16oQ==
+  integrity sha512-AUIJQIBb+5of0Na1cxmyacni6ToYBpmtU+NJH9/cTC3UUAPylj8TiAX9yobAPn8dbrcXTm+dh9T8i49rXTtxoA==
-  dependencies:
+  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.3.0"
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.3.1"
-
+
-"@abp/aspnetcore.mvc.ui.theme.shared@~3.3.0":
+"@abp/aspnetcore.mvc.ui.theme.shared@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.3.0.tgz#6c998bad95e46905e5a1487ab2370905cdf4376a"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.3.1.tgz#c3123ea8f6c8428d034d9ac2782aa1bff27bd740"
-  integrity sha512-Tt6SK3EUj8jfZKSzeIVkRuWyAGRoDTqeoS5VVkNZLoIfLzwiimHw2o2AlPRtCMa0jqLropHtaT/kNl+EU24AZw==
+  integrity sha512-j2uZapDTKSjH74uZcIR4y09hr6w+OAdybQhL1bx4fb0D3XlmOdOwRrsqXieJNwAggbUn00EX2Usiey3N/wV1rA==
-  dependencies:
+  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~3.3.0"
+    "@abp/aspnetcore.mvc.ui" "~3.3.1"
-    "@abp/bootstrap" "~3.3.0"
+    "@abp/bootstrap" "~3.3.1"
-    "@abp/bootstrap-datepicker" "~3.3.0"
+    "@abp/bootstrap-datepicker" "~3.3.1"
-    "@abp/datatables.net-bs4" "~3.3.0"
+    "@abp/datatables.net-bs4" "~3.3.1"
-    "@abp/font-awesome" "~3.3.0"
+    "@abp/font-awesome" "~3.3.1"
-    "@abp/jquery-form" "~3.3.0"
+    "@abp/jquery-form" "~3.3.1"
-    "@abp/jquery-validation-unobtrusive" "~3.3.0"
+    "@abp/jquery-validation-unobtrusive" "~3.3.1"
-    "@abp/lodash" "~3.3.0"
+    "@abp/lodash" "~3.3.1"
-    "@abp/luxon" "~3.3.0"
+    "@abp/luxon" "~3.3.1"
-    "@abp/malihu-custom-scrollbar-plugin" "~3.3.0"
+    "@abp/malihu-custom-scrollbar-plugin" "~3.3.1"
-    "@abp/select2" "~3.3.0"
+    "@abp/select2" "~3.3.1"
-    "@abp/sweetalert" "~3.3.0"
+    "@abp/sweetalert" "~3.3.1"
-    "@abp/timeago" "~3.3.0"
+    "@abp/timeago" "~3.3.1"
-    "@abp/toastr" "~3.3.0"
+    "@abp/toastr" "~3.3.1"
-
+
-"@abp/aspnetcore.mvc.ui@~3.3.0":
+"@abp/aspnetcore.mvc.ui@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.3.0.tgz#07f7d0f7f689a3ac75a69e12681ebd3d08fa0644"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.3.1.tgz#946d5fb68d73842270e2553fba475163d2ca57a5"
-  integrity sha512-EbUISgnR8qHYdu/tSro8QjUWj17M6gOkugMI7N0fiPNbtLHgKG2GHWxIsVEf5ic1O2j/PWKOQ+FPBLZ4v3jFrw==
+  integrity sha512-W/Yxe20Upkha0XaHPQwQ3+LxdUZI21BiARcbBUnIUzRUrFBpvjD0A9/T8bsi+KpIqOYLAwtrE1TJoSuZGscoIw==
   dependencies:
     ansi-colors "^4.1.1"
     extend-object "^1.0.0"
@@ -41,145 +41,145 @@
     path "^0.12.7"
     rimraf "^3.0.2"
 
-"@abp/bootstrap-datepicker@~3.3.0":
+"@abp/bootstrap-datepicker@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.3.0.tgz#d7d11e591818a6ec654127d88602cfdfddf81b1f"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.3.1.tgz#c0f5763e0bfb1e293ef1b22f2a14014ec345dbc3"
-  integrity sha512-PUsS48o5Cwufn8O8d34UBsjLF6/HrgdhsGTUzrVIhGapiyuYD/QrvqWYWRUj1Jeeb4nrsRVem2DnM1isy+CUCA==
+  integrity sha512-MnX2vI75gEDtlwnKhI6ptH657dh5TuXoin1XeaEhOa5rGbLwhSu4IFqRmlLBedFBOf+1zwcvFs30vsQlNKJ6Nw==
   dependencies:
     bootstrap-datepicker "^1.9.0"
 
-"@abp/bootstrap@~3.3.0":
+"@abp/bootstrap@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.3.0.tgz#1314549e7a940c58fdff521a9ddf153f3414fffa"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.3.1.tgz#5b173918511b6ad1fb8ac570ea2e2fcb874970e0"
-  integrity sha512-CVjSwbZPjio0VJWxdo+PRkvUYGtv51DgVrqjgHK7m7tGFwHAK38cDHAl+mqmIp7dgPG1Z+E0o41JteT3Za1Bkw==
+  integrity sha512-CfnwXAV2XRK3gYpeEQjgVzEocU6pqdGZXwATwOKifHWBZNG8ubDyMgBed+oVCvJgRvLRrniR5jFK2vhm8Du+EQ==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     bootstrap "^4.5.0"
     bootstrap-v4-rtl "4.4.1-2"
 
-"@abp/core@~3.3.0":
+"@abp/core@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.3.0.tgz#c88c28df19f96349b9a32b7ebe402e6d267c34e5"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.3.1.tgz#b1da2160b0fc4a309dc4a65ee937c814de16b2de"
-  integrity sha512-y9P86zPAm55fAyKwDaoxv+IrApA339aaGEpN9364upeeNBsO8mYf9hoM136VovQaWNIABFHRD7R+9KskwPAuNA==
+  integrity sha512-6/6FHTLZrWh821O6xr4Sk1BlIt9gTAT19NnykQRV9U8S7rl4BQv2QF055R8Wg3lnVKWJ1ajiAbd3gerjH/pL6g==
   dependencies:
-    "@abp/utils" "^3.3.0"
+    "@abp/utils" "^3.3.1"
 
-"@abp/datatables.net-bs4@~3.3.0":
+"@abp/datatables.net-bs4@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.3.0.tgz#e4cc85f3c1c195d9e8b07532eb7c53619f40a787"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.3.1.tgz#fd0f5f5579ff94d635d19c1bf46ac0593639e3f4"
-  integrity sha512-StuwT8jGfDWGNXmYgRELuErXxSE+qjVoiSAkd27mZqDbYSTipq4OZSAHr6WNmoqMgP6QlCgjGgXcz4Pr8Pxuaw==
+  integrity sha512-C9BUlbsk9liJ+hmFpTKoearJNZISDy5TInTbnixL8WfXfIaAWdZRs+ADvhKO9+oWMxkbxhGI8ueYQ29Z1UJzMg==
   dependencies:
-    "@abp/datatables.net" "~3.3.0"
+    "@abp/datatables.net" "~3.3.1"
     datatables.net-bs4 "^1.10.21"
 
-"@abp/datatables.net@~3.3.0":
+"@abp/datatables.net@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.3.0.tgz#a2b2cedc06beb325e62ce6faba899c935564b9a7"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.3.1.tgz#2ec7406712607f08f0ae9a6ce0ee7bfd0cc73278"
-  integrity sha512-y0RGrLxI7VgWFAFtHAraDnrEJ5pkUIJ3zxEScS43RUbArhxk+5pIpxQbmU0WgHpk72H7WXdqtL486Kw8PSj1Nw==
+  integrity sha512-prsMkh//XCymCG/aYEEtzV/922RJIZ0+PcnRvhJzXvrX4DK2y3ZWM44QNR/9/rpkYUJqRcVoHqbt1DuxbHDLXQ==
   dependencies:
-    "@abp/jquery" "~3.3.0"
+    "@abp/jquery" "~3.3.1"
     datatables.net "^1.10.21"
 
-"@abp/font-awesome@~3.3.0":
+"@abp/font-awesome@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.3.0.tgz#f9307334c34309456c47cc407fbe079821ace45e"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.3.1.tgz#268a21685a6b810b15848169b78c3dfb11d582c6"
-  integrity sha512-7/uZ2qXooHQZG35F6ERKsjI8m0gn8/BgE2cOB7Zhu5KRtSTOHOOXX4YWEfoHYLEMuo3xKTTJ2gHM3jiCJEpVtg==
+  integrity sha512-Eg2dwtcsyLo5E6PC21vK5R8YFe32UFSN4DpNrqAP9I85daR8ZbT0US8SbfCcI5nhiZlRi3EWj/cUgz2IEJHaaQ==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     "@fortawesome/fontawesome-free" "^5.13.0"
 
-"@abp/jquery-form@~3.3.0":
+"@abp/jquery-form@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.3.0.tgz#43fc5655b4e3cac7c0558fb36dd9ef188fe64412"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.3.1.tgz#4e8c2e50e711a7bbe4f40e74210472b21afd0ecf"
-  integrity sha512-fH4IPf/cU3ojWtVsPZjtymzK0xWqqgmvnSk5zy4AB4MOCKyYtPrn5OAMUvq8A4uZ0mGIRAQ8Z72wPKZA1rws5A==
+  integrity sha512-HBic6SzOSprYAug/Qbgcd+MiPRwtXczS2/x9IUmPFeUhvuqJJoYPWrhI5xC6WKNcJ/5MjExiEbeEXMXp8PwJTA==
   dependencies:
-    "@abp/jquery" "~3.3.0"
+    "@abp/jquery" "~3.3.1"
     jquery-form "^4.3.0"
 
-"@abp/jquery-validation-unobtrusive@~3.3.0":
+"@abp/jquery-validation-unobtrusive@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.3.0.tgz#0840f3114626a1d6efff54f4791776ebfdf56e76"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.3.1.tgz#e42d61a172b6ef5cbdbb305ab5d93e3dad5159a1"
-  integrity sha512-foKM9FDAY2RZGz5EQ2FcQt/FiL8sMc+uwd+2KeAdIejLyPgeSH/lLio6agd2Xun4e/xlBJB185Ga1eKcdHIGAw==
+  integrity sha512-SH8zmrR3HshCNP0zIgi4j6PMhgCzmCKk5xXxD+8kg+LAv+bm1iP0K5srgX4WlEffRma80QIeNKPpe/lW04EgFw==
   dependencies:
-    "@abp/jquery-validation" "~3.3.0"
+    "@abp/jquery-validation" "~3.3.1"
     jquery-validation-unobtrusive "^3.2.11"
 
-"@abp/jquery-validation@~3.3.0":
+"@abp/jquery-validation@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.3.0.tgz#2199968638d7bab9bfb6ba5e9f27d9d607c09a24"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.3.1.tgz#05164e342fdb83f40a17f000b40c27df2604c394"
-  integrity sha512-jxw274hx8i9+dkRrDz7aUpWSGESnJ2wuA6e3IAQIlubFf+7q0o4vosXD5bubinn4qaRGcSiYC15armfefgmFCw==
+  integrity sha512-oKN3wQUY1PB7IhelFIJVjRqAZx/AVlpUF0GV6k/9eNBK+ZoLpW1ebE1q9tsLhXf7QS1N7S45aEHB8OpjRopDew==
   dependencies:
-    "@abp/jquery" "~3.3.0"
+    "@abp/jquery" "~3.3.1"
     jquery-validation "^1.19.2"
 
-"@abp/jquery@~3.3.0":
+"@abp/jquery@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.3.0.tgz#b99a9436bf3c2394917e761a2dcdfe4f1af9ff3d"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.3.1.tgz#2e8431a52641ab85d1372a32518307bbf8fba1a0"
-  integrity sha512-WrjDQCBOi83kjtMYjXCJVWSbnFxKLW/KtDADkjTF7TxIGccsNWx6E8npzdCEnDnlOJ5Rk9+1QIu07pWedOjBSg==
+  integrity sha512-mSAUYLzhJSvq8ixhAFkU5Q2LRDTkJAGHq47alb2nNEodZNr1q1i+875nP3dE/4MLT/foG0H+j+r4RGuYx4fGAA==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     jquery "~3.5.1"
 
-"@abp/lodash@~3.3.0":
+"@abp/lodash@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.3.0.tgz#5402a779ef1e8ecd585644a68607425587560305"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.3.1.tgz#5c2602f03bde7fbf7841c01bb7178b3ca3429d87"
-  integrity sha512-QFm9hpWs0/J5TFFiE7vO5oxTsLgMcibmgg/CxYvmQZXhHGZpx3mdoAzC48CvRu8quxr6Xo8pIxlCyYXniR6/Dw==
+  integrity sha512-5fitYkotzaXGaEbwctVYT4HcfKZ1ghAnvrQLYI+2MYgIQmtipBhXFEG030zIXWThEoIGKOBuwVzmOYtwiX7+8w==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     lodash "^4.17.15"
 
-"@abp/luxon@~3.3.0":
+"@abp/luxon@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.3.0.tgz#2d669786308df997c6738dd205363edaae670d15"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.3.1.tgz#2e477be6a9f76394331399a762552bf610168e8e"
-  integrity sha512-1oSUuzgehSBxaxJLfD06ktXK4jisILPKFnEaKCBuPiKiQSDFvdQbepHAYJcpU1Jye6sVrheUKDUyJhnSwDb+0w==
+  integrity sha512-bp74vBmObbqUXsOc4VRWml5ivEyIzwHLR4oycLvWG0bQZn65yt7db7DVYTQL1PCWbEAKf6eULlnF6JvZpSVgeg==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     luxon "^1.24.1"
 
-"@abp/malihu-custom-scrollbar-plugin@~3.3.0":
+"@abp/malihu-custom-scrollbar-plugin@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.3.0.tgz#3bb48e0d68c0b76f3460eb19706927af2168a6c3"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.3.1.tgz#df833f2b8421f4dce681c13d2d5976680a27e4c8"
-  integrity sha512-44JvJOfxJ5ihfNCPyc5U8D8N8CmLh8UBMkzjH7YJQZJO+7PGgjx+uEqbQhTtBDftUz5C5oFkGoQ7i2pil7YSYQ==
+  integrity sha512-bJRQTevunQulXo+EC1HWqYgV30RVmFcS218DtdZLm2x/xWFBhvr+2DLzLS2Gq8JJXNGQMFbHnCWixn5si4V/KA==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     malihu-custom-scrollbar-plugin "^3.1.5"
 
-"@abp/select2@~3.3.0":
+"@abp/select2@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.3.0.tgz#207460dd128a1620c332af5eea2df88bfdfd0520"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.3.1.tgz#65ac0ae3ac8783d4e0422717ce743d573bf559e4"
-  integrity sha512-dbOnzQVARBQp/ynJvNyJqE1ArtsWCV8nGMUablB1ILPonsJy+0ADJ+GXWa1nIsHdj3zPW0MLi8pdqpepRCTAFg==
+  integrity sha512-efxhM/QxAmnyfGNcokZIK7vD6wYJkFGSnZEDj9QSrZ6DyUYf8H+jlK38JViDGe0RCMqts0R4B6IaKT0RbbIGmw==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     select2 "^4.0.13"
 
-"@abp/sweetalert@~3.3.0":
+"@abp/sweetalert@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.3.0.tgz#457a05af37819fc54082254022551ed0233c471e"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.3.1.tgz#b6a41f8459d4407c4aee04e2f200b84e3fa8d534"
-  integrity sha512-6KXwPVC1zwNwlZBS9x0uPLTmieu3nmBp0G+ZH1aP+GTMphSa0ejI7nuPFqUeqfEMg+an1yj51SKKUfKtmlx6Zg==
+  integrity sha512-olDU9Lh5o0sNCxRXROwt8QhHpuB5+fjojVWVUOiag0UMLVA9k/fp38diyn64qddSHWCafpqjeO32IXDKEQckZA==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     sweetalert "^2.1.2"
 
-"@abp/timeago@~3.3.0":
+"@abp/timeago@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.3.0.tgz#f0da23577630cec21255fc9c71dd2f7a3a3a3388"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.3.1.tgz#9759e09728fea082d28cd430cdc1af5b93f14720"
-  integrity sha512-f5sb4vxgGPyIzTj6lxDzUx/qJiC8pAqWPasdxHDMzhKlkRuFWO+GfblR5DC/sj9fQPcyV8+yX/VQPY3JW8i62Q==
+  integrity sha512-sIgSj3hZBl+oyO6rHc55YrIfqb4d2d2RlT6HU+OIsa2/BUAjTcW6WdPVUjXTreth2jyxEjXkfOKA3Sv5DvraGg==
   dependencies:
-    "@abp/jquery" "~3.3.0"
+    "@abp/jquery" "~3.3.1"
     timeago "^1.6.7"
 
-"@abp/toastr@~3.3.0":
+"@abp/toastr@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.3.0.tgz#c4f7d761eb4d93e993cb8e8cb54a0d670b20bdd3"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.3.1.tgz#06cf0b46e6430fae516aaff8707a5f5b16d6ed1d"
-  integrity sha512-GGqtVUCX8WalpkCnhiYUs+XxxBnhxGOLe87qFe/2tr0XNDJ3BSHXxiKynDetjlNAq/Qnf4U5P4Eg9FnHWFdWZg==
+  integrity sha512-LTf2NGwcG9ke571HMO7N4syhJijagnw/eIDl6ezflIQI/BnQqBKpXJ8xckCCqgryxfraBu4APMuSkPoDs2Ce5g==
   dependencies:
-    "@abp/jquery" "~3.3.0"
+    "@abp/jquery" "~3.3.1"
     toastr "^2.1.4"
 
-"@abp/utils@^3.3.0":
+"@abp/utils@^3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.3.0.tgz#44ccacf4c415227e94981d907017de1c6f7225bb"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.3.1.tgz#f1759161ac8af10e57b50ac90538a24a51b64ebd"
-  integrity sha512-/JIcygVJu/Ob1G5IicL2XgOVjIIePC2t3QzgEbwaq6NDGMHiOm2quyS8Lj7TfjBeUFTJhCFEbXJMq0lGQ+KMww==
+  integrity sha512-XEYJYp94zDdln48P7X51wa4v1yg3Q+p0o2DdZxQbZxXChRkCwVC/B0uyMGPs75wkft6xiz965Xr7vcNvMo0nOA==
   dependencies:
     just-compare "^1.3.0"
 

modules/docs/app/VoloDocs.Web/package.json

@@ -3,7 +3,7 @@
   "name": "volo.docstestapp",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.3.0",
+    "@abp/aspnetcore.mvc.ui.theme.basic": "^3.3.1",
-    "@abp/docs": "^3.3.0"
+    "@abp/docs": "^3.3.1"
   }
 }

modules/docs/app/VoloDocs.Web/yarn.lock

@@ -2,45 +2,45 @@
 # yarn lockfile v1
 
 
-"@abp/anchor-js@~3.3.0":
+"@abp/anchor-js@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/anchor-js/-/anchor-js-3.3.0.tgz#a40489ee53865c5746297e014297ae7bbd6ada3b"
+  resolved "https://registry.yarnpkg.com/@abp/anchor-js/-/anchor-js-3.3.1.tgz#ba0843f55e324f0bc4714d8183c7f942865aa774"
-  integrity sha512-885Ub6OFJvlv+EZNpQ642K79C63n2g4ogfhVIgAhUuhTYSjpP4Oq/WFOhUPIWyMHHphZemyqqV0UZRvFs0lqpQ==
+  integrity sha512-at2m281xksP5A9I9HykPai4WQK2UedrLXFSAWGpFhXx6zWvQ5YeUZliCS/eX1rX3fhMGKwcEL0CGXA03kMn72A==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     anchor-js "^4.2.2"
 
-"@abp/aspnetcore.mvc.ui.theme.basic@^3.3.0":
+"@abp/aspnetcore.mvc.ui.theme.basic@^3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.3.0.tgz#5a83ad1010ede0647cc4bbe225f0ebf8f3ac90d8"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-3.3.1.tgz#58ae88355b821ca72eccf1950bde544b8f0edcca"
-  integrity sha512-b0Z/CO7nLixuceC2A/rx4m6OQPwe7ELym+ZZdurUxI42ciuoC5Cnnl3FH+HCt8P3JdFjOIWl2wOXvUcc6P16oQ==
+  integrity sha512-AUIJQIBb+5of0Na1cxmyacni6ToYBpmtU+NJH9/cTC3UUAPylj8TiAX9yobAPn8dbrcXTm+dh9T8i49rXTtxoA==
-  dependencies:
+  dependencies:
-    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.3.0"
+    "@abp/aspnetcore.mvc.ui.theme.shared" "~3.3.1"
-
+
-"@abp/aspnetcore.mvc.ui.theme.shared@~3.3.0":
+"@abp/aspnetcore.mvc.ui.theme.shared@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.3.0.tgz#6c998bad95e46905e5a1487ab2370905cdf4376a"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-3.3.1.tgz#c3123ea8f6c8428d034d9ac2782aa1bff27bd740"
-  integrity sha512-Tt6SK3EUj8jfZKSzeIVkRuWyAGRoDTqeoS5VVkNZLoIfLzwiimHw2o2AlPRtCMa0jqLropHtaT/kNl+EU24AZw==
+  integrity sha512-j2uZapDTKSjH74uZcIR4y09hr6w+OAdybQhL1bx4fb0D3XlmOdOwRrsqXieJNwAggbUn00EX2Usiey3N/wV1rA==
-  dependencies:
+  dependencies:
-    "@abp/aspnetcore.mvc.ui" "~3.3.0"
+    "@abp/aspnetcore.mvc.ui" "~3.3.1"
-    "@abp/bootstrap" "~3.3.0"
+    "@abp/bootstrap" "~3.3.1"
-    "@abp/bootstrap-datepicker" "~3.3.0"
+    "@abp/bootstrap-datepicker" "~3.3.1"
-    "@abp/datatables.net-bs4" "~3.3.0"
+    "@abp/datatables.net-bs4" "~3.3.1"
-    "@abp/font-awesome" "~3.3.0"
+    "@abp/font-awesome" "~3.3.1"
-    "@abp/jquery-form" "~3.3.0"
+    "@abp/jquery-form" "~3.3.1"
-    "@abp/jquery-validation-unobtrusive" "~3.3.0"
+    "@abp/jquery-validation-unobtrusive" "~3.3.1"
-    "@abp/lodash" "~3.3.0"
+    "@abp/lodash" "~3.3.1"
-    "@abp/luxon" "~3.3.0"
+    "@abp/luxon" "~3.3.1"
-    "@abp/malihu-custom-scrollbar-plugin" "~3.3.0"
+    "@abp/malihu-custom-scrollbar-plugin" "~3.3.1"
-    "@abp/select2" "~3.3.0"
+    "@abp/select2" "~3.3.1"
-    "@abp/sweetalert" "~3.3.0"
+    "@abp/sweetalert" "~3.3.1"
-    "@abp/timeago" "~3.3.0"
+    "@abp/timeago" "~3.3.1"
-    "@abp/toastr" "~3.3.0"
+    "@abp/toastr" "~3.3.1"
-
+
-"@abp/aspnetcore.mvc.ui@~3.3.0":
+"@abp/aspnetcore.mvc.ui@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.3.0.tgz#07f7d0f7f689a3ac75a69e12681ebd3d08fa0644"
+  resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-3.3.1.tgz#946d5fb68d73842270e2553fba475163d2ca57a5"
-  integrity sha512-EbUISgnR8qHYdu/tSro8QjUWj17M6gOkugMI7N0fiPNbtLHgKG2GHWxIsVEf5ic1O2j/PWKOQ+FPBLZ4v3jFrw==
+  integrity sha512-W/Yxe20Upkha0XaHPQwQ3+LxdUZI21BiARcbBUnIUzRUrFBpvjD0A9/T8bsi+KpIqOYLAwtrE1TJoSuZGscoIw==
   dependencies:
     ansi-colors "^4.1.1"
     extend-object "^1.0.0"
@@ -49,181 +49,181 @@
     path "^0.12.7"
     rimraf "^3.0.2"
 
-"@abp/bootstrap-datepicker@~3.3.0":
+"@abp/bootstrap-datepicker@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.3.0.tgz#d7d11e591818a6ec654127d88602cfdfddf81b1f"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-3.3.1.tgz#c0f5763e0bfb1e293ef1b22f2a14014ec345dbc3"
-  integrity sha512-PUsS48o5Cwufn8O8d34UBsjLF6/HrgdhsGTUzrVIhGapiyuYD/QrvqWYWRUj1Jeeb4nrsRVem2DnM1isy+CUCA==
+  integrity sha512-MnX2vI75gEDtlwnKhI6ptH657dh5TuXoin1XeaEhOa5rGbLwhSu4IFqRmlLBedFBOf+1zwcvFs30vsQlNKJ6Nw==
   dependencies:
     bootstrap-datepicker "^1.9.0"
 
-"@abp/bootstrap@~3.3.0":
+"@abp/bootstrap@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.3.0.tgz#1314549e7a940c58fdff521a9ddf153f3414fffa"
+  resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-3.3.1.tgz#5b173918511b6ad1fb8ac570ea2e2fcb874970e0"
-  integrity sha512-CVjSwbZPjio0VJWxdo+PRkvUYGtv51DgVrqjgHK7m7tGFwHAK38cDHAl+mqmIp7dgPG1Z+E0o41JteT3Za1Bkw==
+  integrity sha512-CfnwXAV2XRK3gYpeEQjgVzEocU6pqdGZXwATwOKifHWBZNG8ubDyMgBed+oVCvJgRvLRrniR5jFK2vhm8Du+EQ==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     bootstrap "^4.5.0"
     bootstrap-v4-rtl "4.4.1-2"
 
-"@abp/clipboard@~3.3.0":
+"@abp/clipboard@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-3.3.0.tgz#44029c7bac7fe4f693ab3963515d300c49aa2d5e"
+  resolved "https://registry.yarnpkg.com/@abp/clipboard/-/clipboard-3.3.1.tgz#057381ecb3f5fb0744f2a742a4aff54294800439"
-  integrity sha512-YZKqjwZGue7o39GiuZf8WPEjt4ydQCSCG109fkIJQgbwjqkseeWPExJcYnogMSA4qWr4Ip1m3CQ17Yqtl1n8JA==
+  integrity sha512-iLtmLD/HXpHVWmLvbt2zY0EjZPmRLneCsT/gw07RWvy8iu+Hk8Cta8CD/Ak8RP5NdZkoYTO3Ojxdm7JUH0XN2g==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     clipboard "^2.0.6"
 
-"@abp/core@~3.3.0":
+"@abp/core@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.3.0.tgz#c88c28df19f96349b9a32b7ebe402e6d267c34e5"
+  resolved "https://registry.yarnpkg.com/@abp/core/-/core-3.3.1.tgz#b1da2160b0fc4a309dc4a65ee937c814de16b2de"
-  integrity sha512-y9P86zPAm55fAyKwDaoxv+IrApA339aaGEpN9364upeeNBsO8mYf9hoM136VovQaWNIABFHRD7R+9KskwPAuNA==
+  integrity sha512-6/6FHTLZrWh821O6xr4Sk1BlIt9gTAT19NnykQRV9U8S7rl4BQv2QF055R8Wg3lnVKWJ1ajiAbd3gerjH/pL6g==
   dependencies:
-    "@abp/utils" "^3.3.0"
+    "@abp/utils" "^3.3.1"
 
-"@abp/datatables.net-bs4@~3.3.0":
+"@abp/datatables.net-bs4@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.3.0.tgz#e4cc85f3c1c195d9e8b07532eb7c53619f40a787"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs4/-/datatables.net-bs4-3.3.1.tgz#fd0f5f5579ff94d635d19c1bf46ac0593639e3f4"
-  integrity sha512-StuwT8jGfDWGNXmYgRELuErXxSE+qjVoiSAkd27mZqDbYSTipq4OZSAHr6WNmoqMgP6QlCgjGgXcz4Pr8Pxuaw==
+  integrity sha512-C9BUlbsk9liJ+hmFpTKoearJNZISDy5TInTbnixL8WfXfIaAWdZRs+ADvhKO9+oWMxkbxhGI8ueYQ29Z1UJzMg==
   dependencies:
-    "@abp/datatables.net" "~3.3.0"
+    "@abp/datatables.net" "~3.3.1"
     datatables.net-bs4 "^1.10.21"
 
-"@abp/datatables.net@~3.3.0":
+"@abp/datatables.net@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.3.0.tgz#a2b2cedc06beb325e62ce6faba899c935564b9a7"
+  resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-3.3.1.tgz#2ec7406712607f08f0ae9a6ce0ee7bfd0cc73278"
-  integrity sha512-y0RGrLxI7VgWFAFtHAraDnrEJ5pkUIJ3zxEScS43RUbArhxk+5pIpxQbmU0WgHpk72H7WXdqtL486Kw8PSj1Nw==
+  integrity sha512-prsMkh//XCymCG/aYEEtzV/922RJIZ0+PcnRvhJzXvrX4DK2y3ZWM44QNR/9/rpkYUJqRcVoHqbt1DuxbHDLXQ==
   dependencies:
-    "@abp/jquery" "~3.3.0"
+    "@abp/jquery" "~3.3.1"
     datatables.net "^1.10.21"
 
-"@abp/docs@^3.3.0":
+"@abp/docs@^3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/docs/-/docs-3.3.0.tgz#65259049e6e891048bb2f9fb1606b9a8fe896555"
+  resolved "https://registry.yarnpkg.com/@abp/docs/-/docs-3.3.1.tgz#97c07bb4a436c63dcb9208d3075f131ee1e90a89"
-  integrity sha512-zBlextUI0VI8mBFJjH91tRFDZDCpcVP3nvB68z08idRhronlc7nB1tzeNfG0rxMh8palZlZtQwPVYUTLY4oKUw==
+  integrity sha512-ZUhm8ubt/zQQ9psp1dLTf4S1/DPo8rfc82nTH/EgRvbUsX3Qmwj+3McDFJNPzCqC7j/3162/j+flRZn9j0Vm3g==
   dependencies:
-    "@abp/anchor-js" "~3.3.0"
+    "@abp/anchor-js" "~3.3.1"
-    "@abp/clipboard" "~3.3.0"
+    "@abp/clipboard" "~3.3.1"
-    "@abp/malihu-custom-scrollbar-plugin" "~3.3.0"
+    "@abp/malihu-custom-scrollbar-plugin" "~3.3.1"
-    "@abp/popper.js" "~3.3.0"
+    "@abp/popper.js" "~3.3.1"
-    "@abp/prismjs" "~3.3.0"
+    "@abp/prismjs" "~3.3.1"
 
-"@abp/font-awesome@~3.3.0":
+"@abp/font-awesome@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.3.0.tgz#f9307334c34309456c47cc407fbe079821ace45e"
+  resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-3.3.1.tgz#268a21685a6b810b15848169b78c3dfb11d582c6"
-  integrity sha512-7/uZ2qXooHQZG35F6ERKsjI8m0gn8/BgE2cOB7Zhu5KRtSTOHOOXX4YWEfoHYLEMuo3xKTTJ2gHM3jiCJEpVtg==
+  integrity sha512-Eg2dwtcsyLo5E6PC21vK5R8YFe32UFSN4DpNrqAP9I85daR8ZbT0US8SbfCcI5nhiZlRi3EWj/cUgz2IEJHaaQ==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     "@fortawesome/fontawesome-free" "^5.13.0"
 
-"@abp/jquery-form@~3.3.0":
+"@abp/jquery-form@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.3.0.tgz#43fc5655b4e3cac7c0558fb36dd9ef188fe64412"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-3.3.1.tgz#4e8c2e50e711a7bbe4f40e74210472b21afd0ecf"
-  integrity sha512-fH4IPf/cU3ojWtVsPZjtymzK0xWqqgmvnSk5zy4AB4MOCKyYtPrn5OAMUvq8A4uZ0mGIRAQ8Z72wPKZA1rws5A==
+  integrity sha512-HBic6SzOSprYAug/Qbgcd+MiPRwtXczS2/x9IUmPFeUhvuqJJoYPWrhI5xC6WKNcJ/5MjExiEbeEXMXp8PwJTA==
   dependencies:
-    "@abp/jquery" "~3.3.0"
+    "@abp/jquery" "~3.3.1"
     jquery-form "^4.3.0"
 
-"@abp/jquery-validation-unobtrusive@~3.3.0":
+"@abp/jquery-validation-unobtrusive@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.3.0.tgz#0840f3114626a1d6efff54f4791776ebfdf56e76"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-3.3.1.tgz#e42d61a172b6ef5cbdbb305ab5d93e3dad5159a1"
-  integrity sha512-foKM9FDAY2RZGz5EQ2FcQt/FiL8sMc+uwd+2KeAdIejLyPgeSH/lLio6agd2Xun4e/xlBJB185Ga1eKcdHIGAw==
+  integrity sha512-SH8zmrR3HshCNP0zIgi4j6PMhgCzmCKk5xXxD+8kg+LAv+bm1iP0K5srgX4WlEffRma80QIeNKPpe/lW04EgFw==
   dependencies:
-    "@abp/jquery-validation" "~3.3.0"
+    "@abp/jquery-validation" "~3.3.1"
     jquery-validation-unobtrusive "^3.2.11"
 
-"@abp/jquery-validation@~3.3.0":
+"@abp/jquery-validation@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.3.0.tgz#2199968638d7bab9bfb6ba5e9f27d9d607c09a24"
+  resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-3.3.1.tgz#05164e342fdb83f40a17f000b40c27df2604c394"
-  integrity sha512-jxw274hx8i9+dkRrDz7aUpWSGESnJ2wuA6e3IAQIlubFf+7q0o4vosXD5bubinn4qaRGcSiYC15armfefgmFCw==
+  integrity sha512-oKN3wQUY1PB7IhelFIJVjRqAZx/AVlpUF0GV6k/9eNBK+ZoLpW1ebE1q9tsLhXf7QS1N7S45aEHB8OpjRopDew==
   dependencies:
-    "@abp/jquery" "~3.3.0"
+    "@abp/jquery" "~3.3.1"
     jquery-validation "^1.19.2"
 
-"@abp/jquery@~3.3.0":
+"@abp/jquery@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.3.0.tgz#b99a9436bf3c2394917e761a2dcdfe4f1af9ff3d"
+  resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-3.3.1.tgz#2e8431a52641ab85d1372a32518307bbf8fba1a0"
-  integrity sha512-WrjDQCBOi83kjtMYjXCJVWSbnFxKLW/KtDADkjTF7TxIGccsNWx6E8npzdCEnDnlOJ5Rk9+1QIu07pWedOjBSg==
+  integrity sha512-mSAUYLzhJSvq8ixhAFkU5Q2LRDTkJAGHq47alb2nNEodZNr1q1i+875nP3dE/4MLT/foG0H+j+r4RGuYx4fGAA==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     jquery "~3.5.1"
 
-"@abp/lodash@~3.3.0":
+"@abp/lodash@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.3.0.tgz#5402a779ef1e8ecd585644a68607425587560305"
+  resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-3.3.1.tgz#5c2602f03bde7fbf7841c01bb7178b3ca3429d87"
-  integrity sha512-QFm9hpWs0/J5TFFiE7vO5oxTsLgMcibmgg/CxYvmQZXhHGZpx3mdoAzC48CvRu8quxr6Xo8pIxlCyYXniR6/Dw==
+  integrity sha512-5fitYkotzaXGaEbwctVYT4HcfKZ1ghAnvrQLYI+2MYgIQmtipBhXFEG030zIXWThEoIGKOBuwVzmOYtwiX7+8w==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     lodash "^4.17.15"
 
-"@abp/luxon@~3.3.0":
+"@abp/luxon@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.3.0.tgz#2d669786308df997c6738dd205363edaae670d15"
+  resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-3.3.1.tgz#2e477be6a9f76394331399a762552bf610168e8e"
-  integrity sha512-1oSUuzgehSBxaxJLfD06ktXK4jisILPKFnEaKCBuPiKiQSDFvdQbepHAYJcpU1Jye6sVrheUKDUyJhnSwDb+0w==
+  integrity sha512-bp74vBmObbqUXsOc4VRWml5ivEyIzwHLR4oycLvWG0bQZn65yt7db7DVYTQL1PCWbEAKf6eULlnF6JvZpSVgeg==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     luxon "^1.24.1"
 
-"@abp/malihu-custom-scrollbar-plugin@~3.3.0":
+"@abp/malihu-custom-scrollbar-plugin@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.3.0.tgz#3bb48e0d68c0b76f3460eb19706927af2168a6c3"
+  resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-3.3.1.tgz#df833f2b8421f4dce681c13d2d5976680a27e4c8"
-  integrity sha512-44JvJOfxJ5ihfNCPyc5U8D8N8CmLh8UBMkzjH7YJQZJO+7PGgjx+uEqbQhTtBDftUz5C5oFkGoQ7i2pil7YSYQ==
+  integrity sha512-bJRQTevunQulXo+EC1HWqYgV30RVmFcS218DtdZLm2x/xWFBhvr+2DLzLS2Gq8JJXNGQMFbHnCWixn5si4V/KA==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     malihu-custom-scrollbar-plugin "^3.1.5"
 
-"@abp/popper.js@~3.3.0":
+"@abp/popper.js@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/popper.js/-/popper.js-3.3.0.tgz#53ff96017e2dea348ede0390d605cfe4d2981fcd"
+  resolved "https://registry.yarnpkg.com/@abp/popper.js/-/popper.js-3.3.1.tgz#4c7a7e0fee346d60a76dc50e82220b4e03bff839"
-  integrity sha512-SjADjLdKhUet2rM5oqr9VJcgIPBlxCQwYYUSZzB51Mwp30KFhx272rdww3J/khVbt6N7L/YTIL/FKC2iTqBGcQ==
+  integrity sha512-rSegW12pPBk3PaBfPVz7tH5fxP48A06xVVRq5ztYicHIHq1lpTJeXXZJf4QFMBvFtdaMOPPtQEL8wFRUM3OJJw==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     popper.js "^1.16.0"
 
-"@abp/prismjs@~3.3.0":
+"@abp/prismjs@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-3.3.0.tgz#88381eb65612c68d13dac02eb7e177a264a025ff"
+  resolved "https://registry.yarnpkg.com/@abp/prismjs/-/prismjs-3.3.1.tgz#3abe550b34aa957248f6b1e4543aab990561351e"
-  integrity sha512-YwVmPDtvWq8JwjZ4sGqnR2fhkzlcfhH2qO1RQsv9wpfFe61Mh/3mIC1QKFq5mW52cM3f8I51oC7z9HMbBo8n4A==
+  integrity sha512-4+BHvKDcJa8A3yKccUqyfDgr1eqVMGt9e9ie8HPHOGTG2y1XMAYipZJ22E+T8QvUxaeBBkkmpQ4dyAOpndHJJw==
   dependencies:
-    "@abp/clipboard" "~3.3.0"
+    "@abp/clipboard" "~3.3.1"
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     prismjs "^1.20.0"
 
-"@abp/select2@~3.3.0":
+"@abp/select2@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.3.0.tgz#207460dd128a1620c332af5eea2df88bfdfd0520"
+  resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-3.3.1.tgz#65ac0ae3ac8783d4e0422717ce743d573bf559e4"
-  integrity sha512-dbOnzQVARBQp/ynJvNyJqE1ArtsWCV8nGMUablB1ILPonsJy+0ADJ+GXWa1nIsHdj3zPW0MLi8pdqpepRCTAFg==
+  integrity sha512-efxhM/QxAmnyfGNcokZIK7vD6wYJkFGSnZEDj9QSrZ6DyUYf8H+jlK38JViDGe0RCMqts0R4B6IaKT0RbbIGmw==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     select2 "^4.0.13"
 
-"@abp/sweetalert@~3.3.0":
+"@abp/sweetalert@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.3.0.tgz#457a05af37819fc54082254022551ed0233c471e"
+  resolved "https://registry.yarnpkg.com/@abp/sweetalert/-/sweetalert-3.3.1.tgz#b6a41f8459d4407c4aee04e2f200b84e3fa8d534"
-  integrity sha512-6KXwPVC1zwNwlZBS9x0uPLTmieu3nmBp0G+ZH1aP+GTMphSa0ejI7nuPFqUeqfEMg+an1yj51SKKUfKtmlx6Zg==
+  integrity sha512-olDU9Lh5o0sNCxRXROwt8QhHpuB5+fjojVWVUOiag0UMLVA9k/fp38diyn64qddSHWCafpqjeO32IXDKEQckZA==
   dependencies:
-    "@abp/core" "~3.3.0"
+    "@abp/core" "~3.3.1"
     sweetalert "^2.1.2"
 
-"@abp/timeago@~3.3.0":
+"@abp/timeago@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.3.0.tgz#f0da23577630cec21255fc9c71dd2f7a3a3a3388"
+  resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-3.3.1.tgz#9759e09728fea082d28cd430cdc1af5b93f14720"
-  integrity sha512-f5sb4vxgGPyIzTj6lxDzUx/qJiC8pAqWPasdxHDMzhKlkRuFWO+GfblR5DC/sj9fQPcyV8+yX/VQPY3JW8i62Q==
+  integrity sha512-sIgSj3hZBl+oyO6rHc55YrIfqb4d2d2RlT6HU+OIsa2/BUAjTcW6WdPVUjXTreth2jyxEjXkfOKA3Sv5DvraGg==
   dependencies:
-    "@abp/jquery" "~3.3.0"
+    "@abp/jquery" "~3.3.1"
     timeago "^1.6.7"
 
-"@abp/toastr@~3.3.0":
+"@abp/toastr@~3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.3.0.tgz#c4f7d761eb4d93e993cb8e8cb54a0d670b20bdd3"
+  resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-3.3.1.tgz#06cf0b46e6430fae516aaff8707a5f5b16d6ed1d"
-  integrity sha512-GGqtVUCX8WalpkCnhiYUs+XxxBnhxGOLe87qFe/2tr0XNDJ3BSHXxiKynDetjlNAq/Qnf4U5P4Eg9FnHWFdWZg==
+  integrity sha512-LTf2NGwcG9ke571HMO7N4syhJijagnw/eIDl6ezflIQI/BnQqBKpXJ8xckCCqgryxfraBu4APMuSkPoDs2Ce5g==
   dependencies:
-    "@abp/jquery" "~3.3.0"
+    "@abp/jquery" "~3.3.1"
     toastr "^2.1.4"
 
-"@abp/utils@^3.3.0":
+"@abp/utils@^3.3.1":
-  version "3.3.0"
+  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.3.0.tgz#44ccacf4c415227e94981d907017de1c6f7225bb"
+  resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-3.3.1.tgz#f1759161ac8af10e57b50ac90538a24a51b64ebd"
-  integrity sha512-/JIcygVJu/Ob1G5IicL2XgOVjIIePC2t3QzgEbwaq6NDGMHiOm2quyS8Lj7TfjBeUFTJhCFEbXJMq0lGQ+KMww==
+  integrity sha512-XEYJYp94zDdln48P7X51wa4v1yg3Q+p0o2DdZxQbZxXChRkCwVC/B0uyMGPs75wkft6xiz965Xr7vcNvMo0nOA==
   dependencies:
     just-compare "^1.3.0"
 

modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/AbpFeatureManagementComponentBase.cs

@@ -0,0 +1,13 @@
+using Volo.Abp.AspNetCore.Components;
+using Volo.Abp.FeatureManagement.Localization;
+
+namespace Volo.Abp.FeatureManagement.Blazor
+{
+    public abstract class AbpFeatureManagementComponentBase : AbpComponentBase
+    {
+        protected AbpFeatureManagementComponentBase()
+        {
+            LocalizationResource = typeof(AbpFeatureManagementResource);
+        }
+    }
+}

modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor

@@ -1,6 +1,8 @@
 @using Volo.Abp.Validation.StringValues
 @using Microsoft.Extensions.Localization
 
+@inherits AbpFeatureManagementComponentBase
+
 <Modal @ref="Modal">
     <ModalBackdrop />
     <ModalContent Size="ModalSize.Large" IsCentered="true">
@@ -9,84 +11,80 @@
             <CloseButton Clicked="CloseModal" />
         </ModalHeader>
         <ModalBody MaxHeight="50">
-            <EditForm id="UpdateFeaturesForm" OnValidSubmit="SaveAsync">
+            @if (Groups == null)
-                @if (Groups == null)
+            {
-                {
+                <span>@L["NoFeatureFoundMessage"]</span>
-                    <span>@L["NoFeatureFoundMessage"]</span>
+            }
-                }
+            else
-                else
+            {
-                {
+                <Tabs TabPosition="TabPosition.Left" Pills="true" @bind-SelectedTab="@SelectedTabName">
-                    <Tabs TabPosition="TabPosition.Left" Pills="true" @bind-SelectedTab="@SelectedTabName">
+                    <Items>
-                        <Items>
+                        @foreach (var group in Groups)
-                            @foreach (var group in Groups)
+                        {
-                            {
+                            <Tab Name="@GetNormalizedGroupName(group.Name)">
-                                <Tab Name="@GetNormalizedGroupName(group.Name)">
+                                <span>@group.DisplayName</span>
-                                    <span>@group.DisplayName</span>
+                            </Tab>
-                                </Tab>
+                        }
-                            }
+                    </Items>
-                        </Items>
+                    <Content>
-                        <Content>
+                        @foreach (var group in Groups)
-                            @foreach (var group in Groups)
+                        {
-                            {
+                            <TabPanel Name="@GetNormalizedGroupName(group.Name)">
-                                <TabPanel Name="@GetNormalizedGroupName(group.Name)">
+                                <h4>@group.DisplayName</h4>
-                                    <h4>@group.DisplayName</h4>
+
-                                    
+                                @foreach (var feature in group.Features)
-                                    @foreach (var feature in group.Features)
+                                {
+                                    var disabled = IsDisabled(feature.Provider.Name);
+
+                                    if (feature.ValueType is FreeTextStringValueType)
                                     {
-                                        var disabled = IsDisabled(feature.Provider.Name);
+                                        <Field>
-                                        
+                                            <FieldLabel>@feature.DisplayName</FieldLabel>
-                                        if (feature.ValueType is FreeTextStringValueType)
+                                            <TextEdit Disabled="@disabled"
-                                        {
+                                                      Text="@feature.Value"
-                                            <Field>
+                                                      TextChanged="@(async(v) => await OnFeatureValueChangedAsync(v, feature))" />
-                                                <FieldLabel>@feature.DisplayName</FieldLabel>
+                                            @if (feature.Description != null)
-                                                <TextEdit 
+                                            {
-                                                    Disabled="@disabled" 
+                                                <span>@feature.Description</span>
-                                                    Text="@feature.Value"
+                                            }
-                                                    TextChanged="@(async(v) => await OnFeatureValueChangedAsync(v, feature))" />
+                                        </Field>
-                                                @if (feature.Description != null)
+                                    }
+
+                                    if (feature.ValueType is SelectionStringValueType)
+                                    {
+                                        var items = ((SelectionStringValueType)feature.ValueType).ItemSource.Items;
+
+                                        <Field>
+                                            <FieldLabel>@feature.DisplayName</FieldLabel>
+                                            <Select TValue="string"
+                                                    @bind-SelectedValue="@SelectionStringValues[feature.Name]">
+                                                @foreach (var item in items)
                                                 {
-                                                    <span>@feature.Description</span>
+                                                    <SelectItem Value="@item.Value">
+                                                        @CreateStringLocalizer(item.DisplayText.ResourceName).GetString(item.DisplayText.Name)
+                                                    </SelectItem>
                                                 }
-                                            </Field>
+                                            </Select>
-                                        }
+                                        </Field>
-    
+                                    }
-                                        if (feature.ValueType is SelectionStringValueType)
+
-                                        {
+                                    if (feature.ValueType is ToggleStringValueType)
-                                            var items = ((SelectionStringValueType) feature.ValueType).ItemSource.Items;
+                                    {
-                                            
+                                        <Field>
-                                            <Field>
+                                            <Check TValue="bool" @bind-checked="@ToggleValues[feature.Name]">@feature.DisplayName</Check>
-                                                <FieldLabel>@feature.DisplayName</FieldLabel>
+                                        </Field>
-                                                <Select 
-                                                    TValue="string"
-                                                    @bind-SelectedValue="@SelectionStringValues[feature.Name]">
-                                                    @foreach (var item in items)
-                                                    {
-                                                        <SelectItem Value="@item.Value">
-                                                            @CreateStringLocalizer(item.DisplayText.ResourceName).GetString(item.DisplayText.Name)
-                                                        </SelectItem>
-                                                    }
-                                                </Select>
-                                            </Field>
-                                        }
-    
-                                        if (feature.ValueType is ToggleStringValueType)
-                                        {
-                                            <Field>
-                                                <Check TValue="bool" @bind-checked="@ToggleValues[feature.Name]">@feature.DisplayName</Check>
-                                            </Field>
-                                        }
                                     }
-                                    
+                                }
-                                </TabPanel>
+
-                            }
+                            </TabPanel>
-                        </Content>
+                        }
-                    </Tabs>
+                    </Content>
-                }
+                </Tabs>
-            </EditForm>
+            }
         </ModalBody>
         <ModalFooter>
             <Button Color="Color.Secondary" Clicked="CloseModal">@L["Cancel"]</Button>
-            <Button form="UpdateFeaturesForm" Color="Color.Primary" Clicked="SaveAsync">@L["Save"]</Button>
+            <Button Color="Color.Primary" Clicked="SaveAsync">@L["Save"]</Button>
         </ModalFooter>
     </ModalContent>
 </Modal>

modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor.cs

@@ -20,8 +20,6 @@ namespace Volo.Abp.FeatureManagement.Blazor.Components
         
         [Inject] protected IUiMessageService UiMessageService { get; set; }
         
-        [Inject] protected IStringLocalizer<AbpFeatureManagementResource> L { get; set; }
-        
         [Inject] protected IStringLocalizerFactory HtmlLocalizerFactory { get; set; }
         
         [Inject] protected IOptions<AbpLocalizationOptions> LocalizationOptions { get; set; }

modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor

@@ -1,20 +1,22 @@
 @page "/identity/roles"
-@attribute [Authorize( IdentityPermissions.Roles.Default )]
+@attribute [Authorize(IdentityPermissions.Roles.Default)]
 @using Volo.Abp.Identity
 @using Microsoft.AspNetCore.Authorization
+@using Microsoft.AspNetCore.Components.Forms
+@using Volo.Abp.PermissionManagement.Blazor.Components
 @using Microsoft.Extensions.Localization
 @using Volo.Abp.Identity.Localization
-@using Volo.Abp.PermissionManagement.Blazor.Components
-@inherits RoleManagementBase
-@inject IStringLocalizer<IdentityResource> L
 @inject AbpIdentityBlazorMessageLocalizerHelper<IdentityResource> LH
+
+@inherits AbpCrudPageBase<IIdentityRoleAppService, IdentityRoleDto, Guid, GetIdentityRolesInput, IdentityRoleCreateDto, IdentityRoleUpdateDto>
+
 @* ************************* PAGE HEADER ************************* *@
 <Row>
     <Column ColumnSize="ColumnSize.Is6">
         <Heading Size="HeadingSize.Is1">@L["Roles"]</Heading>
     </Column>
     <Column ColumnSize="ColumnSize.Is6">
-        @if ( HasCreatePermission )
+        @if (HasCreatePermission)
         {
             <Paragraph Alignment="TextAlignment.Right">
                 <Button Color="Color.Primary" Clicked="OpenCreateModalAsync">@L["NewRole"]</Button>
@@ -31,40 +33,33 @@
           ShowPager="true"
           PageSize="PageSize">
     <DataGridColumns>
-        @if ( ShouldShowEntityActions )
+        <DataGridEntityActionsColumn TItem="IdentityRoleDto" @ref="@EntityActionsColumn">
-        {
+            <DisplayTemplate>
-            <DataGridColumn Width="150px" TItem="IdentityRoleDto" Field="@nameof(IdentityRoleDto.Name)" Sortable="false" Caption="@L["Actions"].Value">
+                <EntityActions TItem="IdentityRoleDto" EntityActionsColumn="@EntityActionsColumn">
-                <DisplayTemplate>
+                    <EntityAction TItem="IdentityRoleDto"
-                    <Dropdown>
+                                  RequiredPolicy="@UpdatePolicyName"
-                        <DropdownToggle Color="Color.Primary">
+                                  Clicked="() => OpenEditModalAsync(context.Id)"
-                            @L["Actions"]
+                                  Text="@L["Edit"]"></EntityAction>
-                        </DropdownToggle>
+                    <EntityAction TItem="IdentityRoleDto"
-                        <DropdownMenu>
+                                  RequiredPolicy="@ManagePermissionsPolicyName"
-                            @if ( HasUpdatePermission )
+                                  Clicked="() => PermissionManagementModal.OpenAsync(PermissionProviderName, context.Name)"
-                            {
+                                  Text="@L["Permissions"]"></EntityAction>
-                                <DropdownItem Clicked="() => OpenEditModalAsync(context.As<IdentityRoleDto>().Id)">@L["Edit"]</DropdownItem>
+                    <EntityAction TItem="IdentityRoleDto"
-                            }
+                                  RequiredPolicy="@DeletePolicyName"
-                            @if ( HasManagePermissionsPermission )
+                                  Clicked="() => DeleteEntityAsync(context)"
-                            {
+                                  ConfirmationMessage="()=> GetDeleteConfirmationMessage(context)"
-                                <DropdownItem Clicked="() => PermissionManagementModal.OpenAsync(PermissionProviderName, context.As<IdentityRoleDto>().Name)">@L["Permissions"]</DropdownItem>
+                                  Text="@L["Delete"]"></EntityAction>
-                            }
+                </EntityActions>
-                            @if ( HasDeletePermission )
+            </DisplayTemplate>
-                            {
+        </DataGridEntityActionsColumn>
-                                <DropdownItem Clicked="() => DeleteEntityAsync(context.As<IdentityRoleDto>())">@L["Delete"]</DropdownItem>
-                            }
-                        </DropdownMenu>
-                    </Dropdown>
-                </DisplayTemplate>
-            </DataGridColumn>
-        }
         <DataGridColumn TItem="IdentityRoleDto" Field="@nameof(IdentityRoleDto.Name)" Caption="@L["RoleName"].Value">
             <DisplayTemplate>
-                @(context.As<IdentityRoleDto>().Name)
+                @(context.Name)
-                @if ( context.As<IdentityRoleDto>().IsDefault )
+                @if (context.IsDefault)
                 {
                     <Badge Color="Color.Primary">@L["DisplayName:IsDefault"]</Badge>
                 }
-                @if ( context.As<IdentityRoleDto>().IsPublic )
+                @if (context.IsPublic)
                 {
                     <Badge Color="Color.Light">@L["DisplayName:IsPublic"]</Badge>
                 }
@@ -74,42 +69,42 @@
 </DataGrid>
 
 @* ************************* CREATE MODAL ************************* *@
-@if ( HasCreatePermission )
+@if (HasCreatePermission)
 {
-    <Modal @ref="CreateModal">
+<Modal @ref="CreateModal">
-        <ModalBackdrop />
+    <ModalBackdrop />
-        <ModalContent Centered="true">
+    <ModalContent Centered="true">
-            <ModalHeader>
+        <ModalHeader>
-                <ModalTitle>@L["NewRole"]</ModalTitle>
+            <ModalTitle>@L["NewRole"]</ModalTitle>
-                <CloseButton Clicked="CloseCreateModalAsync" />
+            <CloseButton Clicked="CloseCreateModalAsync" />
-            </ModalHeader>
+        </ModalHeader>
-            <ModalBody>
+        <ModalBody>
-                <Validations @ref="@CreateValidationsRef" Model="@NewEntity" ValidateOnLoad="false">
+            <Validations @ref="@CreateValidationsRef" Model="@NewEntity" ValidateOnLoad="false">
-                    <Validation MessageLocalizer="@LH.Localize">
+                <Validation MessageLocalizer="@LH.Localize">
-                        <Field>
-                            <FieldLabel>@L["DisplayName:RoleName"]</FieldLabel>
-                            <TextEdit @bind-Text="@NewEntity.Name">
-                                <Feedback>
-                                    <ValidationError />
-                                </Feedback>
-                            </TextEdit>
-                        </Field>
-                    </Validation>
                     <Field>
-                        <Check TValue="bool" @bind-Checked="@NewEntity.IsDefault">@L["DisplayName:IsDefault"]</Check>
+                        <FieldLabel>@L["DisplayName:RoleName"]</FieldLabel>
-                        <Check TValue="bool" @bind-Checked="@NewEntity.IsPublic">@L["DisplayName:IsPublic"]</Check>
+                        <TextEdit @bind-Text="@NewEntity.Name">
+                            <Feedback>
+                                <ValidationError />
+                            </Feedback>
+                        </TextEdit>
                     </Field>
-                </Validations>
+                </Validation>
-            </ModalBody>
+                <Field>
-            <ModalFooter>
+                    <Check TValue="bool" @bind-Checked="@NewEntity.IsDefault">@L["DisplayName:IsDefault"]</Check>
-                <Button Color="Color.Secondary" Clicked="CloseCreateModalAsync">@L["Cancel"]</Button>
+                    <Check TValue="bool" @bind-Checked="@NewEntity.IsPublic">@L["DisplayName:IsPublic"]</Check>
-                <Button Color="Color.Primary" Clicked="CreateEntityAsync">@L["Save"]</Button>
+                </Field>
-            </ModalFooter>
+            </Validations>
-        </ModalContent>
+        </ModalBody>
-    </Modal>
+        <ModalFooter>
+            <Button Color="Color.Secondary" Clicked="CloseCreateModalAsync">@L["Cancel"]</Button>
+            <Button Color="Color.Primary" Clicked="CreateEntityAsync">@L["Save"]</Button>
+        </ModalFooter>
+    </ModalContent>
+</Modal>
 }
 @* ************************* EDIT MODAL ************************* *@
-@if ( HasUpdatePermission )
+@if (HasUpdatePermission)
 {
     <Modal @ref="EditModal">
         <ModalBackdrop />

modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor.cs

@@ -1,24 +1,24 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using Blazorise;
 using Microsoft.AspNetCore.Authorization;
-using Volo.Abp.BlazoriseUI;
 using Volo.Abp.Identity.Localization;
 using Volo.Abp.PermissionManagement.Blazor.Components;
 
 namespace Volo.Abp.Identity.Blazor.Pages.Identity
 {
-    public abstract class RoleManagementBase : AbpCrudPageBase<IIdentityRoleAppService, IdentityRoleDto, Guid, GetIdentityRolesInput, IdentityRoleCreateDto, IdentityRoleUpdateDto>
+    public partial class RoleManagement
     {
         protected const string PermissionProviderName = "R";
 
         protected PermissionManagementModal PermissionManagementModal;
+        protected string ManagePermissionsPolicyName;
 
         protected bool HasManagePermissionsPermission { get; set; }
 
         protected bool ShouldShowEntityActions { get; set; }
 
-        public RoleManagementBase()
+        public RoleManagement()
         {
             ObjectMapperContext = typeof(AbpIdentityBlazorModule);
             LocalizationResource = typeof(IdentityResource);
@@ -26,19 +26,12 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity
             CreatePolicyName = IdentityPermissions.Roles.Create;
             UpdatePolicyName = IdentityPermissions.Roles.Update;
             DeletePolicyName = IdentityPermissions.Roles.Delete;
+            ManagePermissionsPolicyName = IdentityPermissions.Roles.ManagePermissions;
         }
 
-        protected async override Task SetPermissionsAsync()
+        protected override string GetDeleteConfirmationMessage(IdentityRoleDto entity)
         {
-            await base.SetPermissionsAsync();
+            return string.Format(L["RoleDeletionConfirmationMessage"], entity.Name);
-
-            HasManagePermissionsPermission = await AuthorizationService.IsGrantedAsync(
-                IdentityPermissions.Roles.ManagePermissions
-            );
-
-            ShouldShowEntityActions = HasUpdatePermission ||
-                                      HasDeletePermission ||
-                                      HasManagePermissionsPermission;
         }
     }
 }

modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor

@@ -1,11 +1,13 @@
 @page "/identity/users"
-@attribute [Authorize( IdentityPermissions.Users.Default )]
+@attribute [Authorize(IdentityPermissions.Users.Default)]
 @using Microsoft.AspNetCore.Authorization
+@using Microsoft.AspNetCore.Components.Forms
+@using Volo.Abp.PermissionManagement.Blazor.Components
 @using Microsoft.Extensions.Localization
 @using Volo.Abp.Identity.Localization
-@using Volo.Abp.PermissionManagement.Blazor.Components
+
-@inherits UserManagementBase
+@inherits AbpCrudPageBase<IIdentityUserAppService, IdentityUserDto, Guid, GetIdentityUsersInput, IdentityUserCreateDto, IdentityUserUpdateDto>
-@inject IStringLocalizer<IdentityResource> L
+
 @inject AbpIdentityBlazorMessageLocalizerHelper<IdentityResource> LH
 @* ************************* PAGE HEADER ************************* *@
 <Row>
@@ -13,7 +15,7 @@
         <h1>@L["Users"]</h1>
     </Column>
     <Column ColumnSize="ColumnSize.Is6">
-        @if ( HasCreatePermission )
+        @if (HasCreatePermission)
         {
             <Paragraph Alignment="TextAlignment.Right">
                 <Button Color="Color.Primary" Clicked="OpenCreateModalAsync">@L["NewUser"]</Button>
@@ -30,33 +32,25 @@
           ShowPager="true"
           PageSize="PageSize">
     <DataGridColumns>
-        @if ( ShouldShowEntityActions )
+        <DataGridEntityActionsColumn TItem="IdentityUserDto" @ref="@EntityActionsColumn">
-        {
+            <DisplayTemplate>
-            <DataGridColumn Width="150px" TItem="IdentityUserDto" Field="@nameof(IdentityUserDto.UserName)" Sortable="false" Caption="@L["Actions"].Value">
+                <EntityActions TItem="IdentityUserDto" EntityActionsColumn="@EntityActionsColumn">
-                <DisplayTemplate>
+                    <EntityAction TItem="IdentityUserDto"
-                    <Dropdown>
+                                  RequiredPolicy="@UpdatePolicyName"
-                        <DropdownToggle Color="Color.Primary">
+                                  Clicked="() => OpenEditModalAsync(context.Id)"
-                            @L["Actions"]
+                                  Text="@L["Edit"]" />
-                        </DropdownToggle>
+                    <EntityAction TItem="IdentityUserDto"
-                        <DropdownMenu>
+                                  RequiredPolicy="@ManagePermissionsPolicyName"
-                            @if ( HasUpdatePermission )
+                                  Clicked="() => PermissionManagementModal.OpenAsync(PermissionProviderName, context.Id.ToString())"
-                            {
+                                  Text="@L["Permissions"]" />
-                                <DropdownItem Clicked="() => OpenEditModalAsync(context.As<IdentityUserDto>().Id)">@L["Edit"]</DropdownItem>
+                    <EntityAction TItem="IdentityUserDto"
-                            }
+                                  RequiredPolicy="@DeletePolicyName"
-                            @if ( HasManagePermissionsPermission )
+                                  Clicked="() => DeleteEntityAsync(context)"
-                            {
+                                  ConfirmationMessage="()=>GetDeleteConfirmationMessage(context)"
-                                <DropdownItem Clicked="() => PermissionManagementModal.OpenAsync(PermissionProviderName, context.As<IdentityUserDto>().Id.ToString())">@L["Permissions"]</DropdownItem>
+                                  Text="@L["Delete"]" />
-                            }
+                </EntityActions>
-                            @if ( HasDeletePermission )
+            </DisplayTemplate>
-                            {
+        </DataGridEntityActionsColumn>
-                                <DropdownDivider />
-                                <DropdownItem Clicked="() => DeleteEntityAsync(context.As<IdentityUserDto>())">@L["Delete"]</DropdownItem>
-                            }
-                        </DropdownMenu>
-                    </Dropdown>
-                </DisplayTemplate>
-            </DataGridColumn>
-        }
         <DataGridColumn TItem="IdentityUserDto" Field="@nameof(IdentityUserDto.UserName)" Caption="@L["UserName"].Value">
             <DisplayTemplate>
                 @(context.As<IdentityUserDto>().UserName)
@@ -76,7 +70,7 @@
 </DataGrid>
 
 @* ************************* CREATE MODAL ************************* *@
-@if ( HasCreatePermission )
+@if (HasCreatePermission)
 {
     <Modal @ref="CreateModal">
         <ModalBackdrop />
@@ -159,9 +153,9 @@
                                 </Field>
                             </TabPanel>
                             <TabPanel Name="Roles">
-                                @if ( NewUserRoles != null )
+                                @if (NewUserRoles != null)
                                 {
-                                    @foreach ( var role in NewUserRoles )
+                                    @foreach (var role in NewUserRoles)
                                     {
                                         <Field>
                                             <input type="hidden" @bind-value="@role.Name" />
@@ -183,7 +177,7 @@
 }
 
 @* ************************* EDIT MODAL ************************* *@
-@if ( HasUpdatePermission )
+@if (HasUpdatePermission)
 {
     <Modal @ref="EditModal">
         <ModalBackdrop />
@@ -268,9 +262,9 @@
                                 </Field>
                             </TabPanel>
                             <TabPanel Name="Roles">
-                                @if ( EditUserRoles != null )
+                                @if (EditUserRoles != null)
                                 {
-                                    @foreach ( var role in EditUserRoles )
+                                    @foreach (var role in EditUserRoles)
                                     {
                                         <Field>
                                             <input type="hidden" @bind-value="@role.Name" />

modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs

@@ -4,13 +4,12 @@ using System.Linq;
 using System.Threading.Tasks;
 using Blazorise;
 using Microsoft.AspNetCore.Authorization;
-using Volo.Abp.BlazoriseUI;
 using Volo.Abp.Identity.Localization;
 using Volo.Abp.PermissionManagement.Blazor.Components;
 
 namespace Volo.Abp.Identity.Blazor.Pages.Identity
 {
-    public abstract class UserManagementBase : AbpCrudPageBase<IIdentityUserAppService, IdentityUserDto, Guid, GetIdentityUsersInput, IdentityUserCreateDto, IdentityUserUpdateDto>
+    public partial class UserManagement
     {
         protected const string PermissionProviderName = "U";
 
@@ -24,14 +23,13 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity
 
         protected AssignedRoleViewModel[] EditUserRoles;
 
-        protected bool ShouldShowEntityActions { get; set; }
+        protected string ManagePermissionsPolicyName;
-        protected bool HasManagePermissionsPermission { get; set; }
 
         protected string CreateModalSelectedTab = DefaultSelectedTab;
 
         protected string EditModalSelectedTab = DefaultSelectedTab;
 
-        public UserManagementBase()
+        public UserManagement()
         {
             ObjectMapperContext = typeof(AbpIdentityBlazorModule);
             LocalizationResource = typeof(IdentityResource);
@@ -39,6 +37,7 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity
             CreatePolicyName = IdentityPermissions.Users.Create;
             UpdatePolicyName = IdentityPermissions.Users.Update;
             DeletePolicyName = IdentityPermissions.Users.Delete;
+            ManagePermissionsPolicyName = IdentityPermissions.Users.ManagePermissions;
         }
 
         protected async override Task OnInitializedAsync()
@@ -48,20 +47,8 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity
             Roles = (await AppService.GetAssignableRolesAsync()).Items;
         }
 
-        protected async override Task SetPermissionsAsync()
-        {
-            await base.SetPermissionsAsync();
-
-            HasManagePermissionsPermission = await AuthorizationService.IsGrantedAsync(
-                IdentityPermissions.Users.ManagePermissions
-            );
-
-            ShouldShowEntityActions = HasUpdatePermission ||
-                                      HasDeletePermission ||
-                                      HasManagePermissionsPermission;
-        }
 
-        protected override async Task OnOpeningCreateModalAsync()
+        protected override Task OpenCreateModalAsync()
         {
             CreateModalSelectedTab = DefaultSelectedTab;
 
@@ -71,7 +58,7 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity
                 IsAssigned = x.IsDefault
             }).ToArray();
 
-            await base.OnOpeningCreateModalAsync();
+            return base.OpenCreateModalAsync();
         }
 
         protected override Task OnCreatingEntityAsync()
@@ -94,7 +81,7 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity
                 IsAssigned = userRoleNames.Contains(x.Name)
             }).ToArray();
 
-            await base.OnOpeningEditModalAsync(id);
+            await base.OpenEditModalAsync(id);
         }
 
         protected override Task OnUpdatingEntityAsync()
@@ -104,6 +91,11 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity
 
             return base.OnUpdatingEntityAsync();
         }
+
+        protected override string GetDeleteConfirmationMessage(IdentityUserDto entity)
+        {
+            return string.Format(L["UserDeletionConfirmationMessage"], entity.UserName);
+        }
     }
 
     public class AssignedRoleViewModel

modules/identity/src/Volo.Abp.Identity.Blazor/_Imports.razor

@@ -2,5 +2,6 @@
 @using Volo.Abp.AspNetCore.Components.WebAssembly
 @using Microsoft.AspNetCore.Components.Forms
 @using Volo.Abp.BlazoriseUI
+@using Volo.Abp.BlazoriseUI.Components
 @using Blazorise
 @using Blazorise.DataGrid

modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/SettingManagement.razor

@@ -1,5 +1,5 @@
 @page "/setting-management"
-@inherits SettingManagementBase
+
 @* ************************* PAGE HEADER ************************* *@
 <PageHeader Title="@L["Settings"]" BreadcrumbItems="@BreadcrumbItems">
 

modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/SettingManagement.razor.cs

@@ -10,7 +10,7 @@ using Volo.Abp.SettingManagement.Localization;
 
 namespace Volo.Abp.SettingManagement.Blazor.Pages.SettingManagement
 {
-    public abstract class SettingManagementBase : OwningComponentBase
+    public partial class SettingManagement
     {
         [Inject]
         protected IServiceProvider ServiceProvider { get; set; }
@@ -44,7 +44,7 @@ namespace Volo.Abp.SettingManagement.Blazor.Pages.SettingManagement
             BreadcrumbItems.Add(new BreadcrumbItem(L["Settings"]));
         }
 
-        protected string GetNormalizedString(string value)
+        protected virtual string GetNormalizedString(string value)
         {
             return value.Replace('.', '_');
         }

modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor

@@ -1,11 +1,10 @@
 @page "/tenant-management/tenants"
 @attribute [Authorize(TenantManagementPermissions.Tenants.Default)]
 @using Microsoft.AspNetCore.Authorization
-@using Microsoft.Extensions.Localization
-@using Volo.Abp.TenantManagement.Localization
 @using Volo.Abp.FeatureManagement.Blazor.Components
-@inherits TenantManagementBase
+@using Microsoft.AspNetCore.Components.Forms
-@inject IStringLocalizer<AbpTenantManagementResource> L
+
+@inherits AbpCrudPageBase<ITenantAppService, TenantDto, Guid, GetTenantsInput, TenantCreateDto, TenantUpdateDto>
 
 @* ************************* PAGE HEADER ************************* *@
 <Row>
@@ -30,40 +29,32 @@
           ShowPager="true"
           PageSize="PageSize">
     <DataGridColumns>
-        @if (ShouldShowEntityActions)
+        <DataGridEntityActionsColumn TItem="TenantDto" @ref="@EntityActionsColumn">
-        {
+            <DisplayTemplate>
-            <DataGridColumn Width="150px" TItem="TenantDto" Field="@nameof(TenantDto.Name)" Sortable="false" Caption="@L["Actions"].Value">
+                <EntityActions TItem="TenantDto" EntityActionsColumn="@EntityActionsColumn">
-                <DisplayTemplate>
+                    <EntityAction TItem="TenantDto"
-                    <Dropdown>
+                                  RequiredPolicy="@UpdatePolicyName"
-                        <DropdownToggle Color="Color.Primary">
+                                  Clicked="() => OpenEditModalAsync(context.Id)"
-                            @L["Actions"]
+                                  Text="@L["Edit"]"></EntityAction>
-                        </DropdownToggle>
+                    <EntityAction TItem="TenantDto"
-                        <DropdownMenu>
+                                  RequiredPolicy="@ManageConnectionStringsPolicyName"
-                            @if (HasUpdatePermission)
+                                  Clicked="() => OpenEditConnectionStringModalAsync(context.Id)"
-                            {
+                                  Text="@L["ConnectionStrings"]"></EntityAction>
-                                <DropdownItem Clicked="() => OpenEditModalAsync(context.As<TenantDto>().Id)">@L["Edit"]</DropdownItem>
+                    <EntityAction TItem="TenantDto"
-                            }
+                                  RequiredPolicy="@ManageFeaturesPolicyName"
-                            @if (HasManageConnectionStringsPermission)
+                                  Clicked="() => FeatureManagementModal.OpenAsync(FeatureProviderName, context.Id.ToString())"
-                            {
+                                  Text="@L["Features"]"></EntityAction>
-                                <DropdownItem Clicked="() => OpenEditConnectionStringModalAsync(context.As<TenantDto>().Id)">@L["ConnectionStrings"]</DropdownItem>
+                    <EntityAction TItem="TenantDto"
-                            }
+                                  RequiredPolicy="@DeletePolicyName"
-                            @if (HasManageFeaturesPermission)
+                                  Clicked="() => DeleteEntityAsync(context)"
-                            {
+                                  ConfirmationMessage="()=>GetDeleteConfirmationMessage(context)"
-                                <DropdownItem Clicked="() => FeatureManagementModal.OpenAsync(FeatureProviderName, context.As<TenantDto>().Id.ToString())">@L["Features"]</DropdownItem>
+                                  Text="@L["Delete"]"></EntityAction>
-                            }
+                </EntityActions>
-                            @if (HasDeletePermission)
+            </DisplayTemplate>
-                            {
+        </DataGridEntityActionsColumn>
-                                <DropdownDivider/>
-                                <DropdownItem Clicked="() => DeleteEntityAsync(context.As<TenantDto>())">@L["Delete"]</DropdownItem>
-                            }
-                        </DropdownMenu>
-                    </Dropdown>
-                </DisplayTemplate>
-            </DataGridColumn>
-        }
         <DataGridColumn TItem="TenantDto" Field="@nameof(TenantDto.Name)" Caption="@L["TenantName"].Value">
             <DisplayTemplate>
-                @(context.As<TenantDto>().Name)
+                @(context.Name)
             </DisplayTemplate>
         </DataGridColumn>
     </DataGridColumns>
@@ -73,25 +64,25 @@
 @if (HasCreatePermission)
 {
     <Modal @ref="CreateModal">
-        <ModalBackdrop/>
+        <ModalBackdrop />
         <ModalContent IsCentered="true">
             <ModalHeader>
                 <ModalTitle>@L["NewTenant"]</ModalTitle>
-                <CloseButton Clicked="CloseCreateModalAsync"/>
+                <CloseButton Clicked="CloseCreateModalAsync" />
             </ModalHeader>
             <ModalBody>
                 <EditForm id="TenantCreateForm" Model="@NewEntity" OnValidSubmit="CreateEntityAsync">
                     <Field>
                         <FieldLabel>@L["TenantName"]</FieldLabel>
-                        <TextEdit @bind-text="@NewEntity.Name"/>
+                        <TextEdit @bind-text="@NewEntity.Name" />
                     </Field>
                     <Field>
                         <FieldLabel>@L["DisplayName:AdminEmailAddress"]</FieldLabel>
-                        <TextEdit Role="@TextRole.Email" @bind-text="@NewEntity.AdminEmailAddress"/>
+                        <TextEdit Role="@TextRole.Email" @bind-text="@NewEntity.AdminEmailAddress" />
                     </Field>
                     <Field>
                         <FieldLabel>@L["DisplayName:AdminPassword"]</FieldLabel>
-                        <TextEdit Role="@TextRole.Password" @bind-text="@NewEntity.AdminPassword"/>
+                        <TextEdit Role="@TextRole.Password" @bind-text="@NewEntity.AdminPassword" />
                     </Field>
                 </EditForm>
             </ModalBody>
@@ -107,17 +98,17 @@
 @if (HasUpdatePermission)
 {
     <Modal @ref="EditModal">
-        <ModalBackdrop/>
+        <ModalBackdrop />
         <ModalContent IsCentered="true">
             <ModalHeader>
                 <ModalTitle>@L["Edit"]</ModalTitle>
-                <CloseButton Clicked="CloseEditModalAsync"/>
+                <CloseButton Clicked="CloseEditModalAsync" />
             </ModalHeader>
             <ModalBody>
                 <EditForm id="TenantEditForm" Model="@EditingEntity" OnValidSubmit="UpdateEntityAsync">
                     <Field>
                         <FieldLabel>@L["TenantName"]</FieldLabel>
-                        <TextEdit @bind-text="@EditingEntity.Name"/>
+                        <TextEdit @bind-text="@EditingEntity.Name" />
                     </Field>
                 </EditForm>
             </ModalBody>
@@ -133,11 +124,11 @@
 @if (HasUpdatePermission)
 {
     <Modal @ref="@ManageConnectionStringModal">
-        <ModalBackdrop/>
+        <ModalBackdrop />
         <ModalContent IsCentered="true">
             <ModalHeader>
                 <ModalTitle>@L["ConnectionStrings"]</ModalTitle>
-                <CloseButton Clicked="CloseEditConnectionStringModal"/>
+                <CloseButton Clicked="CloseEditConnectionStringModal" />
             </ModalHeader>
             <ModalBody>
                 <EditForm id="ConnectionStringEditForm" Model="@TenantInfo" OnValidSubmit="UpdateConnectionStringAsync">
@@ -149,7 +140,7 @@
                     {
                         <Field>
                             <FieldLabel>@L["DisplayName:DefaultConnectionString"]</FieldLabel>
-                            <TextEdit @bind-text="@TenantInfo.DefaultConnectionString"/>
+                            <TextEdit @bind-text="@TenantInfo.DefaultConnectionString" />
                         </Field>
                     }
                 </EditForm>
@@ -164,5 +155,5 @@
 
 @if (HasManageFeaturesPermission)
 {
-    <FeatureManagementModal @ref="FeatureManagementModal"/>
+    <FeatureManagementModal @ref="FeatureManagementModal" />
 }

modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs

@@ -4,32 +4,36 @@ using Blazorise;
 using Microsoft.AspNetCore.Authorization;
 using Volo.Abp.BlazoriseUI;
 using Volo.Abp.FeatureManagement.Blazor.Components;
+using Volo.Abp.TenantManagement.Localization;
 
 namespace Volo.Abp.TenantManagement.Blazor.Pages.TenantManagement
 {
-    public abstract class TenantManagementBase 
+    public partial class TenantManagement
-        : AbpCrudPageBase<ITenantAppService, TenantDto, Guid, GetTenantsInput, TenantCreateDto, TenantUpdateDto>
     {
         protected const string FeatureProviderName = "T";
-        
+
-        protected bool ShouldShowEntityActions;
         protected bool HasManageConnectionStringsPermission;
         protected bool HasManageFeaturesPermission;
+        protected string ManageConnectionStringsPolicyName;
+        protected string ManageFeaturesPolicyName;
 
         protected FeatureManagementModal FeatureManagementModal;
-        
+
         protected Modal ManageConnectionStringModal;
 
         protected TenantInfoModel TenantInfo;
         
-        public TenantManagementBase()
+        public TenantManagement()
         {
+            LocalizationResource = typeof(AbpTenantManagementResource);
             ObjectMapperContext = typeof(AbpTenantManagementBlazorModule);
 
             CreatePolicyName = TenantManagementPermissions.Tenants.Create;
             UpdatePolicyName = TenantManagementPermissions.Tenants.Update;
             DeletePolicyName = TenantManagementPermissions.Tenants.Delete;
-            
+            ManageConnectionStringsPolicyName = TenantManagementPermissions.Tenants.ManageConnectionStrings;
+            ManageFeaturesPolicyName = TenantManagementPermissions.Tenants.ManageFeatures;
+
             TenantInfo = new TenantInfoModel();
         }
         
@@ -37,29 +41,24 @@ namespace Volo.Abp.TenantManagement.Blazor.Pages.TenantManagement
         {
             await base.SetPermissionsAsync();
 
-            HasManageConnectionStringsPermission = await AuthorizationService.IsGrantedAsync(TenantManagementPermissions.Tenants.ManageConnectionStrings);
+            HasManageConnectionStringsPermission = await AuthorizationService.IsGrantedAsync(ManageConnectionStringsPolicyName);
-            HasManageFeaturesPermission = await AuthorizationService.IsGrantedAsync(TenantManagementPermissions.Tenants.ManageFeatures);
+            HasManageFeaturesPermission = await AuthorizationService.IsGrantedAsync(ManageFeaturesPolicyName);
-            
-            ShouldShowEntityActions = HasUpdatePermission ||
-                                      HasDeletePermission ||
-                                      HasManageConnectionStringsPermission ||
-                                      HasManageFeaturesPermission;
         }
 
         protected virtual async Task OpenEditConnectionStringModalAsync(Guid id)
         {
             var tenantConnectionString = await AppService.GetDefaultConnectionStringAsync(id);
-            
+
             TenantInfo = new TenantInfoModel
             {
                 Id = id,
                 DefaultConnectionString = tenantConnectionString,
                 UseSharedDatabase = tenantConnectionString.IsNullOrWhiteSpace()
             };
-            
+
             ManageConnectionStringModal.Show();
         }
-        
+
         protected virtual Task CloseEditConnectionStringModal()
         {
             ManageConnectionStringModal.Hide();
@@ -68,7 +67,7 @@ namespace Volo.Abp.TenantManagement.Blazor.Pages.TenantManagement
 
         protected virtual async Task UpdateConnectionStringAsync()
         {
-            await CheckPolicyAsync(TenantManagementPermissions.Tenants.ManageConnectionStrings);
+            await CheckPolicyAsync(ManageConnectionStringsPolicyName);
 
             if (TenantInfo.UseSharedDatabase || TenantInfo.DefaultConnectionString.IsNullOrWhiteSpace())
             {
@@ -78,9 +77,14 @@ namespace Volo.Abp.TenantManagement.Blazor.Pages.TenantManagement
             {
                 await AppService.UpdateDefaultConnectionStringAsync(TenantInfo.Id, TenantInfo.DefaultConnectionString);
             }
-            
+
             ManageConnectionStringModal.Hide();
         }
+
+        protected override string GetDeleteConfirmationMessage(TenantDto entity)
+        {
+            return string.Format(L["TenantDeletionConfirmationMessage"], entity.Name);
+        }
     }
 
     public class TenantInfoModel
@@ -88,7 +92,7 @@ namespace Volo.Abp.TenantManagement.Blazor.Pages.TenantManagement
         public Guid Id { get; set; }
 
         public bool UseSharedDatabase { get; set; }
-        
+
         public string DefaultConnectionString { get; set; }
     }
 }

modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/_Imports.razor

@@ -2,5 +2,6 @@
 @using Volo.Abp.AspNetCore.Components.WebAssembly
 @using Microsoft.AspNetCore.Components.Forms
 @using Volo.Abp.BlazoriseUI
+@using Volo.Abp.BlazoriseUI.Components
 @using Blazorise
 @using Blazorise.DataGrid

npm/lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.3.0",
+  "version": "3.3.1",
   "packages": [
     "packs/*"
   ],

npm/ng-packs/lerna.version.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.3.0",
+  "version": "3.3.1",
   "packages": [
     "packages/*"
   ],

npm/ng-packs/package.json

@@ -25,17 +25,17 @@
     "postinstall": "npm run compile:ivy"
   },
   "devDependencies": {
-    "@abp/ng.account": "~3.3.0",
+    "@abp/ng.account": "~3.3.1",
-    "@abp/ng.core": "~3.3.0",
+    "@abp/ng.core": "~3.3.1",
-    "@abp/ng.feature-management": "~3.3.0",
+    "@abp/ng.feature-management": "~3.3.1",
-    "@abp/ng.identity": "~3.3.0",
+    "@abp/ng.identity": "~3.3.1",
-    "@abp/ng.permission-management": "~3.3.0",
+    "@abp/ng.permission-management": "~3.3.1",
-    "@abp/ng.schematics": "~3.3.0",
+    "@abp/ng.schematics": "~3.3.1",
-    "@abp/ng.setting-management": "~3.3.0",
+    "@abp/ng.setting-management": "~3.3.1",
-    "@abp/ng.tenant-management": "~3.3.0",
+    "@abp/ng.tenant-management": "~3.3.1",
-    "@abp/ng.theme.basic": "~3.3.0",
+    "@abp/ng.theme.basic": "~3.3.1",
-    "@abp/ng.theme.shared": "~3.3.0",
+    "@abp/ng.theme.shared": "~3.3.1",
-    "@abp/utils": "^3.3.0",
+    "@abp/utils": "^3.3.1",
     "@angular-builders/jest": "^10.0.0",
     "@angular-devkit/build-angular": "~0.1001.2",
     "@angular-devkit/build-ng-packagr": "~0.1001.2",

npm/ng-packs/packages/account/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@abp/ng.account",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.theme.shared": "~3.3.0",
+    "@abp/ng.theme.shared": "~3.3.1",
     "tslib": "^2.0.0"
   },
   "publishConfig": {

npm/ng-packs/packages/components/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@abp/ng.components",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "peerDependencies": {
-    "@abp/ng.core": ">=3.3.0",
+    "@abp/ng.core": ">=3.3.1",
     "@ng-bootstrap/ng-bootstrap": ">=6.0.0"
   },
   "dependencies": {

npm/ng-packs/packages/core/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@abp/ng.core",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/utils": "^3.3.0",
+    "@abp/utils": "^3.3.1",
     "@angular/localize": "~10.0.10",
     "@ngxs/router-plugin": "^3.7.0",
     "@ngxs/storage-plugin": "^3.7.0",

npm/ng-packs/packages/feature-management/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@abp/ng.feature-management",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.theme.shared": "~3.3.0",
+    "@abp/ng.theme.shared": "~3.3.1",
     "tslib": "^2.0.0"
   },
   "publishConfig": {

npm/ng-packs/packages/identity/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@abp/ng.identity",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.permission-management": "~3.3.0",
+    "@abp/ng.permission-management": "~3.3.1",
-    "@abp/ng.theme.shared": "~3.3.0",
+    "@abp/ng.theme.shared": "~3.3.1",
     "tslib": "^2.0.0"
   },
   "publishConfig": {

npm/ng-packs/packages/permission-management/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@abp/ng.permission-management",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.theme.shared": "~3.3.0",
+    "@abp/ng.theme.shared": "~3.3.1",
     "tslib": "^2.0.0"
   },
   "publishConfig": {

npm/ng-packs/packages/schematics/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abp/ng.schematics",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "description": "Schematics that works with ABP Backend",
   "keywords": [
     "schematics"

npm/ng-packs/packages/setting-management/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@abp/ng.setting-management",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.theme.shared": "~3.3.0",
+    "@abp/ng.theme.shared": "~3.3.1",
     "tslib": "^2.0.0"
   },
   "publishConfig": {

npm/ng-packs/packages/tenant-management/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@abp/ng.tenant-management",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.feature-management": "~3.3.0",
+    "@abp/ng.feature-management": "~3.3.1",
-    "@abp/ng.theme.shared": "~3.3.0",
+    "@abp/ng.theme.shared": "~3.3.1",
     "tslib": "^2.0.0"
   },
   "publishConfig": {

npm/ng-packs/packages/theme-basic/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@abp/ng.theme.basic",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.theme.shared": "~3.3.0",
+    "@abp/ng.theme.shared": "~3.3.1",
     "tslib": "^2.0.0"
   },
   "publishConfig": {

npm/ng-packs/packages/theme-shared/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@abp/ng.theme.shared",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "homepage": "https://abp.io",
   "repository": {
     "type": "git",
     "url": "https://github.com/abpframework/abp.git"
   },
   "dependencies": {
-    "@abp/ng.core": "~3.3.0",
+    "@abp/ng.core": "~3.3.1",
     "@fortawesome/fontawesome-free": "^5.14.0",
     "@ng-bootstrap/ng-bootstrap": "^7.0.0",
     "@ngx-validate/core": "^0.0.12",

npm/packs/anchor-js/package.json

@@ -1,11 +1,11 @@
 {
-  "version": "3.3.0",
+  "version": "3.3.1",
   "name": "@abp/anchor-js",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "~3.3.0",
+    "@abp/core": "~3.3.1",
     "anchor-js": "^4.2.2"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"

npm/packs/aspnetcore.mvc.ui.theme.basic/package.json

@@ -1,11 +1,11 @@
 {
-  "version": "3.3.0",
+  "version": "3.3.1",
   "name": "@abp/aspnetcore.mvc.ui.theme.basic",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.shared": "~3.3.0"
+    "@abp/aspnetcore.mvc.ui.theme.shared": "~3.3.1"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
 }

npm/packs/aspnetcore.mvc.ui.theme.shared/package.json

@@ -1,24 +1,24 @@
 {
-  "version": "3.3.0",
+  "version": "3.3.1",
   "name": "@abp/aspnetcore.mvc.ui.theme.shared",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui": "~3.3.0",
+    "@abp/aspnetcore.mvc.ui": "~3.3.1",
-    "@abp/bootstrap": "~3.3.0",
+    "@abp/bootstrap": "~3.3.1",
-    "@abp/bootstrap-datepicker": "~3.3.0",
+    "@abp/bootstrap-datepicker": "~3.3.1",
-    "@abp/datatables.net-bs4": "~3.3.0",
+    "@abp/datatables.net-bs4": "~3.3.1",
-    "@abp/font-awesome": "~3.3.0",
+    "@abp/font-awesome": "~3.3.1",
-    "@abp/jquery-form": "~3.3.0",
+    "@abp/jquery-form": "~3.3.1",
-    "@abp/jquery-validation-unobtrusive": "~3.3.0",
+    "@abp/jquery-validation-unobtrusive": "~3.3.1",
-    "@abp/lodash": "~3.3.0",
+    "@abp/lodash": "~3.3.1",
-    "@abp/luxon": "~3.3.0",
+    "@abp/luxon": "~3.3.1",
-    "@abp/malihu-custom-scrollbar-plugin": "~3.3.0",
+    "@abp/malihu-custom-scrollbar-plugin": "~3.3.1",
-    "@abp/select2": "~3.3.0",
+    "@abp/select2": "~3.3.1",
-    "@abp/sweetalert": "~3.3.0",
+    "@abp/sweetalert": "~3.3.1",
-    "@abp/timeago": "~3.3.0",
+    "@abp/timeago": "~3.3.1",
-    "@abp/toastr": "~3.3.0"
+    "@abp/toastr": "~3.3.1"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
 }

npm/packs/aspnetcore.mvc.ui/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.3.0",
+  "version": "3.3.1",
   "name": "@abp/aspnetcore.mvc.ui",
   "publishConfig": {
     "access": "public"

npm/packs/blogging/package.json

@@ -1,14 +1,14 @@
 {
-  "version": "3.3.0",
+  "version": "3.3.1",
   "name": "@abp/blogging",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.shared": "~3.3.0",
+    "@abp/aspnetcore.mvc.ui.theme.shared": "~3.3.1",
-    "@abp/owl.carousel": "~3.3.0",
+    "@abp/owl.carousel": "~3.3.1",
-    "@abp/prismjs": "~3.3.0",
+    "@abp/prismjs": "~3.3.1",
-    "@abp/tui-editor": "~3.3.0"
+    "@abp/tui-editor": "~3.3.1"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
 }

npm/packs/bootstrap-datepicker/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.3.0",
+  "version": "3.3.1",
   "name": "@abp/bootstrap-datepicker",
   "publishConfig": {
     "access": "public"

npm/packs/bootstrap/package.json

@@ -1,11 +1,11 @@
 {
-  "version": "3.3.0",
+  "version": "3.3.1",
   "name": "@abp/bootstrap",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "~3.3.0",
+    "@abp/core": "~3.3.1",
     "bootstrap": "^4.5.0",
     "bootstrap-v4-rtl": "4.4.1-2"
   },

npm/packs/chart.js/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.3.0",
+  "version": "3.3.1",
   "name": "@abp/chart.js",
   "publishConfig": {
     "access": "public"

npm/packs/clipboard/package.json

@@ -1,11 +1,11 @@
 {
-  "version": "3.3.0",
+  "version": "3.3.1",
   "name": "@abp/clipboard",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "~3.3.0",
+    "@abp/core": "~3.3.1",
     "clipboard": "^2.0.6"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"

npm/packs/codemirror/package.json

@@ -1,11 +1,11 @@
 {
-  "version": "3.3.0",
+  "version": "3.3.1",
   "name": "@abp/codemirror",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "~3.3.0",
+    "@abp/core": "~3.3.1",
     "codemirror": "^5.54.0"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"

npm/packs/core/package.json

@@ -1,11 +1,11 @@
 {
-  "version": "3.3.0",
+  "version": "3.3.1",
   "name": "@abp/core",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/utils": "^3.3.0"
+    "@abp/utils": "^3.3.1"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
 }

npm/packs/cropperjs/package.json

@@ -1,11 +1,11 @@
 {
-  "version": "3.3.0",
+  "version": "3.3.1",
   "name": "@abp/cropperjs",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/core": "~3.3.0",
+    "@abp/core": "~3.3.1",
     "cropperjs": "^1.5.7"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"

npm/packs/datatables.net-bs4/package.json

@@ -1,11 +1,11 @@
 {
-  "version": "3.3.0",
+  "version": "3.3.1",
   "name": "@abp/datatables.net-bs4",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/datatables.net": "~3.3.0",
+    "@abp/datatables.net": "~3.3.1",
     "datatables.net-bs4": "^1.10.21"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"

npm/packs/datatables.net/package.json

@@ -1,11 +1,11 @@
 {
-  "version": "3.3.0",
+  "version": "3.3.1",
   "name": "@abp/datatables.net",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/jquery": "~3.3.0",
+    "@abp/jquery": "~3.3.1",
     "datatables.net": "^1.10.21"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"

npm/packs/docs/package.json

@@ -1,15 +1,15 @@
 {
-  "version": "3.3.0",
+  "version": "3.3.1",
   "name": "@abp/docs",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/anchor-js": "~3.3.0",
+    "@abp/anchor-js": "~3.3.1",
-    "@abp/clipboard": "~3.3.0",
+    "@abp/clipboard": "~3.3.1",
-    "@abp/malihu-custom-scrollbar-plugin": "~3.3.0",
+    "@abp/malihu-custom-scrollbar-plugin": "~3.3.1",
-    "@abp/popper.js": "~3.3.0",
+    "@abp/popper.js": "~3.3.1",
-    "@abp/prismjs": "~3.3.0"
+    "@abp/prismjs": "~3.3.1"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
 }

npm/packs/flag-icon-css/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.3.0",
+  "version": "3.3.1",
   "name": "@abp/flag-icon-css",
   "publishConfig": {
     "access": "public"