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

2026-03-20 00:06:45 +08:00 · 2025-05-31 12:15:01 +08:00
parent cc0b084c84
commit 84390b574f
36 changed files with 562 additions and 121 deletions
--- a/NodeFlow/Env/FlowEnvironment.cs
+++ b/NodeFlow/Env/FlowEnvironment.cs
@@ -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))
--- a/NodeFlow/Env/FlowEnvironmentDecorator.cs
+++ b/NodeFlow/Env/FlowEnvironmentDecorator.cs
@@ -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);
        }
--- a/NodeFlow/Env/RemoteFlowEnvironment.cs
+++ b/NodeFlow/Env/RemoteFlowEnvironment.cs
@@ -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;