Merge branch 'rel-4.0' into dev

docs/en/Tutorials/Part-10.md

@@ -911,6 +911,17 @@ You can run the application and try to create a new book or update an existing b
 
 {{else if UI=="NG"}}
 
+### Service Proxy Generation
+
+Since the HTTP APIs have been changed, you need to update Angular client side [service proxies](../UI/Angular/Service-Proxies.md). Before running `generate-proxy` command, your host must be up and running.
+
+Run the following command in the `angular` folder (you may need to stop the angular application):
+
+```bash
+abp generate-proxy
+```
+This command will update the service proxy files under the `/src/app/proxy/` folder.
+
 ### The Book List
 
 Book list page change is trivial. Open the `/src/app/book/book.component.html` and add the following column definition between the `Name` and `Type` columns:

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

@@ -31,6 +31,10 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
 
         public string AutocompleteFilterParamName { get; set; }
 
+        public string AutocompleteSelectedItemName { get; set; }
+
+        public string AutocompleteSelectedItemValue { get; set; }
+
         public AbpSelectTagHelper(AbpSelectTagHelperService tagHelperService)
             : base(tagHelperService)
         {

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

@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Mvc.Diagnostics;
+using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.Mvc.TagHelpers;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Microsoft.AspNetCore.Razor.TagHelpers;
@@ -85,6 +86,13 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
             {
                 selectTagHelper.Items = GetSelectItems(context, output);
             }
+            else
+            {
+                selectTagHelper.Items = new SelectListItem[]
+                    {
+                        new SelectListItem(TagHelper.AutocompleteSelectedItemName,TagHelper.AutocompleteSelectedItemValue,true)
+                    };
+            }
 
             var selectTagHelperOutput = await selectTagHelper.ProcessAndGetOutputAsync(GetInputAttributes(context, output), context, "select", TagMode.StartTagAndEndTag);
 
@@ -107,6 +115,8 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
                 output.Attributes.Add("data-autocomplete-display-property", TagHelper.AutocompleteDisplayPropertyName);
                 output.Attributes.Add("data-autocomplete-value-property", TagHelper.AutocompleteValuePropertyName);
                 output.Attributes.Add("data-autocomplete-filter-param-name", TagHelper.AutocompleteFilterParamName);
+                output.Attributes.Add("data-autocomplete-selected-item-name", TagHelper.AutocompleteSelectedItemName);
+                output.Attributes.Add("data-autocomplete-selected-item-value", TagHelper.AutocompleteSelectedItemValue);
             }
         }
 

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

@@ -80,6 +80,18 @@
                 var displayValue = $(this).data("autocompleteValueProperty");
                 var itemsPropertyName = $(this).data("autocompleteItemsProperty");
                 var filterParamName = $(this).data("autocompleteFilterParamName");
+                var selectedText = $(this).data("autocompleteSelectedItemName");
+                var name = $(this).attr("name");
+                var selectedTextInputName = name.substring(0, name.length - 1) + "_Text]";
+                var selectedTextInput = $('<input>', {
+                    type: 'hidden',
+                    id: selectedTextInputName,
+                    name: selectedTextInputName,
+                });
+                if (selectedText != "") {
+                    selectedTextInput.val(selectedText);
+                }
+                selectedTextInput.insertAfter($select);
                 $select.select2({
                     ajax: {
                         url: url,
@@ -109,6 +121,9 @@
                     },
                     width: '100%'
                 });
+                $select.on('select2:select', function (e) {
+                    selectedTextInput.val(e.params.data.text);
+                });
             });
         }
     }

framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApplicationConfigurations/ObjectExtending/CachedObjectExtensionsDtoService.cs

