UpdateNav.IncludeByNameString

This commit is contained in:
sunkaixuan 2023-09-11 01:18:59 +08:00
parent d82c23764a
commit 69779793d3
4 changed files with 27 additions and 11 deletions

View File

@ -66,8 +66,9 @@ namespace SqlSugar
result.Context = UpdateNavProvider._Context; result.Context = UpdateNavProvider._Context;
var entityInfo = result.Context.EntityMaintenance.GetEntityInfo<T>(); var entityInfo = result.Context.EntityMaintenance.GetEntityInfo<T>();
Type properyItemType; Type properyItemType;
Expression exp =UtilMethods.GetIncludeExpression(navMemberName, entityInfo, out properyItemType); bool isList;
var method = this.GetType().GetMyMethod("Include", 2) Expression exp =UtilMethods.GetIncludeExpression(navMemberName, entityInfo, out properyItemType,out isList);
var method = this.GetType().GetMyMethod("Include", 2,isList)
.MakeGenericMethod(properyItemType); .MakeGenericMethod(properyItemType);
var obj = method.Invoke(this, new object[] { exp, updateNavOptions }); var obj = method.Invoke(this, new object[] { exp, updateNavOptions });
result.MethodInfos = obj; result.MethodInfos = obj;

View File

@ -17,22 +17,24 @@ namespace SqlSugar
var type = MethodInfos.GetType().GetGenericArguments()[0]; var type = MethodInfos.GetType().GetGenericArguments()[0];
var entityInfo = this.Context.EntityMaintenance.GetEntityInfo(type); var entityInfo = this.Context.EntityMaintenance.GetEntityInfo(type);
Type properyItemType; Type properyItemType;
Expression exp = UtilMethods.GetIncludeExpression(navMemberName, entityInfo, out properyItemType); bool isList;
var method = this.GetType().GetMyMethod("Include", 2) Expression exp = UtilMethods.GetIncludeExpression(navMemberName, entityInfo, out properyItemType, out isList);
var method = this.MethodInfos.GetType().GetMyMethod("Include", 2, isList)
.MakeGenericMethod(properyItemType); .MakeGenericMethod(properyItemType);
var obj = method.Invoke(this, new object[] { exp, updateNavOptions }); var obj = method.Invoke(this.MethodInfos, new object[] { exp, updateNavOptions });
this.MethodInfos = obj; this.MethodInfos = obj;
return this; return this;
} }
public UpdateNavMethodInfo ThenIncludeByNameString(string IncludeByNameString, UpdateNavOptions updateNavOptions = null) public UpdateNavMethodInfo ThenIncludeByNameString(string navMemberName, UpdateNavOptions updateNavOptions = null)
{ {
var type = MethodInfos.GetType().GetGenericArguments()[0]; var type = MethodInfos.GetType().GetGenericArguments()[0];
var entityInfo = this.Context.EntityMaintenance.GetEntityInfo(type); var entityInfo = this.Context.EntityMaintenance.GetEntityInfo(type);
Type properyItemType; Type properyItemType;
Expression exp = UtilMethods.GetIncludeExpression(navMemberName, entityInfo, out properyItemType); bool isList;
var method = this.GetType().GetMyMethod("ThenInclude", 2) Expression exp = UtilMethods.GetIncludeExpression(navMemberName, entityInfo, out properyItemType, out isList);
var method = this.MethodInfos.GetType().GetMyMethod("ThenInclude", 2, isList)
.MakeGenericMethod(properyItemType); .MakeGenericMethod(properyItemType);
var obj = method.Invoke(this, new object[] { exp, updateNavOptions }); var obj = method.Invoke(this.MethodInfos, new object[] { exp, updateNavOptions });
this.MethodInfos = obj; this.MethodInfos = obj;
return this; return this;
} }

View File

@ -32,6 +32,14 @@ namespace SqlSugar
it.GetParameters().Length == argCount&& it.GetParameters().Length == argCount&&
it.GetParameters().First().ParameterType==parameterType); it.GetParameters().First().ParameterType==parameterType);
} }
public static MethodInfo GetMyMethod(this Type type, string name, int argCount, bool isList)
{
var methods= type.GetMethods().Where(it => it.Name == name).Where(it =>
it.GetParameters().Length == argCount&&
it.GetParameters()[0].ToString().Contains("List`") == isList).ToList();
return methods.First();
}
public static MethodInfo GetMyMethod(this Type type, string name, int argCount, Type parameterType,Type parameterType2) public static MethodInfo GetMyMethod(this Type type, string name, int argCount, Type parameterType,Type parameterType2)
{ {
return type.GetMethods().Where(it=>it.Name == name).FirstOrDefault(it => return type.GetMethods().Where(it=>it.Name == name).FirstOrDefault(it =>

View File

@ -18,7 +18,7 @@ namespace SqlSugar
{ {
public class UtilMethods public class UtilMethods
{ {
internal static Expression GetIncludeExpression(string navMemberName, EntityInfo entityInfo, out Type properyItemType) internal static Expression GetIncludeExpression(string navMemberName, EntityInfo entityInfo, out Type properyItemType,out bool isList)
{ {
var navInfo = entityInfo.Columns.Where(it => it.Navigat != null && it.PropertyName.EqualCase(navMemberName)).FirstOrDefault(); var navInfo = entityInfo.Columns.Where(it => it.Navigat != null && it.PropertyName.EqualCase(navMemberName)).FirstOrDefault();
var properyType = navInfo.PropertyInfo.PropertyType; var properyType = navInfo.PropertyInfo.PropertyType;
@ -26,6 +26,11 @@ namespace SqlSugar
if (properyType.FullName.IsCollectionsList()) if (properyType.FullName.IsCollectionsList())
{ {
properyItemType = properyType.GetGenericArguments()[0]; properyItemType = properyType.GetGenericArguments()[0];
isList = true;
}
else
{
isList = false;
} }
return ExpressionBuilderHelper.CreateExpressionSelectField(entityInfo.Type, navInfo.PropertyName, properyType); return ExpressionBuilderHelper.CreateExpressionSelectField(entityInfo.Type, navInfo.PropertyName, properyType);
} }