tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-06-19 20:38:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

- 增加 GlobalFilter.Apply before 参数将过滤条件插入 where 之前；#1566 #1492

Browse Source
This commit is contained in:
2881099
2023-07-07 14:23:12 +08:00
parent 87d528e35f
commit fd2c692814
32 changed files with 883 additions and 579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
FreeSql/Internal/CommonExpression.cs
View File

@ -2361,7 +2361,7 @@ namespace FreeSql.Internal
}
static ConcurrentDictionary<Type, ConcurrentDictionary<string, bool>> _dicGetWhereCascadeSqlError = new ConcurrentDictionary<Type, ConcurrentDictionary<string, bool>>();
public string GetWhereCascadeSql(SelectTableInfo tb, List<GlobalFilter.Item> filters, bool isMultitb)
public string GetWhereCascadeSql(SelectTableInfo tb, IEnumerable<GlobalFilter.Item> filters, bool isMultitb)
{
if (filters.Any())
{

16
FreeSql/Internal/GlobalFilter.cs
View File

@ -19,6 +19,7 @@ namespace FreeSql.Internal
internal Func<bool> Condition { get; set; }
public LambdaExpression Where { get; internal set; }
public bool Only { get; internal set; }
public bool Before { get; internal set; }
}
/// <summary>
/// 创建一个过滤器<para></para>
@ -27,8 +28,9 @@ namespace FreeSql.Internal
/// <typeparam name="TEntity"></typeparam>
/// <param name="name">名字</param>
/// <param name="where">表达式</param>
/// <param name="before">条件在最前面</param>
/// <returns></returns>
public GlobalFilter Apply<TEntity>(string name, Expression<Func<TEntity, bool>> where) => Apply(false, name, () => true, where);
public GlobalFilter Apply<TEntity>(string name, Expression<Func<TEntity, bool>> where, bool before = false) => Apply(false, name, () => true, where, before);
/// <summary>
/// 创建一个动态过滤器，当 condition 返回值为 true 时才生效<para></para>
/// 场景：当登陆身份是管理员，则过滤条件不生效<para></para>
@ -38,8 +40,9 @@ namespace FreeSql.Internal
/// <param name="name">名字</param>
/// <param name="condition">委托，返回值为 true 时才生效</param>
/// <param name="where">表达式</param>
/// <param name="before">条件在最前面</param>
/// <returns></returns>
public GlobalFilter ApplyIf<TEntity>(string name, Func<bool> condition, Expression<Func<TEntity, bool>> where) => Apply(false, name, condition, where);
public GlobalFilter ApplyIf<TEntity>(string name, Func<bool> condition, Expression<Func<TEntity, bool>> where, bool before = false) => Apply(false, name, condition, where, before);
/// <summary>
/// 创建一个过滤器（实体类型 属于指定 TEntity 才会生效）<para></para>
@ -48,8 +51,9 @@ namespace FreeSql.Internal
/// <typeparam name="TEntity"></typeparam>
/// <param name="name">名字</param>
/// <param name="where">表达式</param>
/// <param name="before">条件在最前面</param>
/// <returns></returns>
public GlobalFilter ApplyOnly<TEntity>(string name, Expression<Func<TEntity, bool>> where) => Apply(true, name, () => true, where);
public GlobalFilter ApplyOnly<TEntity>(string name, Expression<Func<TEntity, bool>> where, bool before = false) => Apply(true, name, () => true, where, before);
/// <summary>
/// 创建一个过滤器（实体类型 属于指定 TEntity 才会生效）<para></para>
/// 场景：当登陆身份是管理员，则过滤条件不生效<para></para>
@ -59,10 +63,11 @@ namespace FreeSql.Internal
/// <param name="name">名字</param>
/// <param name="condition">委托，返回值为 true 时才生效</param>
/// <param name="where">表达式</param>
/// <param name="before">条件在最前面</param>
/// <returns></returns>
public GlobalFilter ApplyOnlyIf<TEntity>(string name, Func<bool> condition, Expression<Func<TEntity, bool>> where) => Apply(true, name, condition, where);
public GlobalFilter ApplyOnlyIf<TEntity>(string name, Func<bool> condition, Expression<Func<TEntity, bool>> where, bool before = false) => Apply(true, name, condition, where, before);
GlobalFilter Apply<TEntity>(bool only, string name, Func<bool> condition, Expression<Func<TEntity, bool>> where)
GlobalFilter Apply<TEntity>(bool only, string name, Func<bool> condition, Expression<Func<TEntity, bool>> where, bool before)
{
if (name == null) throw new ArgumentNullException(nameof(name));
if (where == null) return this;
@ -78,6 +83,7 @@ namespace FreeSql.Internal
item.Where = newlambda;
item.Condition = condition;
item.Only = only;
item.Before = before;
_filters.AddOrUpdate(name, item, (_, __) => item);
return this;
}

1
FreeSql/Internal/Model/SelectTableInfo.cs
View File

@ -23,6 +23,7 @@ namespace FreeSql.Internal.Model
public SelectTableInfoType Type { get; set; }
public string Cascade { get; set; }
public string CascadeBefore { get; set; }
}
public enum SelectTableInfoType { From, LeftJoin, InnerJoin, RightJoin, RawJoin, Parent }
}