diff --git a/GridBlazor/GridBlazor.csproj b/GridBlazor/GridBlazor.csproj
index 0d10ef82..4da31ce8 100644
--- a/GridBlazor/GridBlazor.csproj
+++ b/GridBlazor/GridBlazor.csproj
@@ -6,7 +6,7 @@
11.0
True
False
- 5.0.7
+ 5.0.8
GridBlazor
Grid components for Blazor
Grid components for Blazor
diff --git a/GridCore/GridCore.csproj b/GridCore/GridCore.csproj
index c52e9e5b..7a51bb0b 100644
--- a/GridCore/GridCore.csproj
+++ b/GridCore/GridCore.csproj
@@ -7,7 +7,7 @@
False
GridCore
GridCore
- 7.0.4
+ 7.0.5
GridCore
Grid core component
Grid core component
diff --git a/GridMvc/GridMvc.csproj b/GridMvc/GridMvc.csproj
index d2510e8c..255256b1 100644
--- a/GridMvc/GridMvc.csproj
+++ b/GridMvc/GridMvc.csproj
@@ -8,7 +8,7 @@
False
GridMvc
GridMvcCore
- 7.0.4
+ 7.0.5
GridMvc
ASP.NET MVC Grid component
ASP.NET MVC Grid component
diff --git a/GridShared/Filtering/Types/FilterTypeBase.cs b/GridShared/Filtering/Types/FilterTypeBase.cs
index 656f69e3..3166bfde 100644
--- a/GridShared/Filtering/Types/FilterTypeBase.cs
+++ b/GridShared/Filtering/Types/FilterTypeBase.cs
@@ -50,7 +50,8 @@ protected Expression GetFilterExpression(Expression leftExpr, string value
filterType = GetValidType(filterType);
object typedValue = GetTypedValue(value);
- if (typedValue == null)
+ if (typedValue == null && filterType != GridFilterType.IsDuplicated
+ && filterType != GridFilterType.IsNotDuplicated)
return null; //incorrent filter value;
Type targetType = TargetType;
@@ -85,13 +86,13 @@ protected Expression GetFilterExpression(Expression leftExpr, string value
MethodInfo methodInfo = typeof(Queryable).GetMethods()
.Single(r => r.Name == "Contains" && r.GetParameters().Length == 2)
.MakeGenericMethod(new Type[] { typeof(S) });
- return Expression.Call(groupBy, methodInfo, leftExpr);
+ return Expression.Call(methodInfo, groupBy, leftExpr);
case GridFilterType.IsNotDuplicated:
groupBy = GetGroupBy(source, leftExpr);
methodInfo = typeof(Queryable).GetMethods()
.Single(r => r.Name == "Contains" && r.GetParameters().Length == 2)
.MakeGenericMethod(new Type[] { typeof(S) });
- var expresion = Expression.Call(groupBy, methodInfo, leftExpr);
+ var expresion = Expression.Call(methodInfo, groupBy, leftExpr);
return Expression.Not(expresion);
default:
throw new ArgumentOutOfRangeException();
diff --git a/GridShared/Filtering/Types/GuidFilterType.cs b/GridShared/Filtering/Types/GuidFilterType.cs
index 933904b1..ab6649c6 100644
--- a/GridShared/Filtering/Types/GuidFilterType.cs
+++ b/GridShared/Filtering/Types/GuidFilterType.cs
@@ -44,7 +44,8 @@ public override Expression GetFilterExpression(Expression leftExpr, string va
filterType = GetValidType(filterType);
object typedValue = GetTypedValue(value);
- if (typedValue == null)
+ if (typedValue == null && filterType != GridFilterType.IsDuplicated
+ && filterType != GridFilterType.IsNotDuplicated)
return null; //incorrent filter value;
Expression valueExpr = Expression.Constant(typedValue);
@@ -76,14 +77,14 @@ public override Expression GetFilterExpression(Expression leftExpr, string va
MethodInfo methodInfo = typeof(Queryable).GetMethods()
.Single(r => r.Name == "Contains" && r.GetParameters().Length == 2)
.MakeGenericMethod(new Type[] { typeof(Guid) });
- binaryExpression = Expression.Call(groupBy, methodInfo, toStringLeftExpr);
+ binaryExpression = Expression.Call(methodInfo, groupBy, toStringLeftExpr);
break;
case GridFilterType.IsNotDuplicated:
groupBy = GetGroupBy(source, leftExpr);
methodInfo = typeof(Queryable).GetMethods()
.Single(r => r.Name == "Contains" && r.GetParameters().Length == 2)
.MakeGenericMethod(new Type[] { typeof(Guid) });
- var expresion = Expression.Call(groupBy, methodInfo, toStringLeftExpr);
+ var expresion = Expression.Call(methodInfo, groupBy, toStringLeftExpr);
binaryExpression = Expression.Not(expresion);
break;
default:
diff --git a/GridShared/GridShared.csproj b/GridShared/GridShared.csproj
index c73926b3..03ae107a 100644
--- a/GridShared/GridShared.csproj
+++ b/GridShared/GridShared.csproj
@@ -3,7 +3,7 @@
netstandard2.1;net5.0;net6.0;net7.0;net8.0
11.0
- 7.0.3
+ 7.0.4
GridShared
Support library for GridBlazor and GridMvcCore component libraries
Support library for GridBlazor and GridMvcCore component libraries