@@ -140,8 +140,7 @@ namespace Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations.ObjectExtending
                     },
                     OnTable = new ExtensionPropertyUiTableDto
                     {
-                        IsVisible = propertyConfig.UI.OnTable.IsVisible &&
-                                    propertyConfig.UI.Lookup.Url.IsNullOrEmpty()
+                        IsVisible = propertyConfig.UI.OnTable.IsVisible
                     },
                     Lookup = new ExtensionPropertyUiLookupDto
                     {

framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo/Abp/EntityFrameworkCore/AbpDbContextConfigurationContextMySQLExtensions.cs

@@ -14,11 +14,21 @@ namespace Volo.Abp.EntityFrameworkCore
         {
             if (context.ExistingConnection != null)
             {
-                return context.DbContextOptions.UseMySql(context.ExistingConnection, ServerVersion.AutoDetect(context.ConnectionString), mySQLOptionsAction);
+                return context.DbContextOptions.UseMySql(context.ExistingConnection,
+                    ServerVersion.AutoDetect(context.ConnectionString), optionsBuilder =>
+                    {
+                        optionsBuilder.UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery);
+                        mySQLOptionsAction?.Invoke(optionsBuilder);
+                    });
             }
             else
             {
-                return context.DbContextOptions.UseMySql(context.ConnectionString, ServerVersion.AutoDetect(context.ConnectionString), mySQLOptionsAction);
+                return context.DbContextOptions.UseMySql(context.ConnectionString,
+                    ServerVersion.AutoDetect(context.ConnectionString), optionsBuilder =>
+                    {
+                        optionsBuilder.UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery);
+                        mySQLOptionsAction?.Invoke(optionsBuilder);
+                    });
             }
         }
     }

framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/AbpDbContextConfigurationContextOracleDevartExtensions.cs

@@ -13,6 +13,7 @@
 //            [CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null,
 //            bool useExistingConnectionIfAvailable = false)
 //         {
+//             TODO: UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery);
 //             if (useExistingConnectionIfAvailable && context.ExistingConnection != null)
 //             {
 //                 return context.DbContextOptions.UseOracle(context.ExistingConnection, oracleOptionsAction);

framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo/Abp/EntityFrameworkCore/AbpDbContextConfigurationContextOracleExtensions.cs

@@ -12,6 +12,7 @@
 //            [NotNull] this AbpDbContextConfigurationContext context,
 //            [CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null)
 //         {
+//             TODO: UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery);
 //             if (context.ExistingConnection != null)
 //             {
 //                 return context.DbContextOptions.UseOracle(context.ExistingConnection, oracleOptionsAction);

framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo/Abp/EntityFrameworkCore/AbpDbContextConfigurationContextPostgreSqlExtensions.cs

@@ -22,11 +22,19 @@ namespace Volo.Abp.EntityFrameworkCore
         {
             if (context.ExistingConnection != null)
             {
-                return context.DbContextOptions.UseNpgsql(context.ExistingConnection, postgreSqlOptionsAction);
+                return context.DbContextOptions.UseNpgsql(context.ExistingConnection, optionsBuilder =>
+                {
+                    optionsBuilder.UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery);
+                    postgreSqlOptionsAction?.Invoke(optionsBuilder);
+                });
             }
             else
             {
-                return context.DbContextOptions.UseNpgsql(context.ConnectionString, postgreSqlOptionsAction);
+                return context.DbContextOptions.UseNpgsql(context.ConnectionString, optionsBuilder =>
+                {
+                    optionsBuilder.UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery);
+                    postgreSqlOptionsAction?.Invoke(optionsBuilder);
+                });
             }
         }
     }

framework/src/Volo.Abp.EntityFrameworkCore.SqlServer/Volo/Abp/EntityFrameworkCore/AbpDbContextConfigurationContextSqlServerExtensions.cs

