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

改写NodeModelBase类，使其继承Serein.Library.Api下的IFlowNode接口，而实现类迁移到NodeModel项目，方便后续节点运行逻辑修改时不用重新编译类库。

Browse Source
This commit is contained in:
fengjiayi
2025-05-31 12:15:01 +08:00
parent cc0b084c84
commit 84390b574f
36 changed files with 562 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Api/IDynamicContext.cs
View File

@@ -60,33 +60,33 @@ namespace Serein.Library.Api
/// </summary>
/// <param name="currentNodeModel">当前节点</param>
/// <param name="PreviousNode">运行时上一节点</param>
void SetPreviousNode(NodeModelBase currentNodeModel, NodeModelBase PreviousNode);
void SetPreviousNode(IFlowNode currentNodeModel, IFlowNode PreviousNode);
/// <summary>
/// 获取当前节点的运行时上一节点，用以流程中获取数据
/// </summary>
/// <param name="currentNodeModel"></param>
/// <returns></returns>
NodeModelBase GetPreviousNode(NodeModelBase currentNodeModel);
IFlowNode GetPreviousNode(IFlowNode currentNodeModel);
/// <summary>
/// 获取节点的数据（当前节点需要获取上一节点数据时，需要从 运行时上一节点 的Guid 通过这个方法进行获取
/// </summary>
/// <param name="nodeModel"></param>
/// <returns></returns>
FlowResult GetFlowData(NodeModelBase nodeModel);
FlowResult GetFlowData(IFlowNode nodeModel);
/// <summary>
/// 上一节点数据透传到下一节点
/// </summary>
/// <param name="nodeModel"></param>
FlowResult TransmissionData(NodeModelBase nodeModel);
FlowResult TransmissionData(IFlowNode nodeModel);
/// <summary>
/// 添加或更新当前节点的数据
/// </summary>
/// <param name="nodeModel"></param>
/// <param name="flowData"></param>
void AddOrUpdate(NodeModelBase nodeModel, FlowResult flowData);
void AddOrUpdate(IFlowNode nodeModel, FlowResult flowData);
/// <summary>
/// 重置流程状态（用于对象池回收）

6
Library/Api/IFlowEnvironment.cs
View File

