diff --git a/Library/FlowNode/DynamicContext.cs b/Library/FlowNode/DynamicContext.cs index f80a63b..09ff1e0 100644 --- a/Library/FlowNode/DynamicContext.cs +++ b/Library/FlowNode/DynamicContext.cs @@ -134,28 +134,28 @@ namespace Serein.Library } /// - /// 结束流程 + /// 结束当前流程上下文 /// public void Exit() { - foreach (var nodeObj in dictNodeFlowData.Values) - { - if (nodeObj is null) - { + //foreach (var nodeObj in dictNodeFlowData.Values) + //{ + // if (nodeObj is null) + // { - } - else - { - if (typeof(IDisposable).IsAssignableFrom(nodeObj?.GetType()) && nodeObj is IDisposable disposable) - { - disposable?.Dispose(); - } - } - } - if (Tag != null && typeof(IDisposable).IsAssignableFrom(Tag?.GetType()) && Tag is IDisposable tagDisposable) - { - tagDisposable?.Dispose(); - } + // } + // else + // { + // if (typeof(IDisposable).IsAssignableFrom(nodeObj?.GetType()) && nodeObj is IDisposable disposable) + // { + // disposable?.Dispose(); + // } + // } + //} + //if (Tag != null && typeof(IDisposable).IsAssignableFrom(Tag?.GetType()) && Tag is IDisposable tagDisposable) + //{ + // tagDisposable?.Dispose(); + //} this.Tag = null; this.dictNodeFlowData?.Clear(); RunState = RunState.Completion; diff --git a/NodeFlow/Model/SingleUINode.cs b/NodeFlow/Model/SingleUINode.cs index 6d54dd4..a438f42 100644 --- a/NodeFlow/Model/SingleUINode.cs +++ b/NodeFlow/Model/SingleUINode.cs @@ -35,7 +35,8 @@ namespace Serein.NodeFlow.Model { var p = context.GetPreviousNode(this); var data = context.GetFlowData(p.Guid); - Adapter.GetFlowControl().OnExecuting(data); + var iflowContorl = Adapter.GetFlowControl(); + iflowContorl.OnExecuting(data); } return Task.FromResult(null);