@@ -14,11 +14,19 @@ namespace Volo.Abp.EntityFrameworkCore
         {
             if (context.ExistingConnection != null)
             {
-                return context.DbContextOptions.UseSqlServer(context.ExistingConnection, sqlServerOptionsAction);
+                return context.DbContextOptions.UseSqlServer(context.ExistingConnection, optionsBuilder =>
+                {
+                    optionsBuilder.UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery);
+                    sqlServerOptionsAction?.Invoke(optionsBuilder);
+                });
             }
             else
             {
-                return context.DbContextOptions.UseSqlServer(context.ConnectionString, sqlServerOptionsAction);
+                return context.DbContextOptions.UseSqlServer(context.ConnectionString, optionsBuilder =>
+                {
+                    optionsBuilder.UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery);
+                    sqlServerOptionsAction?.Invoke(optionsBuilder);
+                });
             }
         }
     }

framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo/Abp/EntityFrameworkCore/AbpDbContextConfigurationContextSqliteExtensions.cs

@@ -14,11 +14,19 @@ namespace Volo.Abp.EntityFrameworkCore
         {
             if (context.ExistingConnection != null)
             {
-                return context.DbContextOptions.UseSqlite(context.ExistingConnection, sqliteOptionsAction);
+                return context.DbContextOptions.UseSqlite(context.ExistingConnection, optionsBuilder =>
+                {
+                    optionsBuilder.UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery);
+                    sqliteOptionsAction?.Invoke(optionsBuilder);
+                });
             }
             else
             {
-                return context.DbContextOptions.UseSqlite(context.ConnectionString, sqliteOptionsAction);
+                return context.DbContextOptions.UseSqlite(context.ConnectionString, optionsBuilder =>
+                {
+                    optionsBuilder.UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery);
+                    sqliteOptionsAction?.Invoke(optionsBuilder);
+                });
             }
         }
     }

framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/EntityExtensionConfiguration.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using JetBrains.Annotations;
+using Volo.Abp.Localization;
 
 namespace Volo.Abp.ObjectExtending.Modularity
 {
@@ -47,14 +48,29 @@ namespace Volo.Abp.ObjectExtending.Modularity
                 propertyName,
                 () => new ExtensionPropertyConfiguration(this, propertyType, propertyName)
             );
-
             configureAction?.Invoke(propertyInfo);
 
             NormalizeProperty(propertyInfo);
 
+            if (!propertyInfo.UI.Lookup.Url.IsNullOrEmpty())
+            {
+                AddLookupTextProperty(propertyInfo);
+                propertyInfo.UI.OnTable.IsVisible = false;
+                propertyInfo.Api.OnGet.IsAvailable = false;
+            }
             return this;
         }
 
+        private void AddLookupTextProperty(ExtensionPropertyConfiguration propertyInfo)
+        {
+            var lookupTextPropertyName = $"{propertyInfo.Name}_Text";
+            var lookupTextPropertyInfo = Properties.GetOrAdd(
+               lookupTextPropertyName,
+               () => new ExtensionPropertyConfiguration(this, typeof(string), lookupTextPropertyName)
+           );
+            lookupTextPropertyInfo.DisplayName = propertyInfo.DisplayName ?? new FixedLocalizableString(propertyInfo.Name);
+        }
+
         [NotNull]
         public virtual ImmutableList<ExtensionPropertyConfiguration> GetProperties()
         {

modules/audit-logging/src/Volo.Abp.AuditLogging.EntityFrameworkCore/Volo/Abp/AuditLogging/AbpAuditLoggingEfCoreQueryableExtensions.cs

@@ -15,7 +15,6 @@ namespace Volo.Abp.AuditLogging
             }
 
             return queryable
-                .AsSplitQuery()
                 .Include(x => x.Actions)
                 .Include(x => x.EntityChanges).ThenInclude(ec=>ec.PropertyChanges);
         }

modules/docs/app/VoloDocs.Web/Utils/GlobalExceptionHandlerMiddleware.cs

