- 增加 DynamicFilterCustom 参数 object sender；#1113

dotnetcore · May 22, 2022 · 7903fc3 · 7903fc3
1 parent b49c487
commit 7903fc3
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 6 deletions.
diff --git a/FreeSql.DbContext/FreeSql.DbContext.xml b/FreeSql.DbContext/FreeSql.DbContext.xml
diff --git a/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/Curd/SqliteSelectTest.cs b/FreeSql.Tests/FreeSql.Tests.Provider.Sqlite.Data/Sqlite/Curd/SqliteSelectTest.cs
@@ -2546,7 +2546,7 @@ public enum ts_dyfilter_enum01_status { staring, stoped, finished }
     public class DynamicFilterMyCustom
     {
         [DynamicFilterCustom]
-        public static string MyRawSql(string value) => value;
+        public static string MyRawSql(object sender, string value) => value;
 
         public static string TupleIn(string value)
         {

diff --git a/FreeSql.Tests/FreeSql.Tests/Sqlite/Curd/SqliteSelectTest.cs b/FreeSql.Tests/FreeSql.Tests/Sqlite/Curd/SqliteSelectTest.cs
@@ -2664,7 +2664,7 @@ public void WhereDynamicFilter()
       ""Value"" : ""testname01""
     },
     {
-      ""Field"" : ""MyRawSql FreeSql.Tests.Sqlite.DynamicFilterMyCustom,FreeSql.Tests"",
+      ""Field"" : ""MyRawSql2 FreeSql.Tests.Sqlite.DynamicFilterMyCustom,FreeSql.Tests"",
       ""Operator"" : ""Custom"",
       ""Value"" : ""(id,status) in (('testname01','finished'))""
     },
@@ -2689,7 +2689,10 @@ public enum ts_dyfilter_enum01_status { staring, stoped, finished }
     public class DynamicFilterMyCustom
     {
         [DynamicFilterCustom]
-        public static string MyRawSql(string value) => value;
+        public static string MyRawSql(object sender, string value) => value;
+
+        [DynamicFilterCustom]
+        public static string MyRawSql2(string value) => value;
 
         public static string TupleIn(string value)
         {

diff --git a/FreeSql/FreeSql.xml b/FreeSql/FreeSql.xml
diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs
@@ -656,9 +656,13 @@ void ParseFilter(DynamicFilterLogic logic, DynamicFilterInfo fi, bool isend)
                             var fiValue1Type = Type.GetType(fiValueCustomArray[1]);
                             if (fiValue1Type == null) throw new ArgumentException(CoreStrings.NotFound_Reflection(fiValueCustomArray[1]));
                             var fiValue0Method = fiValue1Type.GetMethod(fiValueCustomArray[0], new Type[] { typeof(string) });
+                            if (fiValue0Method == null) fiValue0Method = fiValue1Type.GetMethod(fiValueCustomArray[0], new Type[] { typeof(object), typeof(string) });
                             if (fiValue0Method == null) throw new ArgumentException(CoreStrings.NotFound_Static_MethodName(fiValueCustomArray[0]));
                             if (MethodIsDynamicFilterCustomAttribute(fiValue0Method) == false) throw new ArgumentException(CoreStrings.Custom_StaticMethodName_NotSet_DynamicFilterCustom(fiValueCustomArray[0]));
-                            var fiValue0MethodReturn = fiValue0Method?.Invoke(null, new object[] { fi.Value?.ToString() })?.ToString();
+                            var fiValue0MethodReturn = fiValue0Method?.Invoke(null, fiValue0Method.GetParameters()
+                                    .Select(a => a.ParameterType == typeof(object) ? (object)this : 
+                                        (a.ParameterType == typeof(string) ? (object)(fi.Value?.ToString()) : (object)null))
+                                    .ToArray())?.ToString();
                             exp = Expression.Call(typeof(SqlExt).GetMethod("InternalRawSql", BindingFlags.NonPublic | BindingFlags.Static), Expression.Constant(fiValue0MethodReturn, typeof(string)));
                             break;
 

diff --git a/FreeSql/Internal/Model/DynamicFilterInfo.cs b/FreeSql/Internal/Model/DynamicFilterInfo.cs
@@ -132,7 +132,7 @@ public enum DynamicFilterOperator
         /// public class DynamicFilterCustom<para></para>
         /// {<para></para>
         /// [DynamicFilterCustom]<para></para>
-        /// public static string RawSql(string value) => value;<para></para>
+        /// public static string RawSql(object sender, string value) => value;<para></para>
         /// }<para></para>
         /// }<para></para>
         /// </summary>