zhusenlin/serein-flow
1
0
Fork 0
mirror of https://gitee.com/langsisi_admin/serein-flow synced 2026-03-02 15:50:47 +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>

32
NodeFlow/Env/FlowEnvironment.cs
View File

@@ -301,7 +301,7 @@ namespace Serein.NodeFlow.Env
/// 环境加载的节点集合
/// Node Guid - Node Model
/// </summary>
private Dictionary<string, NodeModelBase> NodeModels { get; } = [];
private Dictionary<string, IFlowNode> NodeModels { get; } = [];
/// <summary>
/// 运行环境加载的画布集合
@@ -746,7 +746,7 @@ namespace Serein.NodeFlow.Env
sb.AppendLine();
for (int i = 0; i < groupedNodes.Length; i++)
{
NodeModelBase? node = groupedNodes[i];
IFlowNode? node = groupedNodes[i];
sb.AppendLine($"{i} => {node.Guid}");
}
SereinEnv.WriteLine(InfoType.ERROR, $"无法卸载[{assemblyName}]程序集，因为这些节点依赖于此程序集：{sb.ToString()}");
@@ -1047,7 +1047,7 @@ namespace Serein.NodeFlow.Env
{
return Task.FromResult<NodeInfo>(null);
}
NodeModelBase? nodeModel;
IFlowNode? nodeModel;
if (methodDetailsInfo is null
|| string.IsNullOrEmpty(methodDetailsInfo.AssemblyName)
|| string.IsNullOrEmpty(methodDetailsInfo.MethodName))
@@ -1097,7 +1097,7 @@ namespace Serein.NodeFlow.Env
}
if (nodeModel.ContainerNode is INodeContainer tmpContainer)
{
SereinEnv.WriteLine(InfoType.WARN, $"节点放置失败，节点[{nodeGuid}]已经放置于容器节点[{((NodeModelBase)tmpContainer).Guid}]");
SereinEnv.WriteLine(InfoType.WARN, $"节点放置失败，节点[{nodeGuid}]已经放置于容器节点[{((IFlowNode)tmpContainer).Guid}]");
return Task.FromResult(false);
}
@@ -1183,7 +1183,7 @@ namespace Serein.NodeFlow.Env
var pCType = pnc.Key; // 连接类型
for (int i = 0; i < pnc.Value.Count; i++)
{
NodeModelBase? pNode = pnc.Value[i];
IFlowNode? pNode = pnc.Value[i];
pNode.SuccessorNodes[pCType].Remove(remoteNode);
UIContextOperation?.Invoke(() => OnNodeConnectChange?.Invoke(new NodeConnectChangeEventArgs(
@@ -1210,7 +1210,7 @@ namespace Serein.NodeFlow.Env
var connectionType = snc.Key; // 连接类型
for (int i = 0; i < snc.Value.Count; i++)
{
NodeModelBase? toNode = snc.Value[i];
IFlowNode? toNode = snc.Value[i];
await RemoteConnectAsync(canvasGuid, remoteNode, toNode, connectionType);
@@ -1605,7 +1605,7 @@ namespace Serein.NodeFlow.Env
/// <param name="nodeGuid">节点Guid</param>
/// <returns>节点Model</returns>
/// <exception cref="ArgumentNullException">无法获取节点、Guid/节点为null时报错</exception>
public bool TryGetNodeModel(string nodeGuid,out NodeModelBase nodeModel)
public bool TryGetNodeModel(string nodeGuid,out IFlowNode nodeModel)
{
if (string.IsNullOrEmpty(nodeGuid))
{
@@ -1793,7 +1793,7 @@ namespace Serein.NodeFlow.Env
/// <param name="toNodeGuid">目标节点Model</param>
/// <param name="connectionType">连接关系</param>
/// <exception cref="NotImplementedException"></exception>
private async Task<bool> RemoteConnectAsync(string canvasGuid, NodeModelBase fromNode, NodeModelBase toNode, ConnectionInvokeType connectionType)
private async Task<bool> RemoteConnectAsync(string canvasGuid, IFlowNode fromNode, IFlowNode toNode, ConnectionInvokeType connectionType)
{
if (!FlowCanvass.ContainsKey(canvasGuid))
{
@@ -1823,7 +1823,7 @@ namespace Serein.NodeFlow.Env
/// <param name="toNodeGuid">目标节点Model</param>
/// <param name="connectionType">连接关系</param>
/// <exception cref="NotImplementedException"></exception>
private async Task<bool> RemoteConnectAsync(string canvasGuid, NodeModelBase fromNode, NodeModelBase toNode, int argIndex)
private async Task<bool> RemoteConnectAsync(string canvasGuid, IFlowNode fromNode, IFlowNode toNode, int argIndex)
{
if (!FlowCanvass.ContainsKey(canvasGuid))
{
@@ -1856,7 +1856,7 @@ namespace Serein.NodeFlow.Env
/// 创建节点
/// </summary>
/// <param name="nodeBase"></param>
private bool TryAddNode(NodeModelBase nodeModel)
private bool TryAddNode(IFlowNode nodeModel)
{
nodeModel.Guid ??= Guid.NewGuid().ToString();
NodeModels.TryAdd(nodeModel.Guid, nodeModel);
@@ -1882,8 +1882,8 @@ namespace Serein.NodeFlow.Env
/// <param name="fromNodeJunctionType">发起连接节点的控制点类型</param>
/// <param name="toNodeJunctionType">被连接节点的控制点类型</param>
/// <returns></returns>
public static (JunctionOfConnectionType,bool) CheckConnect(NodeModelBase fromNode,
NodeModelBase toNode,
public static (JunctionOfConnectionType,bool) CheckConnect(IFlowNode fromNode,
IFlowNode toNode,
JunctionType fromNodeJunctionType,
JunctionType toNodeJunctionType)
{
@@ -1947,7 +1947,7 @@ namespace Serein.NodeFlow.Env
/// <param name="fromNode">起始节点</param>
/// <param name="toNode">目标节点</param>
/// <param name="invokeType">连接关系</param>
private bool ConnectInvokeOfNode(string canvasGuid, NodeModelBase fromNode, NodeModelBase toNode, ConnectionInvokeType invokeType)
private bool ConnectInvokeOfNode(string canvasGuid, IFlowNode fromNode, IFlowNode toNode, ConnectionInvokeType invokeType)
{
if (fromNode.ControlType == NodeControlType.FlowCall)
{
@@ -2065,8 +2065,8 @@ namespace Serein.NodeFlow.Env
/// <param name="argIndex"></param>
/// <returns></returns>
private async Task<bool> ConnectArgSourceOfNodeAsync(string canvasGuid,
NodeModelBase fromNode,
NodeModelBase toNode,
IFlowNode fromNode,
IFlowNode toNode,
ConnectionArgSourceType connectionArgSourceType,
int argIndex)
{
@@ -2127,7 +2127,7 @@ namespace Serein.NodeFlow.Env
/// </summary>
/// <param name="cavnasModel">节点所在的画布</param>
/// <param name="newStartNode">起始节点</param>
private void SetStartNode(FlowCanvasDetails cavnasModel, NodeModelBase newStartNode)
private void SetStartNode(FlowCanvasDetails cavnasModel, IFlowNode newStartNode)
{
var oldNodeGuid = cavnasModel.StartNode?.Guid;
/*if(TryGetNodeModel(oldNodeGuid, out var newStartNodeModel))

2
NodeFlow/Env/FlowEnvironmentDecorator.cs
View File

@@ -560,7 +560,7 @@ namespace Serein.NodeFlow.Env
currentFlowEnvironment.SetUIContextOperation(uiContextOperation);
}
public bool TryGetNodeModel(string nodeGuid, out NodeModelBase nodeModel)
public bool TryGetNodeModel(string nodeGuid, out IFlowNode nodeModel)
{
return currentFlowEnvironment.TryGetNodeModel(nodeGuid, out nodeModel);
}

16
NodeFlow/Env/RemoteFlowEnvironment.cs
View File

@@ -41,7 +41,7 @@ namespace Serein.NodeFlow.Env
/// 环境加载的节点集合
/// Node Guid - Node Model
/// </summary>
private Dictionary<string, NodeModelBase> NodeModels { get; } = [];
private Dictionary<string, IFlowNode> NodeModels { get; } = [];
public event LoadDllHandler OnDllLoad;
public event ProjectLoadedHandler OnProjectLoaded;
@@ -1167,21 +1167,21 @@ namespace Serein.NodeFlow.Env
#region 私有方法
private NodeModelBase? GuidToModel(string nodeGuid)
private IFlowNode? GuidToModel(string nodeGuid)
{
if (string.IsNullOrEmpty(nodeGuid))
{
//throw new ArgumentNullException("not contains - Guid没有对应节点:" + (nodeGuid));
return null;
}
if (!NodeModels.TryGetValue(nodeGuid, out NodeModelBase? nodeModel) || nodeModel is null)
if (!NodeModels.TryGetValue(nodeGuid, out IFlowNode? nodeModel) || nodeModel is null)
{
//throw new ArgumentNullException("null - Guid存在对应节点,但节点为null:" + (nodeGuid));
return null;
}
return nodeModel;
}
private bool TryAddNode(NodeModelBase nodeModel)
private bool TryAddNode(IFlowNode nodeModel)
{
NodeModels[nodeModel.Guid] = nodeModel;
return true;
@@ -1268,7 +1268,7 @@ namespace Serein.NodeFlow.Env
#region 确定节点之间的方法调用关系
foreach (var nodeInfo in nodeInfos)
{
if (!NodeModels.TryGetValue(nodeInfo.Guid, out NodeModelBase? fromNode))
if (!NodeModels.TryGetValue(nodeInfo.Guid, out IFlowNode? fromNode))
{
// 不存在对应的起始节点
continue;
@@ -1279,13 +1279,13 @@ namespace Serein.NodeFlow.Env
(ConnectionInvokeType.IsError, nodeInfo.ErrorNodes),
(ConnectionInvokeType.Upstream, nodeInfo.UpstreamNodes)];
List<(ConnectionInvokeType, NodeModelBase[])> fromNodes = allToNodes.Where(info => info.guids.Length > 0)
List<(ConnectionInvokeType, IFlowNode[])> fromNodes = allToNodes.Where(info => info.guids.Length > 0)
.Select(info => (info.connectionType,
info.guids.Where(guid => NodeModels.ContainsKey(guid)).Select(guid => NodeModels[guid])
.ToArray()))
.ToList();
// 遍历每种类型的节点分支（四种）
foreach ((ConnectionInvokeType connectionType, NodeModelBase[] toNodes) item in fromNodes)
foreach ((ConnectionInvokeType connectionType, IFlowNode[] toNodes) item in fromNodes)
{
// 遍历当前类型分支的节点（确认连接关系）
foreach (var toNode in item.toNodes)
@@ -1346,7 +1346,7 @@ namespace Serein.NodeFlow.Env
}
public bool TryGetNodeModel(string nodeGuid, out NodeModelBase nodeModel)
public bool TryGetNodeModel(string nodeGuid, out IFlowNode nodeModel)
{
this.WriteLine(InfoType.INFO, "远程环境尚未实现的接口：TryGetNodeModel");
nodeModel = null;

4
NodeFlow/FlowNodeExtension.cs
View File

@@ -38,7 +38,7 @@ namespace Serein.NodeFlow
/// <param name="methodDetails">方法描述</param>
/// <returns></returns>
/// <exception cref="Exception"></exception>
public static NodeModelBase CreateNode(IFlowEnvironment env, NodeControlType nodeControlType,
public static IFlowNode CreateNode(IFlowEnvironment env, NodeControlType nodeControlType,
MethodDetails? methodDetails = null)
{
@@ -51,7 +51,7 @@ namespace Serein.NodeFlow
// 生成实例
var nodeObj = Activator.CreateInstance(nodeMVVM.ModelType, env);
if (nodeObj is not NodeModelBase nodeModel)
if (nodeObj is not IFlowNode nodeModel)
{
throw new Exception($"无法创建目标节点类型的实例[{nodeControlType}]");
}

10
NodeFlow/FlowWorkManagement.cs
View File

@@ -49,7 +49,7 @@ namespace Serein.NodeFlow
public async Task<bool> RunAsync(CancellationToken token)
{
#region 注册所有节点所属的类的类型，如果注册失败则退出
List<NodeModelBase> nodes = new List<NodeModelBase>();
List<IFlowNode> nodes = new List<IFlowNode>();
foreach (var item in WorkOptions.Flows.Values)
{
var temp = item.GetNodes();
@@ -85,7 +85,7 @@ namespace Serein.NodeFlow
var flowNodes = flow.GetNodes();
// 找到流程的起始节点，开始运行
NodeModelBase startNode = flow.GetStartNode();
IFlowNode startNode = flow.GetStartNode();
// 是否后台运行当前画布流程
if (flow.IsTaskAsync)
{
@@ -110,7 +110,7 @@ namespace Serein.NodeFlow
/// 初始化节点所需的所有类型
/// </summary>
/// <returns></returns>
private bool RegisterAllType(List<NodeModelBase> nodes)
private bool RegisterAllType(List<IFlowNode> nodes)
{
var env = WorkOptions.Environment;
@@ -248,7 +248,7 @@ namespace Serein.NodeFlow
/// </summary>
/// <param name="startNode"></param>
/// <returns></returns>
private async Task CallStartNode(NodeModelBase startNode)
private async Task CallStartNode(IFlowNode startNode)
{
var pool = WorkOptions.FlowContextPool;
var token = WorkOptions.CancellationTokenSource.Token;
@@ -268,7 +268,7 @@ namespace Serein.NodeFlow
/// <param name="env"></param>
/// <param name="startNode"></param>
/// <returns></returns>
public async Task StartFlowInSelectNodeAsync(IFlowEnvironment env, NodeModelBase startNode)
public async Task StartFlowInSelectNodeAsync(IFlowEnvironment env, IFlowNode startNode)
{
var pool = WorkOptions.FlowContextPool;
var context = pool.Allocate();

4
NodeFlow/FlowWorkOptions.cs
View File

@@ -20,12 +20,12 @@ namespace Serein.NodeFlow
/// <summary>
/// 流程起始节点
/// </summary>
public Func<NodeModelBase> GetStartNode { get; set; }
public Func<IFlowNode> GetStartNode { get; set; }
/// <summary>
/// 获取当前画布流程的所有节点
/// </summary>
public Func<List<NodeModelBase>> GetNodes { get; set; }
public Func<List<IFlowNode>> GetNodes { get; set; }
}
/// <summary>

157
NodeFlow/Model/NodeModelBaseData.cs Normal file
View File

@@ -0,0 +1,157 @@
using Serein.Library;
using Serein.Library.Api;
using Serein.Library.NodeGenerator;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Net.Mime;
using System.Threading;
namespace Serein.NodeFlow.Model
{
/// <summary>
/// 节点基类（数据）
/// </summary>
[NodeProperty(ValuePath = NodeValuePath.Node)]
public abstract partial class NodeModelBase : IFlowNode
{
/// <summary>
/// 节点运行环境
/// </summary>
[PropertyInfo(IsProtection = true)]
private IFlowEnvironment _env;
/// <summary>
/// 标识节点对象全局唯一
/// </summary>
[PropertyInfo(IsProtection = true)]
private string _guid;
/// <summary>
/// 描述节点对应的控件类型
/// </summary>
[PropertyInfo(IsProtection = true)]
private NodeControlType _controlType;
/// <summary>
/// 所属画布
/// </summary>
[PropertyInfo(IsProtection = true)]
private FlowCanvasDetails _canvasDetails ;
/// <summary>
/// 在画布中的位置
/// </summary>
[PropertyInfo(IsProtection = true)]
private PositionOfUI _position ;
/// <summary>
/// 显示名称
/// </summary>
[PropertyInfo]
private string _displayName;
/// <summary>
/// 是否公开
/// </summary>
[PropertyInfo(IsNotification = true)]
private bool _isPublic;
/* /// <summary>
/// 是否保护参数
/// </summary>
[PropertyInfo(IsNotification = true)]
private bool _isProtectionParameter;*/
/// <summary>
/// 附加的调试功能
/// </summary>
[PropertyInfo(IsProtection = true)]
private NodeDebugSetting _debugSetting ;
/// <summary>
/// 方法描述。包含参数信息。不包含Method与委托，如若需要调用对应的方法，需要通过MethodName从环境中获取委托进行调用。
/// </summary>
[PropertyInfo]
private MethodDetails _methodDetails ;
}
public abstract partial class NodeModelBase : IDynamicFlowNode
{
/// <summary>
/// 是否为基础节点
/// </summary>
public virtual bool IsBase { get; } = false;
/// <summary>
/// 可以放置多少个节点
/// </summary>
public virtual int MaxChildrenCount { get; } = 0;
public NodeModelBase(IFlowEnvironment environment)
{
PreviousNodes = new Dictionary<ConnectionInvokeType, List<IFlowNode>>();
SuccessorNodes = new Dictionary<ConnectionInvokeType, List<IFlowNode>>();
foreach (ConnectionInvokeType ctType in NodeStaticConfig.ConnectionTypes)
{
PreviousNodes[ctType] = new List<IFlowNode>();
SuccessorNodes[ctType] = new List<IFlowNode>();
}
ChildrenNode = new List<IFlowNode>();
DebugSetting = new NodeDebugSetting(this);
this.Env = environment;
}
/// <summary>
/// 不同分支的父节点（流程调用）
/// </summary>
public Dictionary<ConnectionInvokeType, List<IFlowNode>> PreviousNodes { get; }
/// <summary>
/// 不同分支的子节点（流程调用）
/// </summary>
public Dictionary<ConnectionInvokeType, List<IFlowNode>> SuccessorNodes { get; set; }
/// <summary>
/// 该节点的容器节点
/// </summary>
public IFlowNode ContainerNode { get; set; } = null;
/// <summary>
/// 该节点的子项节点（如果该节点是容器节点，那就会有这个参数）
/// </summary>
public List<IFlowNode> ChildrenNode { get; }
/// <summary>
/// 节点公开状态发生改变
/// </summary>
partial void OnIsPublicChanged(bool oldValue, bool newValue)
{
if (newValue)
{
// 公开节点
if (!CanvasDetails.PublicNodes.Contains(this))
{
CanvasDetails.PublicNodes.Add(this);
}
}
else
{
// 取消公开
if (CanvasDetails.PublicNodes.Contains(this))
{
CanvasDetails.PublicNodes.Remove(this);
}
}
}
}
}

151
NodeFlow/Model/NodeModelBaseFunc.cs Normal file
View File

@@ -0,0 +1,151 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Serein.Library;
using Serein.Library.Api;
using Serein.Library.Utils;
using Serein.Library.Utils.SereinExpression;
using System;
using System.Collections;
using System.Collections.Generic;
using System.ComponentModel.Design;
using System.Linq;
using System.Linq.Expressions;
using System.Net.Http.Headers;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using System.Xml.Linq;
namespace Serein.NodeFlow.Model
{
/// <summary>
/// 节点基类
/// </summary>
public abstract partial class NodeModelBase : IDynamicFlowNode
{
/// <summary>
/// 实体节点创建完成后调用的方法，调用时间早于 LoadInfo() 方法
/// </summary>
public virtual void OnCreating()
{
}
/// <summary>
/// 保存自定义信息
/// </summary>
/// <returns></returns>
public virtual NodeInfo SaveCustomData(NodeInfo nodeInfo)
{
return nodeInfo;
}
/// <summary>
/// 加载自定义数据
/// </summary>
/// <param name="nodeInfo"></param>
public virtual void LoadCustomData(NodeInfo nodeInfo)
{
return;
}
/// <summary>
/// 移除该节点
/// </summary>
public virtual void Remove()
{
if (this.DebugSetting.CancelInterrupt != null)
{
this.DebugSetting.CancelInterrupt?.Invoke();
}
if (this.IsPublic)
{
this.CanvasDetails.PublicNodes.Remove(this);
}
this.DebugSetting.NodeModel = null;
this.DebugSetting = null;
if(this.MethodDetails is not null)
{
if (this.MethodDetails.ParameterDetailss != null)
{
foreach (var pd in this.MethodDetails.ParameterDetailss)
{
pd.DataValue = null;
pd.Items = null;
pd.NodeModel = null;
pd.ExplicitType = null;
pd.DataType = null;
pd.Name = null;
pd.ArgDataSourceNodeGuid = null;
pd.InputType = ParameterValueInputType.Input;
}
}
this.MethodDetails.ParameterDetailss = null;
this.MethodDetails.NodeModel = null;
this.MethodDetails.ReturnType = null;
this.MethodDetails.ActingInstanceType = null;
this.MethodDetails = null;
}
this.Position = null;
this.DisplayName = null;
this.Env = null;
}
/// <summary>
/// 执行节点对应的方法
/// </summary>
/// <param name="context">流程上下文</param>
/// <param name="token"></param>
/// <param name="args">自定义参数</param>
/// <returns>节点传回数据对象</returns>
public virtual async Task<FlowResult> ExecutingAsync(IDynamicContext context, CancellationToken token)
{
// 执行触发检查是否需要中断
if (DebugSetting.IsInterrupt)
{
context.Env.TriggerInterrupt(Guid, "", InterruptTriggerEventArgs.InterruptTriggerType.Monitor); // 通知运行环境该节点中断了
await DebugSetting.GetInterruptTask.Invoke();
SereinEnv.WriteLine(InfoType.INFO, $"[{this.MethodDetails?.MethodName}]中断已取消，开始执行后继分支");
if (token.IsCancellationRequested) { return null; }
}
MethodDetails md = MethodDetails;
if (md is null)
{
throw new Exception($"节点{this.Guid}不存在方法信息，请检查是否需要重写节点的ExecutingAsync");
}
if (!context.Env.TryGetDelegateDetails(md.AssemblyName, md.MethodName, out var dd)) // 流程运行到某个节点
{
throw new Exception($"节点{this.Guid}不存在对应委托");
}
var instance = Env.IOC.Get(md.ActingInstanceType);
if (instance is null)
{
Env.IOC.Register(md.ActingInstanceType).Build();
instance = Env.IOC.Get(md.ActingInstanceType);
}
object[] args = await this.GetParametersAsync(context, token);
var result = await dd.InvokeAsync(instance, args);
var flowReslt = new FlowResult(this, context, result);
return flowReslt;
}
}
}

2
NodeFlow/Model/SingleFlowCallNode.cs
View File

@@ -40,7 +40,7 @@ namespace Serein.NodeFlow.Model
/// <summary>
/// 接口节点
/// </summary>
private NodeModelBase targetNode;
private IFlowNode targetNode;
/// <summary>
/// 缓存的方法信息
/// </summary>

6
NodeFlow/Model/SingleGlobalDataNode.cs
View File

@@ -49,14 +49,14 @@ namespace Serein.NodeFlow.Model
/// <summary>
/// 数据来源的节点
/// </summary>
private NodeModelBase? DataNode;
private IFlowNode? DataNode;
/// <summary>
/// 有节点被放置
/// </summary>
/// <param name="nodeModel"></param>
/// <returns></returns>
public bool PlaceNode(NodeModelBase nodeModel)
public bool PlaceNode(IFlowNode nodeModel)
{
if(DataNode is null)
{
@@ -76,7 +76,7 @@ namespace Serein.NodeFlow.Model
}
public bool TakeOutNode(NodeModelBase nodeModel)
public bool TakeOutNode(IFlowNode nodeModel)
{
if (ChildrenNode.Contains(nodeModel))
{

4
NodeFlow/ScriptFlowApi.cs
View File

@@ -22,7 +22,7 @@ namespace Serein.NodeFlow
/// <summary>
/// 对应的节点
/// </summary>
public NodeModelBase NodeModel { get; private set; }
public IFlowNode NodeModel { get; private set; }
@@ -31,7 +31,7 @@ namespace Serein.NodeFlow
/// </summary>
/// <param name="environment">运行环境</param>
/// <param name="nodeModel">节点</param>
public ScriptFlowApi(IFlowEnvironment environment, NodeModelBase nodeModel)
public ScriptFlowApi(IFlowEnvironment environment, IFlowNode nodeModel)
{
Env = environment;
NodeModel = nodeModel;

13
Workbench/Node/Junction/JunctionControlBase.cs
View File

@@ -16,6 +16,7 @@ using Serein.Workbench.Services;
using Serein.Workbench.Tool;
using System.ComponentModel;
using System.Diagnostics;
using Serein.Library.Api;
namespace Serein.Workbench.Node.View
{
@@ -60,15 +61,15 @@ namespace Serein.Workbench.Node.View
#region 控件属性，所在的节点
public static readonly DependencyProperty NodeProperty =
DependencyProperty.Register(nameof(MyNode), typeof(NodeModelBase), typeof(ParamsArgControl), new PropertyMetadata(default(NodeModelBase)));
DependencyProperty.Register(nameof(MyNode), typeof(IFlowNode), typeof(ParamsArgControl), new PropertyMetadata(default(IFlowNode)));
//public NodeModelBase NodeModel;
/// <summary>
/// 所在的节点
/// </summary>
public NodeModelBase MyNode
public IFlowNode MyNode
{
get { return (NodeModelBase)GetValue(NodeProperty); }
get { return (IFlowNode)GetValue(NodeProperty); }
set { SetValue(NodeProperty, value); }
}
#endregion
@@ -194,15 +195,15 @@ namespace Serein.Workbench.Node.View
#region 控件属性，所在的节点
public static readonly DependencyProperty NodeProperty =
DependencyProperty.Register(nameof(MyNode), typeof(NodeModelBase), typeof(JunctionControlBase), new PropertyMetadata(default(NodeModelBase)));
DependencyProperty.Register(nameof(MyNode), typeof(IFlowNode), typeof(JunctionControlBase), new PropertyMetadata(default(IFlowNode)));
//public NodeModelBase NodeModel;
/// <summary>
/// 所在的节点
/// </summary>
public NodeModelBase MyNode
public IFlowNode MyNode
{
get { return (NodeModelBase)GetValue(NodeProperty); }
get { return (IFlowNode)GetValue(NodeProperty); }
set { SetValue(NodeProperty, value); }
}
#endregion

5
Workbench/Node/NodeControlViewModelBase.cs
View File

@@ -5,6 +5,7 @@ using System.Windows.Controls;
using System.Windows.Data;
using System;
using CommunityToolkit.Mvvm.ComponentModel;
using Serein.Library.Api;
namespace Serein.Workbench.Node.ViewModel
{
@@ -14,9 +15,9 @@ namespace Serein.Workbench.Node.ViewModel
///// <summary>
///// 对应的节点实体类
///// </summary>
public NodeModelBase NodeModel { get; }
public IFlowNode NodeModel { get; }
public NodeControlViewModelBase(NodeModelBase nodeModel)
public NodeControlViewModelBase(IFlowNode nodeModel)
{
NodeModel = nodeModel;

6
Workbench/Node/View/ConnectionControl.cs
View File

@@ -23,11 +23,11 @@ namespace Serein.Workbench.Node.View
/// <summary>
/// 起始节点
/// </summary>
public NodeModelBase StartNode { get; set; }
public IFlowNode StartNode { get; set; }
/// <summary>
/// 目标节点
/// </summary>
public NodeModelBase EndNode { get; set; }
public IFlowNode EndNode { get; set; }
/// <summary>
/// 来源于起始节点的（控制点）类型
@@ -63,7 +63,7 @@ namespace Serein.Workbench.Node.View
/// <summary>
/// 对应的视图对象
/// </summary>
public NodeModelBase NodeModel { get; set; }
public IFlowNode NodeModel { get; set; }
/// <summary>
///
/// </summary>

5
Workbench/Node/ViewModel/FlowCallNodeControlViewModel.cs
View File

@@ -1,5 +1,6 @@
using CommunityToolkit.Mvvm.ComponentModel;
using Serein.Library;
using Serein.Library.Api;
using Serein.NodeFlow.Model;
using Serein.Workbench.Api;
using Serein.Workbench.Services;
@@ -37,7 +38,7 @@ namespace Serein.Workbench.Node.ViewModel
/// 当前所选节点
/// </summary>
[ObservableProperty]
private NodeModelBase _selectNode;
private IFlowNode _selectNode;
[ObservableProperty]
@@ -88,7 +89,7 @@ namespace Serein.Workbench.Node.ViewModel
FlowCallNode.ResetTargetNode();
}
partial void OnSelectNodeChanged(NodeModelBase value)
partial void OnSelectNodeChanged(IFlowNode value)
{
if(value is null)
{

2
Workbench/Node/ViewModel/UINodeControlViewModel.cs
View File

@@ -23,7 +23,7 @@ namespace Serein.Workbench.Node.ViewModel
private UserControl _nodeUIContent;
public UINodeControlViewModel(NodeModelBase nodeModel) : base(nodeModel)
public UINodeControlViewModel(IFlowNode nodeModel) : base(nodeModel)
{
}

4
Workbench/Services/FlowNodeService.cs
View File

@@ -421,7 +421,7 @@ namespace Serein.Workbench.Services
/// <param name="nodeCanvas">节点所在画布</param>
/// <returns></returns>
/// <exception cref="Exception">无法创建节点控件</exception>
private static NodeControlBase CreateNodeControl(Type controlType, Type viewModelType, NodeModelBase model, IFlowCanvas nodeCanvas)
private static NodeControlBase CreateNodeControl(Type controlType, Type viewModelType, IFlowNode model, IFlowCanvas nodeCanvas)
{
if ((controlType is null)
|| viewModelType is null
@@ -489,7 +489,7 @@ namespace Serein.Workbench.Services
/// <summary>
/// 从节点信息转换为Json文本数据
/// </summary>
public string CpoyNodeInfo(List<NodeModelBase> dictSelection)
public string CpoyNodeInfo(List<IFlowNode> dictSelection)
{
// 遍历当前已选节点

12
Workbench/Themes/NodeTreeItemViewControl.xaml.cs
View File

@@ -26,18 +26,18 @@ namespace Serein.Workbench.Themes
/// <summary>
/// 保存的节点数据
/// </summary>
private NodeModelBase nodeModel;
private IFlowNode nodeModel;
private IFlowEnvironment flowEnvironment { get; set; }
private class NodeTreeModel
{
public NodeModelBase RootNode { get; set; }
public Dictionary<ConnectionInvokeType, List<NodeModelBase>> ChildNodes { get; set; }
public IFlowNode RootNode { get; set; }
public Dictionary<ConnectionInvokeType, List<IFlowNode>> ChildNodes { get; set; }
}
public void InitAndLoadTree(IFlowEnvironment flowEnvironment, NodeModelBase nodeModel)
public void InitAndLoadTree(IFlowEnvironment flowEnvironment, IFlowNode nodeModel)
{
this.flowEnvironment = flowEnvironment;
this.nodeModel = nodeModel;
@@ -46,11 +46,11 @@ namespace Serein.Workbench.Themes
public TreeViewItem RefreshTree()
{
NodeModelBase rootNodeModel = this.nodeModel;
IFlowNode rootNodeModel = this.nodeModel;
NodeTreeModel nodeTreeModel = new NodeTreeModel
{
RootNode = rootNodeModel,
ChildNodes = new Dictionary<ConnectionInvokeType, List<NodeModelBase>>()
ChildNodes = new Dictionary<ConnectionInvokeType, List<IFlowNode>>()
{
{ConnectionInvokeType.Upstream, []},
{ConnectionInvokeType.IsSucceed, [rootNodeModel]},

14
Workbench/Themes/NodeTreeViewControl.xaml.cs
View File

@@ -18,14 +18,14 @@ namespace Serein.Workbench.Themes
private Dictionary<string, NodeTreeItemViewControl> globalFlipflopNodes = [];
private Dictionary<string, NodeTreeItemViewControl> unemployedNodes = [];
public void LoadNodeTreeOfStartNode(IFlowEnvironment flowEnvironment, NodeModelBase nodeModel)
public void LoadNodeTreeOfStartNode(IFlowEnvironment flowEnvironment, IFlowNode nodeModel)
{
startNodeGuid = nodeModel.Guid;
StartNodeViewer.InitAndLoadTree(flowEnvironment, nodeModel);
}
#region 触发器
public void AddGlobalFlipFlop(IFlowEnvironment flowEnvironment, NodeModelBase nodeModel)
public void AddGlobalFlipFlop(IFlowEnvironment flowEnvironment, IFlowNode nodeModel)
{
if (!globalFlipflopNodes.ContainsKey(nodeModel.Guid))
{
@@ -35,14 +35,14 @@ namespace Serein.Workbench.Themes
GlobalFlipflopNodeListbox.Items.Add(flipflopTreeViewer);
}
}
public void RefreshGlobalFlipFlop(NodeModelBase nodeModel)
public void RefreshGlobalFlipFlop(IFlowNode nodeModel)
{
if (globalFlipflopNodes.TryGetValue(nodeModel.Guid, out var viewer))
{
viewer.RefreshTree();
}
}
public void RemoveGlobalFlipFlop(NodeModelBase nodeModel)
public void RemoveGlobalFlipFlop(IFlowNode nodeModel)
{
if (globalFlipflopNodes.TryGetValue(nodeModel.Guid, out var viewer))
{
@@ -54,7 +54,7 @@ namespace Serein.Workbench.Themes
#region 无业游民（定义：不存在于起始节点与全局触发器的调用链上的节点，只能手动刷新？）
public void AddUnemployed(IFlowEnvironment flowEnvironment, NodeModelBase nodeModel)
public void AddUnemployed(IFlowEnvironment flowEnvironment, IFlowNode nodeModel)
{
if (!unemployedNodes.ContainsKey(nodeModel.Guid))
{
@@ -64,14 +64,14 @@ namespace Serein.Workbench.Themes
GlobalFlipflopNodeListbox.Items.Add(flipflopTreeViewer);
}
}
public void RefreshUnemployed(NodeModelBase nodeModel)
public void RefreshUnemployed(IFlowNode nodeModel)
{
if (unemployedNodes.TryGetValue(nodeModel.Guid, out var viewer))
{
viewer.RefreshTree();
}
}
public void RemoteUnemployed(NodeModelBase nodeModel)
public void RemoteUnemployed( IFlowNode nodeModel)
{
if (unemployedNodes.TryGetValue(nodeModel.Guid, out var viewer))
{

3
Workbench/ViewModels/ViewNodeInfoViewModel.cs
View File

@@ -1,5 +1,6 @@
using CommunityToolkit.Mvvm.ComponentModel;
using Serein.Library;
using Serein.Library.Api;
using Serein.Workbench.Node.View;
using Serein.Workbench.Services;
using System;
@@ -18,7 +19,7 @@ namespace Serein.Workbench.ViewModels
/// 当前预览的节点
/// </summary>
[ObservableProperty]
private NodeModelBase viewNodeModel;
private IFlowNode viewNodeModel;
public ViewNodeInfoViewModel(FlowNodeService flowNodeService)
{

2
Workbench/Views/ViewCanvasInfoView.xaml.cs
View File

@@ -36,7 +36,7 @@ namespace Serein.Workbench.Views
private void Grid_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
{
if (sender is Grid grid && grid.DataContext is NodeModelBase nodeModel)
if (sender is Grid grid && grid.DataContext is IFlowNode nodeModel)
{
NodeInfoViewModel.ViewNodeModel = nodeModel;
App.GetService<IFlowEnvironment>().NodeLocated(nodeModel.Guid);