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 @@ + + + + +