@@ -11,9 +11,9 @@ namespace VoloDocs.Web.Utils
     public class GlobalExceptionHandlerMiddleware
     {
         private readonly RequestDelegate _next;
-        private readonly ILogger<AbpUnitOfWorkMiddleware> _logger;
+        private readonly ILogger<GlobalExceptionHandlerMiddleware> _logger;
 
-        public GlobalExceptionHandlerMiddleware(RequestDelegate next, ILogger<AbpUnitOfWorkMiddleware> logger)
+        public GlobalExceptionHandlerMiddleware(RequestDelegate next, ILogger<GlobalExceptionHandlerMiddleware> logger)
         {
             _logger = logger;
             _next = next;
@@ -42,4 +42,4 @@ namespace VoloDocs.Web.Utils
             }
         }
     }
-}
+}

modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/IdentityEfCoreQueryableExtensions.cs

@@ -13,7 +13,6 @@ namespace Volo.Abp.Identity.EntityFrameworkCore
             }
 
             return queryable
-                .AsSplitQuery()
                 .Include(x => x.Roles)
                 .Include(x => x.Logins)
                 .Include(x => x.Claims)

modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml

@@ -24,23 +24,28 @@
 
             @foreach (var propertyInfo in ObjectExtensionManager.Instance.GetProperties<CreateModalModel.RoleInfoModel>())
             {
-                if (propertyInfo.Type.IsEnum || !propertyInfo.Lookup.Url.IsNullOrEmpty())
+                if (!propertyInfo.Name.EndsWith("_Text"))
                 {
-                    <abp-select asp-for="Role.ExtraProperties[propertyInfo.Name]"
-                                label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
-                                autocomplete-api-url="@propertyInfo.Lookup.Url"
-                                autocomplete-filter-param-name="@propertyInfo.Lookup.FilterParamName"
-                                autocomplete-items-property-name="@propertyInfo.Lookup.ResultListPropertyName"
-                                autocomplete-display-property-name="@propertyInfo.Lookup.DisplayPropertyName"
-                                autocomplete-value-property-name="@propertyInfo.Lookup.ValuePropertyName"></abp-select>
-                }
-                else
-                {
-                    <abp-input type="@propertyInfo.GetInputType()"
-                               asp-for="Role.ExtraProperties[propertyInfo.Name]"
-                               label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
-                               asp-format="@propertyInfo.GetInputFormatOrNull()"
-                               value="@propertyInfo.GetInputValueOrNull(Model.Role.ExtraProperties[propertyInfo.Name])" />
+                    if (propertyInfo.Type.IsEnum || !propertyInfo.Lookup.Url.IsNullOrEmpty())
+                    {
+                        <abp-select asp-for="Role.ExtraProperties[propertyInfo.Name]"
+                                    label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
+                                    autocomplete-api-url="@propertyInfo.Lookup.Url"
+                                    autocomplete-selected-item-name="@Model.Role.ExtraProperties[propertyInfo.Name+"_Text"]"
+                                    autocomplete-selected-item-value="@Model.Role.ExtraProperties[propertyInfo.Name]"
+                                    autocomplete-filter-param-name="@propertyInfo.Lookup.FilterParamName"
+                                    autocomplete-items-property-name="@propertyInfo.Lookup.ResultListPropertyName"
+                                    autocomplete-display-property-name="@propertyInfo.Lookup.DisplayPropertyName"
+                                    autocomplete-value-property-name="@propertyInfo.Lookup.ValuePropertyName"></abp-select>
+                    }
+                    else
+                    {
+                        <abp-input type="@propertyInfo.GetInputType()"
+                                   asp-for="Role.ExtraProperties[propertyInfo.Name]"
+                                   label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
+                                   asp-format="@propertyInfo.GetInputFormatOrNull()"
+                                   value="@propertyInfo.GetInputValueOrNull(Model.Role.ExtraProperties[propertyInfo.Name])" />
+                    }
                 }
             }
         </abp-modal-body>

modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/EditModal.cshtml

