From 1db8a4413594c013a55c9c85d0055dae70146789 Mon Sep 17 00:00:00 2001
From: fengjiayi <12821976+ning_xi@user.noreply.gitee.com>
Date: Mon, 17 Mar 2025 11:57:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=BB=93=E6=9D=9F=E4=B8=8D?=
=?UTF-8?q?=E5=86=8D=E8=87=AA=E5=8A=A8=E9=87=8A=E6=94=BE=E6=89=80=E6=9C=89?=
=?UTF-8?q?IDisposable=E8=B5=84=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Library/FlowNode/DynamicContext.cs | 36 +++++++++++++++---------------
NodeFlow/Model/SingleUINode.cs | 3 ++-
2 files changed, 20 insertions(+), 19 deletions(-)
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