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

修改了流程运行中的bug

Browse Source
This commit is contained in:
fengjiayi
2024-10-28 21:52:45 +08:00
parent 561b6d764f
commit 66141533b1
27 changed files with 518 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
NodeFlow/Model/CompositeConditionNode.cs
View File

@@ -29,6 +29,13 @@ namespace Serein.NodeFlow.Model
}
/// <summary>
/// 加载完成后调用的方法
/// </summary>
public override void OnLoading()
{
Console.WriteLine("CompositeConditionNode 暂未实现 OnLoading");
}
public void AddNode(SingleConditionNode node)
{
@@ -59,7 +66,8 @@ namespace Serein.NodeFlow.Model
}
}
return Task.FromResult(context.GetFlowData(PreviousNode.Guid)); // 条件区域透传上一节点的数据
//var previousNode = context.GetPreviousNode()
return Task.FromResult(context.TransmissionData(this)); // 条件区域透传上一节点的数据
}

9
NodeFlow/Model/SingleActionNode.cs
View File

@@ -13,6 +13,15 @@ namespace Serein.NodeFlow.Model
{
}
/// <summary>
/// 加载完成后调用的方法
/// </summary>
public override void OnLoading()
{
Console.WriteLine("SingleActionNode 暂未实现 OnLoading");
}
public override ParameterData[] GetParameterdatas()
{
if (base.MethodDetails.ParameterDetailss.Length > 0)

28
NodeFlow/Model/SingleConditionNode.cs
View File

@@ -39,8 +39,34 @@ namespace Serein.NodeFlow.Model
this.IsCustomData = false;
this.CustomData = null;
this.Expression = "PASS";
}
/// <summary>
/// 加载完成后调用的方法
/// </summary>
public override void OnLoading()
{
var pd = new ParameterDetails
{
Index = 0,
Name = "Exp",
DataType = typeof(object),
ExplicitType = typeof(object),
IsExplicitData = false,
DataValue = string.Empty,
ArgDataSourceNodeGuid = string.Empty,
ArgDataSourceType = ConnectionArgSourceType.GetPreviousNodeData,
NodeModel = this,
Convertor = null,
ExplicitTypeName = "Value",
Items = Array.Empty<string>(),
};
this.MethodDetails.ParameterDetailss = new ParameterDetails[] { pd };
}
/// <summary>
/// 重写节点的方法执行
/// </summary>
@@ -50,7 +76,7 @@ namespace Serein.NodeFlow.Model
{
// 接收上一节点参数or自定义参数内容
object? parameter;
object? result = context.GetFlowData(PreviousNode.Guid); // 条件节点透传上一节点的数据
object? result = context.TransmissionData(this); // 条件节点透传上一节点的数据
if (IsCustomData) // 是否使用自定义参数
{
// 表达式获取上一节点数据

12
NodeFlow/Model/SingleExpOpNode.cs
View File

@@ -28,10 +28,18 @@ namespace Serein.NodeFlow.Model
}
//public override async Task<object?> Executing(IDynamicContext context)
/// <summary>
/// 加载完成后调用的方法
/// </summary>
public override void OnLoading()
{
Console.WriteLine("SingleExpOpNode 暂未实现 OnLoading");
}
public override Task<object?> ExecutingAsync(IDynamicContext context)
{
var data = context.GetFlowData(PreviousNode.Guid); // 表达式节点使用上一节点数据
var data = context.TransmissionData(this); // 表达式节点使用上一节点数据
try
{

10
NodeFlow/Model/SingleFlipflopNode.cs
View File

@@ -16,6 +16,14 @@ namespace Serein.NodeFlow.Model
}
/// <summary>
/// 加载完成后调用的方法
/// </summary>
public override void OnLoading()
{
Console.WriteLine("SingleFlipflopNode 暂未实现 OnLoading");
}
/// <summary>
/// 执行触发器进行等待触发
@@ -56,7 +64,7 @@ namespace Serein.NodeFlow.Model
}
catch (FlipflopException ex)
{
if(ex.Type == FlipflopException.CancelClass.Flow)
if(ex.Type == FlipflopException.CancelClass.CancelFlow)
{
throw;
}