test/ant-design-blazor
1
0
Fork 0
mirror of https://gitee.com/ant-design-blazor/ant-design-blazor.git synced 2024-12-04 04:58:05 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

fix(module: table): fix nullable built-in DateTime filter (#1964)

Browse Source 
* fix(module:table): fix nullable date-time built-in filter

* Update DateFilterExpression.cs

* Update DateFilterExpression.cs

* Update DateFilterExpression.cs
This commit is contained in:
Hao Sun 2021-10-12 23:50:03 +08:00 committed by GitHub
parent 0e40f1bd03
commit 97d1ec43d9
1 changed files with 49 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
components/table/FilterExpression/DateFilterExpression.cs
View File

@ -18,14 +18,57 @@ namespace AntDesign.FilterExpression
} }
public Expression GetFilterExpression(TableFilterCompareOperator compareOperator, Expression leftExpr, Expression rightExpr) public Expression GetFilterExpression(TableFilterCompareOperator compareOperator, Expression leftExpr, Expression rightExpr)
{ {
leftExpr = RemoveMilliseconds(leftExpr);
rightExpr = RemoveMilliseconds(rightExpr);
switch (compareOperator) switch (compareOperator)
{ {
case TableFilterCompareOperator.IsNull: case TableFilterCompareOperator.IsNull:
case TableFilterCompareOperator.Equals:
return Expression.Equal(leftExpr, rightExpr); return Expression.Equal(leftExpr, rightExpr);
case TableFilterCompareOperator.IsNotNull: case TableFilterCompareOperator.IsNotNull:
return Expression.NotEqual(leftExpr, rightExpr);
}
if (leftExpr.Type.IsGenericType)
{
Expression notNull = Expression.NotEqual(leftExpr, Expression.Constant(null));
Expression isNull = Expression.Equal(leftExpr, Expression.Constant(null));
leftExpr = Expression.Property(leftExpr, "Value");
rightExpr = Expression.Property(rightExpr, "Value");
if (compareOperator != TableFilterCompareOperator.TheSameDateWith)
{
leftExpr = RemoveMilliseconds(leftExpr);
}
switch (compareOperator)
{
case TableFilterCompareOperator.Equals:
return Expression.AndAlso(notNull, Expression.Equal(leftExpr, rightExpr));
case TableFilterCompareOperator.NotEquals:
return Expression.OrElse(isNull, Expression.NotEqual(leftExpr, rightExpr));
case TableFilterCompareOperator.GreaterThan:
return Expression.AndAlso(notNull, Expression.GreaterThan(leftExpr, rightExpr));
case TableFilterCompareOperator.GreaterThanOrEquals:
return Expression.AndAlso(notNull, Expression.GreaterThanOrEqual(leftExpr, rightExpr));
case TableFilterCompareOperator.LessThan:
return Expression.AndAlso(notNull, Expression.LessThan(leftExpr, rightExpr));
case TableFilterCompareOperator.LessThanOrEquals:
return Expression.AndAlso(notNull, Expression.LessThanOrEqual(leftExpr, rightExpr));
case TableFilterCompareOperator.TheSameDateWith:
return Expression.AndAlso(notNull,
Expression.Equal(
Expression.Property(leftExpr, "Date"),
Expression.Property(rightExpr, "Date")));
}
throw new InvalidOperationException();
}
if (compareOperator != TableFilterCompareOperator.TheSameDateWith)
{
leftExpr = RemoveMilliseconds(leftExpr);
}
switch (compareOperator)
{
case TableFilterCompareOperator.Equals:
return Expression.Equal(leftExpr, rightExpr);
case TableFilterCompareOperator.NotEquals: case TableFilterCompareOperator.NotEquals:
return Expression.NotEqual(leftExpr, rightExpr); return Expression.NotEqual(leftExpr, rightExpr);
case TableFilterCompareOperator.GreaterThan: case TableFilterCompareOperator.GreaterThan:
@ -37,8 +80,9 @@ namespace AntDesign.FilterExpression
case TableFilterCompareOperator.LessThanOrEquals: case TableFilterCompareOperator.LessThanOrEquals:
return Expression.LessThanOrEqual(leftExpr, rightExpr); return Expression.LessThanOrEqual(leftExpr, rightExpr);
case TableFilterCompareOperator.TheSameDateWith: case TableFilterCompareOperator.TheSameDateWith:
return Expression.Equal(Expression.Property(leftExpr, "Date"), return Expression.Equal(
Expression.Property(rightExpr, "Date")); Expression.Property(leftExpr, "Date"),
Expression.Property(rightExpr, "Date"));
} }
throw new InvalidOperationException(); throw new InvalidOperationException();
} }