zhusenlin/serein-flow
1
0
Fork 0
mirror of https://gitee.com/langsisi_admin/serein-flow synced 2026-03-12 12:39:25 +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

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;
}