zhusenlin/serein-flow
1
0
Fork 0
mirror of https://gitee.com/langsisi_admin/serein-flow synced 2026-03-21 16:46:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

修改了无法保存项目文件的bug

Browse Source
This commit is contained in:
fengjiayi
2024-09-17 14:20:27 +08:00
parent e20855a076
commit afadbc5a95
36 changed files with 3023 additions and 772 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
NodeFlow/Tool/SereinExpression/Resolver/MemberConditionResolver.cs
View File

@@ -18,6 +18,8 @@ namespace Serein.NodeFlow.Tool.SereinExpression.Resolver
public override bool Evaluate(object? obj)
{
//object? memberValue = GetMemberValue(obj, MemberPath);
if (TargetObj is T typedObj)
{
return new ValueTypeConditionResolver<T>

11
NodeFlow/Tool/SereinExpression/Resolver/MemberStringConditionResolver.cs
View File

@@ -18,7 +18,16 @@ namespace Serein.NodeFlow.Tool.SereinExpression.Resolver
public override bool Evaluate(object obj)
{
object memberValue = GetMemberValue(obj, MemberPath);
object memberValue;
if (!string.IsNullOrWhiteSpace(MemberPath))
{
memberValue = GetMemberValue(obj, MemberPath);
}
else
{
memberValue = obj;
}
if (memberValue is string strObj)
{
return new StringConditionResolver

18
NodeFlow/Tool/SereinExpression/SereinConditionParser.cs
View File

@@ -12,7 +12,9 @@ namespace Serein.NodeFlow.Tool.SereinExpression
try
{
return ConditionParse(data, expression).Evaluate(data);
var parse = ConditionParse(data, expression);
var result = parse.Evaluate(data);
return result;
}
catch (Exception ex)
@@ -24,7 +26,7 @@ namespace Serein.NodeFlow.Tool.SereinExpression
public static SereinConditionResolver ConditionParse(object data, string expression)
{
if (expression.StartsWith('.')) // 表达式前缀属于从上一个节点数据对象获取成员值
if (expression.StartsWith('.') || expression.StartsWith('<')) // 表达式前缀属于从上一个节点数据对象获取成员值
{
return ParseObjectExpression(data, expression);
}
@@ -128,9 +130,6 @@ namespace Serein.NodeFlow.Tool.SereinExpression
operatorStr = parts[0].ToLower(); // 操作类型
valueStr = string.Join(' ', parts.Skip(1)); // 表达式值
}
targetObj = GetMemberValue(data, memberPath);// 获取对象成员，作为表达式的目标对象
Type? tempType = typeStr switch
{
"int" => typeof(int),
@@ -140,6 +139,15 @@ namespace Serein.NodeFlow.Tool.SereinExpression
_ => Type.GetType(typeStr)
};
type = tempType ?? throw new ArgumentException("对象表达式无效的类型声明");
if (string.IsNullOrWhiteSpace(memberPath))
{
targetObj = Convert.ChangeType(data, type);
}
else
{
targetObj = GetMemberValue(data, memberPath);// 获取对象成员，作为表达式的目标对象
}
}
#region 解析类型 int