@@ -351,7 +351,7 @@ namespace Serein.Library.Api
/// <param name="canvasGuid">画布</param>
/// <param name="nodeModel">节点对象</param>
/// <param name="position">位置</param>
public NodeCreateEventArgs(string canvasGuid, NodeModelBase nodeModel, PositionOfUI position)
public NodeCreateEventArgs(string canvasGuid, IFlowNode nodeModel, PositionOfUI position)
{
CanvasGuid = canvasGuid;
this.NodeModel = nodeModel;
@@ -365,7 +365,7 @@ namespace Serein.Library.Api
/// <summary>
/// 节点Model对象
/// </summary>
public NodeModelBase NodeModel { get; private set; }
public IFlowNode NodeModel { get; private set; }
/// <summary>
/// 在UI上的位置
/// </summary>
@@ -1070,7 +1070,7 @@ namespace Serein.Library.Api
/// <param name="nodeGuid"></param>
/// <param name="nodeModel"></param>
/// <returns></returns>
bool TryGetNodeModel(string nodeGuid, out NodeModelBase nodeModel);
bool TryGetNodeModel(string nodeGuid, out IFlowNode nodeModel);
/// <summary>
/// 获取方法描述信息

123
Library/Api/IFlowNode.cs Normal file
View File

@@ -0,0 +1,123 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using System.Threading.Tasks;
using Serein.Library;
namespace Serein.Library.Api
{
/// <summary>
/// 流程节点
/// </summary>
public interface IFlowNode : INotifyPropertyChanged, IDynamicFlowNode
{
/// <summary>
/// 节点持有的运行环境
/// </summary>
IFlowEnvironment Env { get; set; }
/// <summary>
/// 节点唯一标识
/// </summary>
string Guid { get; set; }
/// <summary>
/// 节点的类型
/// </summary>
NodeControlType ControlType { get; set; }
/// <summary>
/// 节点所在画布
/// </summary>
FlowCanvasDetails CanvasDetails { get; set; }
/// <summary>
/// 节点位置
/// </summary>
PositionOfUI Position { get; set; }
/// <summary>
/// 节点显示名称
/// </summary>
string DisplayName { get; set; }
/// <summary>
/// 是否作为公开的节点，用以“流程接口”节点调用
/// </summary>
bool IsPublic { get; set; }
/// <summary>
/// 是否为基础节点，指示节点创建中的行为
/// </summary>
bool IsBase { get; }
/// <summary>
/// 最多可以放置几个节点，当该节点具有容器功能时，用来指示其容器的行为。
/// </summary>
int MaxChildrenCount { get;}
/// <summary>
/// 调试器
/// </summary>
NodeDebugSetting DebugSetting { get; set; }
/// <summary>
/// 节点方法描述，包含入参数据
/// </summary>
MethodDetails MethodDetails { get; set; }
/// <summary>
/// 父节点
/// </summary>
Dictionary<ConnectionInvokeType, List<IFlowNode>> PreviousNodes { get;}
/// <summary>
/// 子节点
/// </summary>
Dictionary<ConnectionInvokeType, List<IFlowNode>> SuccessorNodes { get; set; }
/// <summary>
/// 当该节点放置在某个具有容器行为的节点时，该值指示其容器节点
/// </summary>
IFlowNode ContainerNode { get; set; }
/// <summary>
/// 当该节点具备容器行为时，该集合包含其容器中的节点
/// </summary>
List<IFlowNode> ChildrenNode { get; }
/// <summary>
/// 节点创建时的行为
/// </summary>
void OnCreating();
/// <summary>
/// 节点移除时的行为
/// </summary>
void Remove();
/// <summary>
/// 节点保存时如若需要保存自定义数据，可通过该方法进行控制保存逻辑
/// </summary>
/// <param name="nodeInfo"></param>
/// <returns></returns>
NodeInfo SaveCustomData(NodeInfo nodeInfo);
/// <summary>
/// 节点从信息创建后需要加载自定义数据时，可通过该方法进行控制加载逻辑
/// </summary>
/// <param name="nodeInfo"></param>
void LoadCustomData(NodeInfo nodeInfo);
/// <summary>
/// 节点执行方法
/// </summary>
/// <param name="context"></param>
/// <param name="token"></param>
/// <returns></returns>
Task<FlowResult> ExecutingAsync(IDynamicContext context, CancellationToken token);
}
}

4
Library/Api/INodeContainer.cs
View File

@@ -15,13 +15,13 @@ namespace Serein.Library.Api
/// 放置一个节点
/// </summary>
/// <param name="nodeModel"></param>
bool PlaceNode(NodeModelBase nodeModel);
bool PlaceNode(IFlowNode nodeModel);
/// <summary>
/// 取出一个节点
/// </summary>
/// <param name="nodeModel"></param>
bool TakeOutNode(NodeModelBase nodeModel);
bool TakeOutNode(IFlowNode nodeModel);
/// <summary>
/// 取出所有节点（用于删除容器）

2
Library/Api/IScriptFlowApi.cs
View File

@@ -18,7 +18,7 @@ namespace Serein.Library.Api
/// <summary>
/// 对应的节点
/// </summary>
NodeModelBase NodeModel { get; }
IFlowNode NodeModel { get; }
/// <summary>
/// 根据索引从入参数据获取数据

18
Library/Extension/FlowModelExtension.cs
View File

@@ -62,7 +62,7 @@ namespace Serein.Library
/// 输出方法参数信息
/// </summary>
/// <returns></returns>
public static ParameterData[] SaveParameterInfo(this NodeModelBase nodeModel)
public static ParameterData[] SaveParameterInfo(this IFlowNode nodeModel)
{
if (nodeModel.MethodDetails is null || nodeModel.MethodDetails.ParameterDetailss == null)
{
@@ -93,7 +93,7 @@ namespace Serein.Library
/// 导出为节点信息
/// </summary>
/// <returns></returns>
public static NodeInfo ToInfo(this NodeModelBase nodeModel)
public static NodeInfo ToInfo(this IFlowNode nodeModel)
{
// if (MethodDetails == null) return null;
var trueNodes = nodeModel.SuccessorNodes[ConnectionInvokeType.IsSucceed].Select(item => item.Guid); // 真分支
@@ -137,7 +137,7 @@ namespace Serein.Library
/// <param name="canvas"></param>
/// <param name="nodeInfo"></param>
/// <returns></returns>
public static void LoadInfo(this NodeModelBase nodeModel, NodeInfo nodeInfo)
public static void LoadInfo(this IFlowNode nodeModel, NodeInfo nodeInfo)
{
nodeModel.Guid = nodeInfo.Guid;
nodeModel.Position = nodeInfo.Position ?? new PositionOfUI(0, 0);// 加载位置信息
@@ -200,10 +200,10 @@ namespace Serein.Library
/// <param name="context"></param>
/// <param name="token">流程运行</param>
/// <returns></returns>
public static async Task StartFlowAsync(this NodeModelBase nodeModel, IDynamicContext context, CancellationToken token)
public static async Task StartFlowAsync(this IFlowNode nodeModel, IDynamicContext context, CancellationToken token)
{
Stack<NodeModelBase> stack = new Stack<NodeModelBase>();
HashSet<NodeModelBase> processedNodes = new HashSet<NodeModelBase>(); // 用于记录已处理上游节点的节点
Stack<IFlowNode> stack = new Stack<IFlowNode>();
HashSet<IFlowNode> processedNodes = new HashSet<IFlowNode>(); // 用于记录已处理上游节点的节点
stack.Push(nodeModel);
while (context.RunState != RunState.Completion // 没有完成
&& token.IsCancellationRequested == false // 没有取消
@@ -276,7 +276,7 @@ namespace Serein.Library
/// <summary>
/// 获取对应的参数数组
/// </summary>
public static async Task<object[]> GetParametersAsync(this NodeModelBase nodeModel, IDynamicContext context, CancellationToken token)
public static async Task<object[]> GetParametersAsync(this IFlowNode nodeModel, IDynamicContext context, CancellationToken token)
{
if (nodeModel.MethodDetails.ParameterDetailss.Length == 0)
{
@@ -412,7 +412,7 @@ namespace Serein.Library
/// <summary>
/// 不再中断
/// </summary>
public static void CancelInterrupt(NodeModelBase nodeModel)
public static void CancelInterrupt(IFlowNode nodeModel)
{
nodeModel.DebugSetting.IsInterrupt = false;
nodeModel.DebugSetting.CancelInterrupt?.Invoke();
@@ -424,7 +424,7 @@ namespace Serein.Library
/// </summary>
/// <param name="nodeModel">节点Model</param>
/// <param name="newMd">新的方法描述</param>
public static void UploadMethod(this NodeModelBase nodeModel, MethodDetails newMd)
public static void UploadMethod(this IFlowNode nodeModel, MethodDetails newMd)
{
var thisMd = nodeModel.MethodDetails;

22
Library/FlowNode/DynamicContext.cs
View File

@@ -49,24 +49,24 @@ namespace Serein.Library
/// <summary>
/// 每个流程上下文分别存放节点的当前数据
/// </summary>
private readonly ConcurrentDictionary<NodeModelBase, FlowResult> dictNodeFlowData = new ConcurrentDictionary<NodeModelBase, FlowResult>();
private readonly ConcurrentDictionary<IFlowNode, FlowResult> dictNodeFlowData = new ConcurrentDictionary<IFlowNode, FlowResult>();
/// <summary>
/// 每个流程上下文存储运行时节点的调用关系
/// </summary>
private readonly ConcurrentDictionary<NodeModelBase, NodeModelBase> dictPreviousNodes = new ConcurrentDictionary<NodeModelBase, NodeModelBase>();
private readonly ConcurrentDictionary<IFlowNode, IFlowNode> dictPreviousNodes = new ConcurrentDictionary<IFlowNode, IFlowNode>();
/// <summary>
/// 记录忽略处理的流程
/// </summary>
private readonly ConcurrentDictionary<NodeModelBase, bool> dictIgnoreNodeFlow = new ConcurrentDictionary<NodeModelBase, bool>();
private readonly ConcurrentDictionary<IFlowNode, bool> dictIgnoreNodeFlow = new ConcurrentDictionary<IFlowNode, bool>();
/// <summary>
/// 设置运行时上一节点
/// </summary>
/// <param name="currentNodeModel">当前节点</param>
/// <param name="PreviousNode">上一节点</param>
public void SetPreviousNode(NodeModelBase currentNodeModel, NodeModelBase PreviousNode)
public void SetPreviousNode(IFlowNode currentNodeModel, IFlowNode PreviousNode)
{
dictPreviousNodes.AddOrUpdate(currentNodeModel, (_) => PreviousNode, (o, n) => PreviousNode);
}
@@ -75,7 +75,7 @@ namespace Serein.Library
/// 忽略处理该节点流程
/// </summary>
/// <param name="node"></param>
public void IgnoreFlowHandle(NodeModelBase node)
public void IgnoreFlowHandle(IFlowNode node)
{
dictIgnoreNodeFlow.AddOrUpdate(node, (o) => true, (o, n) => true);
}
@@ -85,7 +85,7 @@ namespace Serein.Library
/// </summary>
/// <param name="node"></param>
/// <returns></returns>
public bool GetIgnodeFlowStateUpload(NodeModelBase node)
public bool GetIgnodeFlowStateUpload(IFlowNode node)
{
return dictIgnoreNodeFlow.TryGetValue(node, out var state) ? state : false;
}
@@ -94,7 +94,7 @@ namespace Serein.Library
/// </summary>
/// <param name="node"></param>
/// <returns></returns>
public void RecoverIgnodeFlowStateUpload(NodeModelBase node)
public void RecoverIgnodeFlowStateUpload(IFlowNode node)
{
dictIgnoreNodeFlow.AddOrUpdate(node, (o) => false, (o, n) => false);
}
@@ -105,7 +105,7 @@ namespace Serein.Library
/// </summary>
/// <param name="currentNodeModel"></param>
/// <returns></returns>
public NodeModelBase GetPreviousNode(NodeModelBase currentNodeModel)
public IFlowNode GetPreviousNode(IFlowNode currentNodeModel)
{
if (dictPreviousNodes.TryGetValue(currentNodeModel, out var node))
{
@@ -122,7 +122,7 @@ namespace Serein.Library
/// </summary>
/// <param name="nodeGuid">节点</param>
/// <returns></returns>
public FlowResult GetFlowData(NodeModelBase nodeGuid)
public FlowResult GetFlowData(IFlowNode nodeGuid)
{
if (dictNodeFlowData.TryGetValue(nodeGuid, out var data))
{
@@ -139,7 +139,7 @@ namespace Serein.Library
/// </summary>
/// <param name="nodeModel">节点</param>
/// <param name="flowData">新的数据</param>
public void AddOrUpdate(NodeModelBase nodeModel, FlowResult flowData)
public void AddOrUpdate(IFlowNode nodeModel, FlowResult flowData)
{
// this.dictNodeFlowData.TryGetValue(nodeGuid, out var oldFlowData);
dictNodeFlowData.AddOrUpdate(nodeModel, _ => flowData, (o,n ) => flowData);
@@ -149,7 +149,7 @@ namespace Serein.Library
/// 上一节点数据透传到下一节点
/// </summary>
/// <param name="nodeModel"></param>
public FlowResult TransmissionData(NodeModelBase nodeModel)
public FlowResult TransmissionData(IFlowNode nodeModel)
{
if (dictPreviousNodes.TryGetValue(nodeModel, out var previousNode)) // 首先获取当前节点的上一节点
{

6
Library/FlowNode/FlowCanvasDetails.cs
View File

@@ -30,13 +30,13 @@ namespace Serein.Library
/// 画布拥有的节点
/// </summary>
[PropertyInfo(IsProtection = true)]
private System.Collections.ObjectModel.ObservableCollection<NodeModelBase> _nodes = [];
private System.Collections.ObjectModel.ObservableCollection<IFlowNode> _nodes = [];
/// <summary>
/// 画布公开的节点
/// </summary>
[PropertyInfo(IsProtection = true)]
private System.Collections.ObjectModel.ObservableCollection<NodeModelBase> _publicNodes = [];
private System.Collections.ObjectModel.ObservableCollection<IFlowNode> _publicNodes = [];
/// <summary>
/// 标识画布ID
@@ -90,7 +90,7 @@ namespace Serein.Library
/// 起始节点
/// </summary>
[PropertyInfo]
private NodeModelBase _startNode;
private IFlowNode _startNode;
}

4
Library/FlowNode/FlowResult.cs
View File

@@ -30,7 +30,7 @@ namespace Serein.Library
/// </summary>
/// <param name="nodeModel"></param>
/// <param name="context"></param>
public FlowResult(NodeModelBase nodeModel, IDynamicContext context, object value)
public FlowResult(IFlowNode nodeModel, IDynamicContext context, object value)
{
this.NodeGuid = nodeModel.Guid;
this.ContextGuid = context.Guid;
@@ -41,7 +41,7 @@ namespace Serein.Library
/// </summary>
/// <param name="nodeModel"></param>
/// <param name="context"></param>
public FlowResult(NodeModelBase nodeModel, IDynamicContext context)
public FlowResult(IFlowNode nodeModel, IDynamicContext context)
{
this.NodeGuid = nodeModel.Guid;
this.ContextGuid = context.Guid;

7
Library/FlowNode/JunctionModel.cs
View File

@@ -1,4 +1,5 @@
using System;
using Serein.Library.Api;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -32,7 +33,7 @@ namespace Serein.Library.FlowNode
/// </summary>
public class JunctionModel
{
public JunctionModel(NodeModelBase NodeModel, JunctionType JunctionType)
public JunctionModel(IFlowNode NodeModel, JunctionType JunctionType)
{
Guid = System.Guid.NewGuid().ToString();
this.NodeModel = NodeModel;
@@ -51,6 +52,6 @@ namespace Serein.Library.FlowNode
/// <summary>
/// 连接点依附的节点
/// </summary>
public NodeModelBase NodeModel { get; }
public IFlowNode NodeModel { get; }
}
}

8
Library/FlowNode/MethodDetails.cs
View File

@@ -21,7 +21,7 @@ namespace Serein.Library
/// 对应的节点
/// </summary>
[PropertyInfo(IsProtection = true)]
private NodeModelBase _nodeModel;
private IFlowNode _nodeModel;
/// <summary>
/// 对应的程序集
@@ -179,7 +179,7 @@ namespace Serein.Library
/// 生成元数据
/// </summary>
/// <param name="nodeModel">标识属于哪个节点</param>
public MethodDetails(NodeModelBase nodeModel)
public MethodDetails(IFlowNode nodeModel)
{
NodeModel = nodeModel;
}
@@ -226,10 +226,10 @@ namespace Serein.Library
/// 从DLL拖动出来时，从元数据拷贝新的实例，作为属于节点独享的方法描述
/// </summary>
/// <returns></returns>
public MethodDetails CloneOfNode( NodeModelBase nodeModel)
public MethodDetails CloneOfNode( IFlowNode nodeModel)
{
// this => 是元数据
var md = new MethodDetails( nodeModel) // 创建新节点时拷贝实例
var md = new MethodDetails(nodeModel) // 创建新节点时拷贝实例
{
AssemblyName = this.AssemblyName, // 拷贝
//ActingInstance = this.ActingInstance,

5
Library/FlowNode/NodeDebugSetting.cs
View File

@@ -1,4 +1,5 @@
using Newtonsoft.Json.Linq;
using Serein.Library.Api;
using Serein.Library.Utils;
using System;
using System.Collections.Generic;
@@ -17,7 +18,7 @@ namespace Serein.Library
/// 创建属于某个节点的调试设置
/// </summary>
/// <param name="nodeModel"></param>
public NodeDebugSetting(NodeModelBase nodeModel)
public NodeDebugSetting(IFlowNode nodeModel)
{
NodeModel = nodeModel;
}
@@ -33,7 +34,7 @@ namespace Serein.Library
/// 对应的节点
/// </summary>
[PropertyInfo(IsProtection = true)]
private NodeModelBase _nodeModel;
private IFlowNode _nodeModel;
/// <summary>
/// 是否使能

4
Library/FlowNode/NodeModelBaseFunc.cs
View File

@@ -22,6 +22,9 @@ namespace Serein.Library
/// <summary>
/// 节点基类
/// </summary>
@@ -141,7 +144,6 @@ namespace Serein.Library
}
}

8
Library/FlowNode/ParameterDetails.cs
View File

@@ -26,7 +26,7 @@ namespace Serein.Library
/// 所在的节点
/// </summary>
[PropertyInfo(IsProtection = true)]
private NodeModelBase _nodeModel;
private IFlowNode _nodeModel;
/// <summary>
/// 参数索引
@@ -130,7 +130,7 @@ namespace Serein.Library
/// <summary>
/// 为节点实例化新的入参描述
/// </summary>
public ParameterDetails(NodeModelBase nodeModel)
public ParameterDetails(IFlowNode nodeModel)
{
this.NodeModel = nodeModel;
}
@@ -185,7 +185,7 @@ namespace Serein.Library
/// </summary>
/// <param name="nodeModel">对应的节点</param>
/// <returns></returns>
public ParameterDetails CloneOfModel(NodeModelBase nodeModel)
public ParameterDetails CloneOfModel(IFlowNode nodeModel)
{
var pd = new ParameterDetails(nodeModel)
{
@@ -224,7 +224,7 @@ namespace Serein.Library
return context;
}
// 返回流程上下文
if (typeof(NodeModelBase).IsAssignableFrom(DataType))
if (typeof(IFlowNode).IsAssignableFrom(DataType))
{
return NodeModel;
}

2
Library/Serein.Library.csproj
View File

@@ -38,6 +38,8 @@
<ItemGroup>
<Compile Remove="FlowNode\Attribute.cs" />
<Compile Remove="FlowNode\NodeModelBaseData.cs" />
<Compile Remove="FlowNode\NodeModelBaseFunc.cs" />
<Compile Remove="FlowNode\ScriptFlowApi.cs" />
<Compile Remove="Utils\NativeDllHelper.cs" />
</ItemGroup>