1.6.0-preview0601

This commit is contained in:
28810
2020-06-01 12:59:58 +08:00
parent 43e2af2bee
commit 875c109144
21 changed files with 32 additions and 19 deletions

View File

@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net45;net40</TargetFrameworks>
<Version>1.6.0-preview0102</Version>
<Version>1.6.0-preview0601</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>ncc;YeXiangQin</Authors>
<Description>FreeSql is the ORM in .NetCore, .NetFramework, And Xamarin. It supports Mysql, Postgresql, SqlServer, Oracle, Sqlite, Odbc, 达梦, 人大金仓, And Access</Description>

View File

@ -3138,6 +3138,12 @@
此时 Value 的值格式为逗号分割value1,value2,value3...
</summary>
</member>
<member name="F:FreeSql.Internal.Model.DynamicFilterOperator.NotAny">
<summary>
not in (1,2,3)<para></para>
此时 Value 的值格式为逗号分割value1,value2,value3...
</summary>
</member>
<member name="P:FreeSql.Internal.Model.TableRef.RefMiddleEntityType">
<summary>
中间表,多对多

View File

@ -1122,9 +1122,11 @@ namespace FreeSql.Internal.CommonProvider
Expression.LessThan(exp, Expression.Constant(Utils.GetDataReaderValue(exp.Type, fiValueDateRangeArray[1]), exp.Type)));
break;
case DynamicFilterOperator.Any:
case DynamicFilterOperator.NotAny:
var fiValueAnyArray = fi.Value.Split(',');
var fiValueAnyArrayType = exp.Type.MakeArrayType();
exp = Expression.Call(GetMethodEnumerableContains(exp.Type), Expression.Constant(Utils.GetDataReaderValue(fiValueAnyArrayType, fiValueAnyArray), fiValueAnyArrayType), exp);
if (fi.Operator == DynamicFilterOperator.NotAny) exp = Expression.Not(exp);
break;
}

View File

@ -114,6 +114,11 @@ namespace FreeSql.Internal.Model
/// in (1,2,3)<para></para>
/// 此时 Value 的值格式为逗号分割value1,value2,value3...
/// </summary>
Any
Any,
/// <summary>
/// not in (1,2,3)<para></para>
/// 此时 Value 的值格式为逗号分割value1,value2,value3...
/// </summary>
NotAny
}
}