From 8f8644f5959b02169c786cf672c50870363a93dc Mon Sep 17 00:00:00 2001 From: fengjiayi <12821976+ning_xi@user.noreply.gitee.com> Date: Fri, 28 Feb 2025 11:03:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86BUG=EF=BC=9A?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=B8=8A=E4=B8=8B=E6=96=87=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=85=A5=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Library/FlowNode/ContainerFlowEnvironment.cs | 1 - Library/FlowNode/NodeModelBaseFunc.cs | 1 + Library/FlowNode/ParameterDetails.cs | 4 ++-- Workbench/App.xaml.cs | 2 +- Workbench/Serein.WorkBench.csproj | 5 +++++ 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Library/FlowNode/ContainerFlowEnvironment.cs b/Library/FlowNode/ContainerFlowEnvironment.cs index 840b7ac..6718e18 100644 --- a/Library/FlowNode/ContainerFlowEnvironment.cs +++ b/Library/FlowNode/ContainerFlowEnvironment.cs @@ -12,7 +12,6 @@ namespace Serein.Library /// /// 不提供流程操作能力,仅提供容器功能 /// - public class ContainerFlowEnvironment : IFlowEnvironment, ISereinIOC { /// diff --git a/Library/FlowNode/NodeModelBaseFunc.cs b/Library/FlowNode/NodeModelBaseFunc.cs index 5a14cf7..b31c3fe 100644 --- a/Library/FlowNode/NodeModelBaseFunc.cs +++ b/Library/FlowNode/NodeModelBaseFunc.cs @@ -419,6 +419,7 @@ namespace Serein.Library // 常规参数的获取 for (int i = 0; i < args.Length; i++) { var pd = MethodDetails.ParameterDetailss[i]; + args[i] = await pd.ToMethodArgData(context); // 获取数据 } diff --git a/Library/FlowNode/ParameterDetails.cs b/Library/FlowNode/ParameterDetails.cs index 93dd87b..f3065a5 100644 --- a/Library/FlowNode/ParameterDetails.cs +++ b/Library/FlowNode/ParameterDetails.cs @@ -190,12 +190,12 @@ namespace Serein.Library var env = nodeModel.Env; #region 显然的流程基本类型 // 返回运行环境 - if (DataType == typeof(IFlowEnvironment)) + if (typeof(IFlowEnvironment).IsAssignableFrom(DataType)) { return env; } // 返回流程上下文 - if (DataType == typeof(IDynamicContext)) + if (typeof(IDynamicContext).IsAssignableFrom(DataType)) { return context; } diff --git a/Workbench/App.xaml.cs b/Workbench/App.xaml.cs index a90c015..29c65b7 100644 --- a/Workbench/App.xaml.cs +++ b/Workbench/App.xaml.cs @@ -17,7 +17,7 @@ namespace Serein.Workbench { #if DEBUG - if (1 == 1) + if (1 == 2) { // 这里是测试代码,可以删除 string filePath; diff --git a/Workbench/Serein.WorkBench.csproj b/Workbench/Serein.WorkBench.csproj index 3e76512..5a76b6b 100644 --- a/Workbench/Serein.WorkBench.csproj +++ b/Workbench/Serein.WorkBench.csproj @@ -55,6 +55,11 @@ + + + + +