@@ -35,23 +35,28 @@
 
             @foreach (var propertyInfo in ObjectExtensionManager.Instance.GetProperties<CreateModalModel.RoleInfoModel>())
             {
-                if (propertyInfo.Type.IsEnum || !propertyInfo.Lookup.Url.IsNullOrEmpty())
+                if (!propertyInfo.Name.EndsWith("_Text"))
                 {
-                    <abp-select asp-for="Role.ExtraProperties[propertyInfo.Name]"
-                                label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
-                                autocomplete-api-url="@propertyInfo.Lookup.Url"
-                                autocomplete-filter-param-name="@propertyInfo.Lookup.FilterParamName"
-                                autocomplete-items-property-name="@propertyInfo.Lookup.ResultListPropertyName"
-                                autocomplete-display-property-name="@propertyInfo.Lookup.DisplayPropertyName"
-                                autocomplete-value-property-name="@propertyInfo.Lookup.ValuePropertyName"></abp-select>
-                }
-                else
-                {
-                    <abp-input type="@propertyInfo.GetInputType()"
-                               asp-for="Role.ExtraProperties[propertyInfo.Name]"
-                               label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
-                               asp-format="@propertyInfo.GetInputFormatOrNull()"
-                               value="@propertyInfo.GetInputValueOrNull(Model.Role.ExtraProperties[propertyInfo.Name])" />
+                    if (propertyInfo.Type.IsEnum || !propertyInfo.Lookup.Url.IsNullOrEmpty())
+                    {
+                        <abp-select asp-for="Role.ExtraProperties[propertyInfo.Name]"
+                                    label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
+                                    autocomplete-api-url="@propertyInfo.Lookup.Url"
+                                    autocomplete-selected-item-name="@Model.Role.ExtraProperties[propertyInfo.Name+"_Text"]"
+                                    autocomplete-selected-item-value="@Model.Role.ExtraProperties[propertyInfo.Name]"
+                                    autocomplete-filter-param-name="@propertyInfo.Lookup.FilterParamName"
+                                    autocomplete-items-property-name="@propertyInfo.Lookup.ResultListPropertyName"
+                                    autocomplete-display-property-name="@propertyInfo.Lookup.DisplayPropertyName"
+                                    autocomplete-value-property-name="@propertyInfo.Lookup.ValuePropertyName"></abp-select>
+                    }
+                    else
+                    {
+                        <abp-input type="@propertyInfo.GetInputType()"
+                                   asp-for="Role.ExtraProperties[propertyInfo.Name]"
+                                   label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
+                                   asp-format="@propertyInfo.GetInputFormatOrNull()"
+                                   value="@propertyInfo.GetInputValueOrNull(Model.Role.ExtraProperties[propertyInfo.Name])" />
+                    }
                 }
             }
         </abp-modal-body>

modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml

