- 增加 DbContextOptions.EnableGlobalFilter 设置是否在 DbContext/Repository 中启用全局过滤器；

Author: 28810

FreeSql.DbContext/DbContext/DbContext.cs

@@ -43,6 +43,8 @@ public DbContextOptions Options
                     if (FreeSqlDbContextExtensions._dicSetDbContextOptions.TryGetValue(OrmOriginal.Ado.Identifier, out var opt))
                     {
                         _optionsPriv.EnableAddOrUpdateNavigateList = opt.EnableAddOrUpdateNavigateList;
+                        _optionsPriv.EnableGlobalFilter = opt.EnableGlobalFilter;
+                        _optionsPriv.NoneParameter = opt.NoneParameter;
                         _optionsPriv.OnEntityChange = opt.OnEntityChange;
                     }
                 }

FreeSql.DbContext/DbContext/DbContextOptions.cs

@@ -27,6 +27,11 @@ public class DbContextOptions
         /// </summary>
         public bool? NoneParameter { get; set; }
 
+        /// <summary>
+        /// 是否开启 IFreeSql GlobalFilter 功能（默认：true）
+        /// </summary>
+        public bool EnableGlobalFilter { get; set; } = true;
+
         /// <summary>
         /// 实体变化事件
         /// </summary>

FreeSql.DbContext/DbContext/DbContextScopedFreeSql.cs

@@ -35,15 +35,21 @@ public void Dispose() { }
 
         public ISelect<T1> Select<T1>() where T1 : class
         {
-            _resolveDbContext?.Invoke()?.FlushCommand();
-            return _originalFsql.Select<T1>().WithTransaction(_resolveUnitOfWork()?.GetOrBeginTransaction(false));
+            var db = _resolveDbContext?.Invoke();
+            db?.FlushCommand();
+            var select = _originalFsql.Select<T1>().WithTransaction(_resolveUnitOfWork()?.GetOrBeginTransaction(false));
+            if (db?.Options.EnableGlobalFilter == false) select.DisableGlobalFilter();
+            return select;
         }
         public ISelect<T1> Select<T1>(object dywhere) where T1 : class => Select<T1>().WhereDynamic(dywhere);
 
         public IDelete<T1> Delete<T1>() where T1 : class
         {
-            _resolveDbContext?.Invoke()?.FlushCommand();
-            return _originalFsql.Delete<T1>().WithTransaction(_resolveUnitOfWork()?.GetOrBeginTransaction());
+            var db = _resolveDbContext?.Invoke();
+            db?.FlushCommand();
+            var delete = _originalFsql.Delete<T1>().WithTransaction(_resolveUnitOfWork()?.GetOrBeginTransaction());
+            if (db?.Options.EnableGlobalFilter == false) delete.DisableGlobalFilter();
+            return delete;
         }
         public IDelete<T1> Delete<T1>(object dywhere) where T1 : class => Delete<T1>().WhereDynamic(dywhere);
 
@@ -53,6 +59,7 @@ public IUpdate<T1> Update<T1>() where T1 : class
             db?.FlushCommand();
             var update = _originalFsql.Update<T1>().WithTransaction(_resolveUnitOfWork()?.GetOrBeginTransaction());
             if (db?.Options.NoneParameter != null) update.NoneParameter(db.Options.NoneParameter.Value);
+            if (db?.Options.EnableGlobalFilter == false) update.DisableGlobalFilter();
             return update;
         }
         public IUpdate<T1> Update<T1>(object dywhere) where T1 : class => Update<T1>().WhereDynamic(dywhere);

FreeSql.DbContext/DbSet/DbSet.cs

@@ -33,7 +33,9 @@ public abstract partial class DbSet<TEntity> : IDbSet where TEntity : class
         protected virtual ISelect<TEntity> OrmSelect(object dywhere)
         {
             DbContextFlushCommand(); //查询前先提交，否则会出脏读
-            return _db.OrmOriginal.Select<TEntity>().AsType(_entityType).WithTransaction(_uow?.GetOrBeginTransaction(false)).TrackToList(TrackToList).WhereDynamic(dywhere);
+            var select = _db.OrmOriginal.Select<TEntity>().AsType(_entityType).WithTransaction(_uow?.GetOrBeginTransaction(false)).TrackToList(TrackToList).WhereDynamic(dywhere);
+            if (_db.Options.EnableGlobalFilter == false) select.DisableGlobalFilter();
+            return select;
         }
 
         ~DbSet() => this.Dispose();
@@ -65,9 +67,15 @@ protected virtual IUpdate<TEntity> OrmUpdate(IEnumerable<TEntity> entitys)
         {
             var update = _db.OrmOriginal.Update<TEntity>().AsType(_entityType).WithTransaction(_uow?.GetOrBeginTransaction());
             if (_db.Options.NoneParameter != null) update.NoneParameter(_db.Options.NoneParameter.Value);
+            if (_db.Options.EnableGlobalFilter == false) update.DisableGlobalFilter();
             return update.SetSource(entitys);
         }
-        protected virtual IDelete<TEntity> OrmDelete(object dywhere) => _db.OrmOriginal.Delete<TEntity>().AsType(_entityType).WithTransaction(_uow?.GetOrBeginTransaction()).WhereDynamic(dywhere);
+        protected virtual IDelete<TEntity> OrmDelete(object dywhere)
+        {
+            var delete = _db.OrmOriginal.Delete<TEntity>().AsType(_entityType).WithTransaction(_uow?.GetOrBeginTransaction()).WhereDynamic(dywhere);
+            if (_db.Options.EnableGlobalFilter == false) delete.DisableGlobalFilter();
+            return delete;
+        }
 
         internal void EnqueueToDbContext(DbContext.EntityChangeType changeType, EntityState state) =>
             _db.EnqueuePreCommand(changeType, this, typeof(EntityState), _entityType, state);

FreeSql.DbContext/FreeSql.DbContext.xml

@@ -301,6 +301,25 @@ public void Test02()
                 }
             });
 
+            var repo_dtot22 = g.sqlite.GetRepository<gf_t1>();
+
+            var dtot221 = repo_dtot22.Select.ToList(a => new gfDto
+            {
+                dto2 = new dfDto2
+                {
+                    rowstate = a.rowstate
+                }
+            });
+
+            repo_dtot22.DbContextOptions.EnableGlobalFilter = false;
+            var dtot222 = repo_dtot22.Select.ToList(a => new gfDto
+            {
+                dto2 = new dfDto2
+                {
+                    rowstate = a.rowstate
+                }
+            });
+
             //List<(Guid, DateTime)> contains2linqarr = new List<(Guid, DateTime)>();
             //Assert.Equal("SELECT 1 as1 FROM \"TestIgnoreDefaultValue\" a WHERE (1=0)", g.sqlite.Select<TestIgnoreDefaultValue>().Where(a => contains2linqarr.Contains(a.Id, a.ct1)).ToSql(a => 1).Replace("\r\n", ""));
             //g.sqlite.Select<TestIgnoreDefaultValue>().Where(a => contains2linqarr.Contains(a.Id, a.ct1)).ToList();