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

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs

@@ -176,6 +176,8 @@ public abstract class MicroserviceTemplateBase : TemplateInfo
 
                 steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor", null,
                     "/apps/blazor/src/MyCompanyName.MyProjectName.Blazor"));
+                steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor.Client", null,
+                    "/apps/blazor/src/MyCompanyName.MyProjectName.Blazor.Client"));
                 steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.ProductService.Blazor",
                     "/services/product/MyCompanyName.MyProjectName.ProductService.sln",
                     "/services/product/src/MyCompanyName.MyProjectName.ProductService.Blazor"));
@@ -221,6 +223,13 @@ public abstract class MicroserviceTemplateBase : TemplateInfo
                 steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor",
                     null,
                     "/apps/blazor/src/MyCompanyName.MyProjectName.Blazor"));
+
+                steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor.Client",
+                    "/apps/blazor/MyCompanyName.MyProjectName.Blazor.sln",
+                    "/apps/blazor/src/MyCompanyName.MyProjectName.Blazor.Client"));
+                steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor.Client",
+                    null,
+                    "/apps/blazor/src/MyCompanyName.MyProjectName.Blazor.Client"));
                 steps.Add(new RemoveProjectFromTyeStep("blazor"));
 
                 steps.Add(new TemplateProjectRenameStep("MyCompanyName.MyProjectName.Blazor.Server",
@@ -234,6 +243,8 @@ public abstract class MicroserviceTemplateBase : TemplateInfo
             case UiFramework.NotSpecified:
                 steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor", null,
                     "/apps/blazor/src/MyCompanyName.MyProjectName.Blazor"));
+                steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor.Client", null,
+                    "/apps/blazor/src/MyCompanyName.MyProjectName.Blazor.Client"));
                 steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Blazor.Server", null,
                     "/apps/blazor/src/MyCompanyName.MyProjectName.Blazor.Server"));
                 steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.ProductService.Blazor",

framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs

@@ -796,8 +796,8 @@ public abstract class AbpDbContext<TDbContext> : DbContext, IAbpEfCoreDbContext,
 
         if (typeof(ISoftDelete).IsAssignableFrom(typeof(TEntity)))
         {
-            expression = e => !IsSoftDeleteFilterEnabled || !EF.Property<bool>(e, "IsDeleted");
-
+            var softDeleteColumnName = modelBuilder.Entity<TEntity>().Metadata.FindProperty(nameof(ISoftDelete.IsDeleted))?.GetColumnName() ?? "IsDeleted";
+            expression = e => !IsSoftDeleteFilterEnabled || !EF.Property<bool>(e, softDeleteColumnName);
             if (UseDbFunction())
             {
                 expression = e => AbpEfCoreDataFilterDbFunctionMethods.SoftDeleteFilter(((ISoftDelete)e).IsDeleted, true);
@@ -807,14 +807,13 @@ public abstract class AbpDbContext<TDbContext> : DbContext, IAbpEfCoreDbContext,
 
         if (typeof(IMultiTenant).IsAssignableFrom(typeof(TEntity)))
         {
-            Expression<Func<TEntity, bool>> multiTenantFilter = e => !IsMultiTenantFilterEnabled || EF.Property<Guid>(e, "TenantId") == CurrentTenantId;
-
+            var multiTenantColumnName = modelBuilder.Entity<TEntity>().Metadata.FindProperty(nameof(IMultiTenant.TenantId))?.GetColumnName() ?? "TenantId";
+            Expression<Func<TEntity, bool>> multiTenantFilter = e => !IsMultiTenantFilterEnabled || EF.Property<Guid>(e, multiTenantColumnName) == CurrentTenantId;
             if (UseDbFunction())
             {
                 multiTenantFilter = e => AbpEfCoreDataFilterDbFunctionMethods.MultiTenantFilter(((IMultiTenant)e).TenantId, CurrentTenantId, true);
                 modelBuilder.ConfigureMultiTenantDbFunction(AbpEfCoreDataFilterDbFunctionMethods.MultiTenantFilterMethodInfo, this.GetService<AbpEfCoreCurrentDbContext>());
             }
-
             expression = expression == null ? multiTenantFilter : QueryFilterExpressionHelper.CombineExpressions(expression, multiTenantFilter);
         }
 

framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/TestMigrationsDbContext.cs

@@ -51,6 +51,8 @@ public class TestMigrationsDbContext : AbpDbContext<TestMigrationsDbContext>
         {
             b.Property(x => x.LastActiveTime).ValueGeneratedOnAddOrUpdate().HasDefaultValue(DateTime.Now);
             b.Property(x => x.HasDefaultValue).HasDefaultValue(DateTime.Now);
+            b.Property(x => x.TenantId).HasColumnName("Tenant_Id");
+            b.Property(x => x.IsDeleted).HasColumnName("Is_Deleted");
         });
 
         modelBuilder.Entity<City>(b =>

framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/TestApp/EntityFrameworkCore/TestAppDbContext.cs

@@ -67,6 +67,8 @@ public class TestAppDbContext : AbpDbContext<TestAppDbContext>, IThirdDbContext,
         {
             b.Property(x => x.LastActiveTime).ValueGeneratedOnAddOrUpdate().HasDefaultValue(DateTime.Now);
             b.Property(x => x.HasDefaultValue).HasDefaultValue(DateTime.Now);
+            b.Property(x => x.TenantId).HasColumnName("Tenant_Id");
+            b.Property(x => x.IsDeleted).HasColumnName("Is_Deleted");
         });
 
         modelBuilder

npm/ng-packs/packages/components/extensible/src/lib/components/grid-actions/grid-actions.component.html

@@ -64,6 +64,7 @@
         [style]="action.btnStyle"
         [ngbTooltip]="action.tooltip.text | abpLocalization"
         [placement]="action.tooltip.placement || 'auto'"
+        triggers="hover"
         container="body"
       >
         <ng-container

npm/ng-packs/packages/components/extensible/src/lib/models/form-props.ts

@@ -121,7 +121,10 @@ export class FormProp<R = any> extends Prop<R> {
 export class FormPropData<R = any> extends PropData<R> {
   getInjected: PropData<R>['getInjected'];
 
-  constructor(injector: Injector, public readonly record: R) {
+  constructor(
+    injector: Injector,
+    public readonly record: R,
+  ) {
     super();
 
     this.getInjected = injector.get.bind(injector);

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

@@ -6,7 +6,7 @@
   },
   "dependencies": {
     "@abp/datatables.net": "~8.2.0-rc.5",
-    "datatables.net-bs5": "^1.11.4"
+    "datatables.net-bs5": "^2.0.2"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431",
   "homepage": "https://abp.io",