@@ -29,23 +29,28 @@
 
                     @foreach (var propertyInfo in ObjectExtensionManager.Instance.GetProperties<CreateModalModel.UserInfoViewModel>())
                     {
-                        if (propertyInfo.Type.IsEnum || !propertyInfo.Lookup.Url.IsNullOrEmpty())
+                        if (!propertyInfo.Name.EndsWith("_Text"))
                         {
-                            <abp-select asp-for="UserInfo.ExtraProperties[propertyInfo.Name]"
-                                        label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
-                                        autocomplete-api-url="@propertyInfo.Lookup.Url"
-                                        autocomplete-filter-param-name="@propertyInfo.Lookup.FilterParamName"
-                                        autocomplete-items-property-name="@propertyInfo.Lookup.ResultListPropertyName"
-                                        autocomplete-display-property-name="@propertyInfo.Lookup.DisplayPropertyName"
-                                        autocomplete-value-property-name="@propertyInfo.Lookup.ValuePropertyName"></abp-select>
-                        }
-                        else
-                        {
-                            <abp-input type="@propertyInfo.GetInputType()"
-                                       asp-for="UserInfo.ExtraProperties[propertyInfo.Name]"
-                                       label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
-                                       asp-format="@propertyInfo.GetInputFormatOrNull()"
-                                       value="@propertyInfo.GetInputValueOrNull(Model.UserInfo.ExtraProperties[propertyInfo.Name])" />
+                            if (propertyInfo.Type.IsEnum || !propertyInfo.Lookup.Url.IsNullOrEmpty())
+                            {
+                                <abp-select asp-for="UserInfo.ExtraProperties[propertyInfo.Name]"
+                                            label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
+                                            autocomplete-api-url="@propertyInfo.Lookup.Url"
+                                            autocomplete-selected-item-name="@Model.UserInfo.ExtraProperties[propertyInfo.Name+"_Text"]"
+                                            autocomplete-selected-item-value="@Model.UserInfo.ExtraProperties[propertyInfo.Name]"
+                                            autocomplete-filter-param-name="@propertyInfo.Lookup.FilterParamName"
+                                            autocomplete-items-property-name="@propertyInfo.Lookup.ResultListPropertyName"
+                                            autocomplete-display-property-name="@propertyInfo.Lookup.DisplayPropertyName"
+                                            autocomplete-value-property-name="@propertyInfo.Lookup.ValuePropertyName"></abp-select>
+                            }
+                            else
+                            {
+                                <abp-input type="@propertyInfo.GetInputType()"
+                                           asp-for="UserInfo.ExtraProperties[propertyInfo.Name]"
+                                           label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
+                                           asp-format="@propertyInfo.GetInputFormatOrNull()"
+                                           value="@propertyInfo.GetInputValueOrNull(Model.UserInfo.ExtraProperties[propertyInfo.Name])" />
+                            }
                         }
                     }
                 </abp-tab>

modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml

@@ -31,23 +31,28 @@
 
                     @foreach (var propertyInfo in ObjectExtensionManager.Instance.GetProperties<EditModalModel.UserInfoViewModel>())
                     {
-                        if (propertyInfo.Type.IsEnum || !propertyInfo.Lookup.Url.IsNullOrEmpty())
+                        if (!propertyInfo.Name.EndsWith("_Text"))
                         {
-                            <abp-select asp-for="UserInfo.ExtraProperties[propertyInfo.Name]"
-                                        label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
-                                        autocomplete-api-url="@propertyInfo.Lookup.Url"
-                                        autocomplete-filter-param-name="@propertyInfo.Lookup.FilterParamName"
-                                        autocomplete-items-property-name="@propertyInfo.Lookup.ResultListPropertyName"
-                                        autocomplete-display-property-name="@propertyInfo.Lookup.DisplayPropertyName"
-                                        autocomplete-value-property-name="@propertyInfo.Lookup.ValuePropertyName"></abp-select>
-                        }
-                        else
-                        {
-                            <abp-input type="@propertyInfo.GetInputType()"
-                                       asp-for="UserInfo.ExtraProperties[propertyInfo.Name]"
-                                       label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
-                                       asp-format="@propertyInfo.GetInputFormatOrNull()"
-                                       value="@propertyInfo.GetInputValueOrNull(Model.UserInfo.ExtraProperties[propertyInfo.Name])" />
+                            if (propertyInfo.Type.IsEnum || !propertyInfo.Lookup.Url.IsNullOrEmpty())
+                            {
+                                <abp-select asp-for="UserInfo.ExtraProperties[propertyInfo.Name]"
+                                            label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
+                                            autocomplete-api-url="@propertyInfo.Lookup.Url"
+                                            autocomplete-selected-item-name="@Model.UserInfo.ExtraProperties[propertyInfo.Name+"_Text"]"
+                                            autocomplete-selected-item-value="@Model.UserInfo.ExtraProperties[propertyInfo.Name]"
+                                            autocomplete-filter-param-name="@propertyInfo.Lookup.FilterParamName"
+                                            autocomplete-items-property-name="@propertyInfo.Lookup.ResultListPropertyName"
+                                            autocomplete-display-property-name="@propertyInfo.Lookup.DisplayPropertyName"
+                                            autocomplete-value-property-name="@propertyInfo.Lookup.ValuePropertyName"></abp-select>
+                            }
+                            else
+                            {
+                                <abp-input type="@propertyInfo.GetInputType()"
+                                           asp-for="UserInfo.ExtraProperties[propertyInfo.Name]"
+                                           label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
+                                           asp-format="@propertyInfo.GetInputFormatOrNull()"
+                                           value="@propertyInfo.GetInputValueOrNull(Model.UserInfo.ExtraProperties[propertyInfo.Name])" />
+                            }
                         }
                     }
 

