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

修复了条件表达式".xxx<bool> = true/false"执行了错误分支，优化了流程的运行。

Browse Source
This commit is contained in:
fengjiayi
2024-12-16 00:58:45 +08:00
parent 8d0258ebea
commit 0372e1fc23
8 changed files with 57 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Library/Utils/SereinExpression/Resolver/BoolConditionResolver.cs
View File

@@ -18,20 +18,22 @@ namespace Serein.Library.Utils.SereinExpression.Resolver
public Operator Op { get; set; }
public bool Value { get; set; }
public bool Data { get; set; }
public override bool Evaluate(object obj)
{
if (obj is bool boolObj)
{
return boolObj == Value;
/*switch (Op)
{
case Operator.Is:
return boolObj == Value;
}*/
}
return false;
return Value.Equals(Data);
//if (obj is bool boolObj && Value is bool boolValue)
//{
// /*switch (Op)
// {
// case Operator.Is:
// return boolObj == Value;
// }*/
//}
//return false;
}
}

6
Library/Utils/SereinExpression/Resolver/MemberConditionResolver.cs
View File

@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
namespace Serein.Library.Utils.SereinExpression.Resolver
@@ -24,14 +25,15 @@ namespace Serein.Library.Utils.SereinExpression.Resolver
if (TargetObj is T typedObj)
{
return new ValueTypeConditionResolver<T>
var res = new ValueTypeConditionResolver<T>
{
RangeStart = RangeStart,
RangeEnd = RangeEnd,
Op = Op,
Value = Value,
ArithmeticExpression = ArithmeticExpression,
}.Evaluate(typedObj);
};
return res.Evaluate(typedObj);
}
return false;
}