From 6c6d493f933d35da5f77849e64d395b5462a22d1 Mon Sep 17 00:00:00 2001 From: fengjiayi <12821976+ning_xi@user.noreply.gitee.com> Date: Tue, 31 Dec 2024 21:47:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86Library=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=8E=A5=E5=8F=A3=E6=9B=B4=E6=94=B9=E5=90=8E=EF=BC=8C?= =?UTF-8?q?Workbench=E4=B8=8D=E8=83=BD=E6=AD=A3=E7=A1=AE=E7=9B=91=E5=90=AC?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E4=BA=8B=E4=BB=B6=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Library/FlowNode/MethodDetails.cs | 21 ++++--- Library/FlowNode/ParameterDetails.cs | 2 +- WorkBench/MainWindow.xaml.cs | 85 ++++++++++++++-------------- 3 files changed, 58 insertions(+), 50 deletions(-) diff --git a/Library/FlowNode/MethodDetails.cs b/Library/FlowNode/MethodDetails.cs index b9be200..c4916a5 100644 --- a/Library/FlowNode/MethodDetails.cs +++ b/Library/FlowNode/MethodDetails.cs @@ -255,21 +255,28 @@ namespace Serein.Library public override string ToString() { + var tmp = this.MethodName.Split('.') ; + var methodName = tmp[tmp.Length - 1]; StringBuilder sb = new StringBuilder(); - sb.AppendLine($"节点Guid：{this.NodeModel.Guid}"); - sb.AppendLine($"方法别名：{this.MethodAnotherName}"); - sb.AppendLine($"方法名称：{this.MethodName}"); - sb.AppendLine($"需要实例：{this.ActingInstanceType?.FullName}"); + sb.AppendLine($"节点Guid："); + sb.AppendLine($"\t{this.NodeModel.Guid}"); + sb.AppendLine(); + sb.AppendLine($"方法名称："); + sb.AppendLine($"\t{methodName}"); + sb.AppendLine($"方法别名："); + sb.AppendLine($"\t{this.MethodAnotherName}"); + sb.AppendLine($"需要实例："); + sb.AppendLine($"\t{this.ActingInstanceType?.FullName}"); sb.AppendLine($""); - sb.AppendLine($"入参参数信息："); + sb.AppendLine($"入参信息："); for (int i = 0; i < ParameterDetailss.Length; i++) { ParameterDetails arg = this.ParameterDetailss[i]; sb.AppendLine(arg.ToString()); } - sb.AppendLine($""); + sb.AppendLine(); sb.AppendLine($"返回值信息："); - sb.AppendLine($" {this.ReturnType?.FullName}"); + sb.AppendLine($"\t{this.ReturnType?.FullName}"); return sb.ToString(); } diff --git a/Library/FlowNode/ParameterDetails.cs b/Library/FlowNode/ParameterDetails.cs index 751c7ce..93dd87b 100644 --- a/Library/FlowNode/ParameterDetails.cs +++ b/Library/FlowNode/ParameterDetails.cs @@ -317,7 +317,7 @@ namespace Serein.Library public override string ToString() { - return $"[{this.Index}] {this.Name} : {this.ExplicitType?.FullName} -> {this.DataType?.FullName}"; + return $"[{this.Index}] {this.Name} : {this.DataType?.FullName}"; } } diff --git a/WorkBench/MainWindow.xaml.cs b/WorkBench/MainWindow.xaml.cs index af87f32..f8c3a5a 100644 --- a/WorkBench/MainWindow.xaml.cs +++ b/WorkBench/MainWindow.xaml.cs @@ -55,6 +55,7 @@ namespace Serein.Workbench /// 流程环境装饰器，方便在本地与远程环境下切换 /// private IFlowEnvironment EnvDecorator => ViewModel.FlowEnvironment; + private IFlowEnvironmentEvent EnvEventDecorator => ViewModel.FlowEnvironment as IFlowEnvironmentEvent; private MainWindowViewModel ViewModel { get; set; } @@ -192,27 +193,27 @@ namespace Serein.Workbench /// private void InitFlowEnvironmentEvent() { - EnvDecorator.OnDllLoad += FlowEnvironment_DllLoadEvent; - EnvDecorator.OnProjectSaving += EnvDecorator_OnProjectSaving; - EnvDecorator.OnProjectLoaded += FlowEnvironment_OnProjectLoaded; - EnvDecorator.OnStartNodeChange += FlowEnvironment_StartNodeChangeEvent; - EnvDecorator.OnNodeConnectChange += FlowEnvironment_NodeConnectChangeEvemt; - EnvDecorator.OnNodeCreate += FlowEnvironment_NodeCreateEvent; - EnvDecorator.OnNodeRemove += FlowEnvironment_NodeRemoveEvent; - EnvDecorator.OnNodePlace += EnvDecorator_OnNodePlaceEvent; - EnvDecorator.OnNodeTakeOut += EnvDecorator_OnNodeTakeOutEvent; - EnvDecorator.OnFlowRunComplete += FlowEnvironment_OnFlowRunCompleteEvent; - - - EnvDecorator.OnMonitorObjectChange += FlowEnvironment_OnMonitorObjectChangeEvent; - EnvDecorator.OnNodeInterruptStateChange += FlowEnvironment_OnNodeInterruptStateChangeEvent; - EnvDecorator.OnInterruptTrigger += FlowEnvironment_OnInterruptTriggerEvent; - - EnvDecorator.OnIOCMembersChanged += FlowEnvironment_OnIOCMembersChangedEvent; - - EnvDecorator.OnNodeLocated += FlowEnvironment_OnNodeLocateEvent; - EnvDecorator.OnNodeMoved += FlowEnvironment_OnNodeMovedEvent; - EnvDecorator.OnEnvOut += FlowEnvironment_OnEnvOutEvent; + EnvEventDecorator.OnDllLoad += FlowEnvironment_DllLoadEvent; + EnvEventDecorator.OnProjectSaving += EnvDecorator_OnProjectSaving; + EnvEventDecorator.OnProjectLoaded += FlowEnvironment_OnProjectLoaded; + EnvEventDecorator.OnStartNodeChange += FlowEnvironment_StartNodeChangeEvent; + EnvEventDecorator.OnNodeConnectChange += FlowEnvironment_NodeConnectChangeEvemt; + EnvEventDecorator.OnNodeCreate += FlowEnvironment_NodeCreateEvent; + EnvEventDecorator.OnNodeRemove += FlowEnvironment_NodeRemoveEvent; + EnvEventDecorator.OnNodePlace += EnvDecorator_OnNodePlaceEvent; + EnvEventDecorator.OnNodeTakeOut += EnvDecorator_OnNodeTakeOutEvent; + EnvEventDecorator.OnFlowRunComplete += FlowEnvironment_OnFlowRunCompleteEvent; + + + EnvEventDecorator.OnMonitorObjectChange += FlowEnvironment_OnMonitorObjectChangeEvent; + EnvEventDecorator.OnNodeInterruptStateChange += FlowEnvironment_OnNodeInterruptStateChangeEvent; + EnvEventDecorator.OnInterruptTrigger += FlowEnvironment_OnInterruptTriggerEvent; + + EnvEventDecorator.OnIOCMembersChanged += FlowEnvironment_OnIOCMembersChangedEvent; + + EnvEventDecorator.OnNodeLocated += FlowEnvironment_OnNodeLocateEvent; + EnvEventDecorator.OnNodeMoved += FlowEnvironment_OnNodeMovedEvent; + EnvEventDecorator.OnEnvOut += FlowEnvironment_OnEnvOutEvent; } @@ -222,27 +223,27 @@ namespace Serein.Workbench /// private void ResetFlowEnvironmentEvent() { - EnvDecorator.OnDllLoad -= FlowEnvironment_DllLoadEvent; - EnvDecorator.OnProjectSaving -= EnvDecorator_OnProjectSaving; - EnvDecorator.OnProjectLoaded -= FlowEnvironment_OnProjectLoaded; - EnvDecorator.OnStartNodeChange -= FlowEnvironment_StartNodeChangeEvent; - EnvDecorator.OnNodeConnectChange -= FlowEnvironment_NodeConnectChangeEvemt; - EnvDecorator.OnNodeCreate -= FlowEnvironment_NodeCreateEvent; - EnvDecorator.OnNodeRemove -= FlowEnvironment_NodeRemoveEvent; - EnvDecorator.OnNodePlace -= EnvDecorator_OnNodePlaceEvent; - EnvDecorator.OnNodeTakeOut -= EnvDecorator_OnNodeTakeOutEvent; - EnvDecorator.OnFlowRunComplete -= FlowEnvironment_OnFlowRunCompleteEvent; - - - EnvDecorator.OnMonitorObjectChange -= FlowEnvironment_OnMonitorObjectChangeEvent; - EnvDecorator.OnNodeInterruptStateChange -= FlowEnvironment_OnNodeInterruptStateChangeEvent; - EnvDecorator.OnInterruptTrigger -= FlowEnvironment_OnInterruptTriggerEvent; - - EnvDecorator.OnIOCMembersChanged -= FlowEnvironment_OnIOCMembersChangedEvent; - EnvDecorator.OnNodeLocated -= FlowEnvironment_OnNodeLocateEvent; - EnvDecorator.OnNodeMoved -= FlowEnvironment_OnNodeMovedEvent; - - EnvDecorator.OnEnvOut -= FlowEnvironment_OnEnvOutEvent; + EnvEventDecorator.OnDllLoad -= FlowEnvironment_DllLoadEvent; + EnvEventDecorator.OnProjectSaving -= EnvDecorator_OnProjectSaving; + EnvEventDecorator.OnProjectLoaded -= FlowEnvironment_OnProjectLoaded; + EnvEventDecorator.OnStartNodeChange -= FlowEnvironment_StartNodeChangeEvent; + EnvEventDecorator.OnNodeConnectChange -= FlowEnvironment_NodeConnectChangeEvemt; + EnvEventDecorator.OnNodeCreate -= FlowEnvironment_NodeCreateEvent; + EnvEventDecorator.OnNodeRemove -= FlowEnvironment_NodeRemoveEvent; + EnvEventDecorator.OnNodePlace -= EnvDecorator_OnNodePlaceEvent; + EnvEventDecorator.OnNodeTakeOut -= EnvDecorator_OnNodeTakeOutEvent; + EnvEventDecorator.OnFlowRunComplete -= FlowEnvironment_OnFlowRunCompleteEvent; + + + EnvEventDecorator.OnMonitorObjectChange -= FlowEnvironment_OnMonitorObjectChangeEvent; + EnvEventDecorator.OnNodeInterruptStateChange -= FlowEnvironment_OnNodeInterruptStateChangeEvent; + EnvEventDecorator.OnInterruptTrigger -= FlowEnvironment_OnInterruptTriggerEvent; + + EnvEventDecorator.OnIOCMembersChanged -= FlowEnvironment_OnIOCMembersChangedEvent; + EnvEventDecorator.OnNodeLocated -= FlowEnvironment_OnNodeLocateEvent; + EnvEventDecorator.OnNodeMoved -= FlowEnvironment_OnNodeMovedEvent; + + EnvEventDecorator.OnEnvOut -= FlowEnvironment_OnEnvOutEvent; }