modules/identityserver/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Volo/Abp/IdentityServer/AbpIdentityServerEfCoreQueryableExtensions.cs

@@ -17,7 +17,6 @@ namespace Volo.Abp.IdentityServer
             }
 
             return queryable
-                .AsSplitQuery()
                 .Include(x => x.Secrets)
                 .Include(x => x.UserClaims)
                 .Include(x => x.Scopes)
@@ -57,7 +56,6 @@ namespace Volo.Abp.IdentityServer
             }
 
             return queryable
-                .AsSplitQuery()
                 .Include(x => x.AllowedGrantTypes)
                 .Include(x => x.RedirectUris)
                 .Include(x => x.PostLogoutRedirectUris)

modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml

@@ -24,23 +24,28 @@
 
             @foreach (var propertyInfo in ObjectExtensionManager.Instance.GetProperties<CreateModalModel.TenantInfoModel>())
             {
-                if (propertyInfo.Type.IsEnum || !propertyInfo.Lookup.Url.IsNullOrEmpty())
+                if (!propertyInfo.Name.EndsWith("_Text"))
                 {
-                    <abp-select asp-for="Tenant.ExtraProperties[propertyInfo.Name]"
-                                label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
-                                autocomplete-api-url="@propertyInfo.Lookup.Url"
-                                autocomplete-filter-param-name="@propertyInfo.Lookup.FilterParamName"
-                                autocomplete-items-property-name="@propertyInfo.Lookup.ResultListPropertyName"
-                                autocomplete-display-property-name="@propertyInfo.Lookup.DisplayPropertyName"
-                                autocomplete-value-property-name="@propertyInfo.Lookup.ValuePropertyName"></abp-select>
-                }
-                else
-                {
-                    <abp-input type="@propertyInfo.GetInputType()"
-                               asp-for="Tenant.ExtraProperties[propertyInfo.Name]"
-                               label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
-                               asp-format="@propertyInfo.GetInputFormatOrNull()"
-                               value="@propertyInfo.GetInputValueOrNull(Model.Tenant.ExtraProperties[propertyInfo.Name])" />
+                    if (propertyInfo.Type.IsEnum || !propertyInfo.Lookup.Url.IsNullOrEmpty())
+                    {
+                        <abp-select asp-for="Tenant.ExtraProperties[propertyInfo.Name]"
+                                    label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
+                                    autocomplete-api-url="@propertyInfo.Lookup.Url"
+                                    autocomplete-selected-item-name="@Model.Tenant.ExtraProperties[propertyInfo.Name+"_Text"]"
+                                    autocomplete-selected-item-value="@Model.Tenant.ExtraProperties[propertyInfo.Name]"
+                                    autocomplete-filter-param-name="@propertyInfo.Lookup.FilterParamName"
+                                    autocomplete-items-property-name="@propertyInfo.Lookup.ResultListPropertyName"
+                                    autocomplete-display-property-name="@propertyInfo.Lookup.DisplayPropertyName"
+                                    autocomplete-value-property-name="@propertyInfo.Lookup.ValuePropertyName"></abp-select>
+                    }
+                    else
+                    {
+                        <abp-input type="@propertyInfo.GetInputType()"
+                                   asp-for="Tenant.ExtraProperties[propertyInfo.Name]"
+                                   label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
+                                   asp-format="@propertyInfo.GetInputFormatOrNull()"
+                                   value="@propertyInfo.GetInputValueOrNull(Model.Tenant.ExtraProperties[propertyInfo.Name])" />
+                    }
                 }
             }
         </abp-modal-body>

modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/EditModal.cshtml

@@ -20,23 +20,28 @@
             <abp-input asp-for="Tenant.Name" label="@L["TenantName"].Value" />
             @foreach (var propertyInfo in ObjectExtensionManager.Instance.GetProperties<EditModalModel.TenantInfoModel>())
             {
-                if (propertyInfo.Type.IsEnum || !propertyInfo.Lookup.Url.IsNullOrEmpty())
+                if (!propertyInfo.Name.EndsWith("_Text"))
                 {
-                    <abp-select asp-for="Tenant.ExtraProperties[propertyInfo.Name]"
-                                label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
-                                autocomplete-api-url="@propertyInfo.Lookup.Url"
-                                autocomplete-filter-param-name="@propertyInfo.Lookup.FilterParamName"
-                                autocomplete-items-property-name="@propertyInfo.Lookup.ResultListPropertyName"
-                                autocomplete-display-property-name="@propertyInfo.Lookup.DisplayPropertyName"
-                                autocomplete-value-property-name="@propertyInfo.Lookup.ValuePropertyName"></abp-select>
-                }
-                else
-                {
-                    <abp-input type="@propertyInfo.GetInputType()"
-                               asp-for="Tenant.ExtraProperties[propertyInfo.Name]"
-                               label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
-                               asp-format="@propertyInfo.GetInputFormatOrNull()"
-                               value="@propertyInfo.GetInputValueOrNull(Model.Tenant.ExtraProperties[propertyInfo.Name])" />
+                    if (propertyInfo.Type.IsEnum || !propertyInfo.Lookup.Url.IsNullOrEmpty())
+                    {
+                        <abp-select asp-for="Tenant.ExtraProperties[propertyInfo.Name]"
+                                    label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
+                                    autocomplete-api-url="@propertyInfo.Lookup.Url"
+                                    autocomplete-selected-item-name="@Model.Tenant.ExtraProperties[propertyInfo.Name+"_Text"]"
+                                    autocomplete-selected-item-value="@Model.Tenant.ExtraProperties[propertyInfo.Name]"
+                                    autocomplete-filter-param-name="@propertyInfo.Lookup.FilterParamName"
+                                    autocomplete-items-property-name="@propertyInfo.Lookup.ResultListPropertyName"
+                                    autocomplete-display-property-name="@propertyInfo.Lookup.DisplayPropertyName"
+                                    autocomplete-value-property-name="@propertyInfo.Lookup.ValuePropertyName"></abp-select>
+                    }
+                    else
+                    {
+                        <abp-input type="@propertyInfo.GetInputType()"
+                                   asp-for="Tenant.ExtraProperties[propertyInfo.Name]"
+                                   label="@propertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)"
+                                   asp-format="@propertyInfo.GetInputFormatOrNull()"
+                                   value="@propertyInfo.GetInputValueOrNull(Model.Tenant.ExtraProperties[propertyInfo.Name])" />
+                    }
                 }
             }
         </abp-modal-body>

npm/ng-packs/packages/core/src/lib/services/application-configuration.service.ts

@@ -9,11 +9,7 @@ import { RestService } from './rest.service';
   providedIn: 'root',
 })
 export class ApplicationConfigurationService {
-  get apiName(): string {
-    return this.environment.getEnvironment().application?.name;
-  }
-
-  constructor(private rest: RestService, private environment: EnvironmentService) {}
+  constructor(private rest: RestService) {}
 
   getConfiguration(): Observable<ApplicationConfiguration.Response> {
     const request: Rest.Request<null> = {
@@ -21,8 +17,6 @@ export class ApplicationConfigurationService {
       url: '/api/abp/application-configuration',
     };
 
-    return this.rest.request<null, ApplicationConfiguration.Response>(request, {
-      apiName: this.apiName,
-    });
+    return this.rest.request<null, ApplicationConfiguration.Response>(request, {});
   }
 }