优化了中断功能。

WorkBench/MainWindow.xaml.cs

@@ -144,19 +144,21 @@ namespace Serein.WorkBench
 
         public MainWindow()
         {
+            InitializeComponent();
+
             ViewModel = new MainWindowViewModel(this);
             FlowEnvironment = ViewModel.FlowEnvironment;
-            InitFlowEvent();
+            ObjectViewer.FlowEnvironment = FlowEnvironment;
 
-            InitializeComponent();
+            InitFlowEnvironmentEvent(); // 配置环境事件
+            
             logWindow = new LogWindow();
             logWindow.Show();
             // 重定向 Console 输出
-            var logTextWriter = new LogTextWriter(WriteLog,() => logWindow.Clear());;
+            var logTextWriter = new LogTextWriter(msg => logWindow.AppendText(msg), () => logWindow.Clear());;
             Console.SetOut(logTextWriter);
 
-
-            InitUI();
+            InitCanvasUI(); 
 
             var project = App.FlowProjectData;
             if (project == null)
@@ -164,12 +166,10 @@ namespace Serein.WorkBench
                 return;
             }
             InitializeCanvas(project.Basic.Canvas.Width, project.Basic.Canvas.Lenght);// 设置画布大小
-            
-
             FlowEnvironment.LoadProject(project, App.FileDataPath); // 加载项目
         }
 
-        private void InitFlowEvent()
+        private void InitFlowEnvironmentEvent()
         {
             FlowEnvironment.OnDllLoad += FlowEnvironment_DllLoadEvent;
             // FlowEnvironment.OnLoadNode += FlowEnvironment_NodeLoadEvent;
@@ -189,7 +189,7 @@ namespace Serein.WorkBench
 
         
 
-        private void InitUI()
+        private void InitCanvasUI()
         {
             canvasTransformGroup = new TransformGroup();
             scaleTransform = new ScaleTransform();
@@ -239,10 +239,7 @@ namespace Serein.WorkBench
         }
         #endregion
 
-        public void WriteLog(string message)
-        {
-            logWindow.AppendText(message);
-        }
+        
 
         #region 运行环境事件
         /// <summary>
@@ -265,7 +262,7 @@ namespace Serein.WorkBench
         /// <exception cref="NotImplementedException"></exception>
         private void FlowEnvironment_OnFlowRunComplete(FlowEventArgs eventArgs)
         {
-            WriteLog("-------运行完成---------\r\n");
+            Console.WriteLine("-------运行完成---------\r\n"); 
         }
 
         /// <summary>
@@ -462,20 +459,30 @@ namespace Serein.WorkBench
         private void FlowEnvironment_OnMonitorObjectChange(MonitorObjectEventArgs eventArgs)
         {
             string nodeGuid = eventArgs.NodeGuid;
-            if (string.IsNullOrEmpty(ObjectViewer.NodeGuid)) // 如果没有加载过
-            {
-                ObjectViewer.NodeGuid = nodeGuid;
-                ObjectViewer.LoadObjectInformation(eventArgs.NewData); // 加载节点
-            }
-            else
-            { 
-                // 加载过，如果显示的对象来源并非同一个节点，则停止监听之前的节点
-                if (!ObjectViewer.NodeGuid.Equals(nodeGuid))
+
+            ObjectViewer.Dispatcher.BeginInvoke(() => {
+                if (string.IsNullOrEmpty(ObjectViewer.NodeGuid)) // 如果没有加载过
                 {
-                    FlowEnvironment.SetNodeFLowDataMonitorState(ObjectViewer.NodeGuid, false);
+                    ObjectViewer.NodeGuid = nodeGuid;
+                    ObjectViewer.LoadObjectInformation(eventArgs.NewData); // 加载节点
                 }
-                ObjectViewer.RefreshObjectTree(eventArgs.NewData);
-            }
+                else
+                {
+                    // 加载过，如果显示的对象来源并非同一个节点，则停止监听之前的节点
+                    if (!ObjectViewer.NodeGuid.Equals(nodeGuid))
+                    {
+                        FlowEnvironment.SetNodeFLowDataMonitorState(ObjectViewer.NodeGuid, false);
+                        ObjectViewer.NodeGuid = nodeGuid;
+                        ObjectViewer.LoadObjectInformation(eventArgs.NewData); // 加载节点
+                    }
+                    else
+                    {
+                        ObjectViewer.RefreshObjectTree(eventArgs.NewData);
+                    }
+                }
+
+            });
+            
 
         }
 
@@ -497,7 +504,6 @@ namespace Serein.WorkBench
                 nodeControl.ViewModel.IsInterrupt = true;
             }
 
-
         }
 
         /// <summary>
@@ -509,7 +515,6 @@ namespace Serein.WorkBench
         {
             string nodeGuid = eventArgs.NodeGuid;
             NodeControlBase nodeControl =  GuidToControl(nodeGuid);
-
             Console.WriteLine("节点触发了中断");
         }
 
@@ -579,7 +584,7 @@ namespace Serein.WorkBench
                     var childNodeControl = CreateNodeControlOfNodeInfo(childNode, md);
                     if (childNodeControl == null)
                     {
-                        WriteLog($"无法为节点类型创建节点控件: {childNode.MethodName}\r\n");
+                        Console.WriteLine($"无法为节点类型创建节点控件: {childNode.MethodName}\r\n");
                         continue;
                     }
 
@@ -687,13 +692,13 @@ namespace Serein.WorkBench
                 {
                     if (nodeControl?.ViewModel?.Node?.DebugSetting?.InterruptClass == InterruptClass.None)
                     {
-                        FlowEnvironment.NodeInterruptChange(nodeGuid, InterruptClass.Branch);
+                        FlowEnvironment.SetNodeInterrupt(nodeGuid, InterruptClass.Branch);
 
                         menuItem.Header = "取消中断";
                     }
                     else
                     {
-                        FlowEnvironment.NodeInterruptChange(nodeGuid, InterruptClass.None);
+                        FlowEnvironment.SetNodeInterrupt(nodeGuid, InterruptClass.None);
                         menuItem.Header = "在此中断";
 
                     }
@@ -707,6 +712,8 @@ namespace Serein.WorkBench
                 var node = nodeControl?.ViewModel?.Node;
                 if(node is not null)
                 {
+                    FlowEnvironment.SetNodeFLowDataMonitorState(ObjectViewer.NodeGuid, false); // 通知环境，该节点的数据更新后需要传到UI
+                    ObjectViewer.NodeGuid = node.Guid;
                     FlowEnvironment.SetNodeFLowDataMonitorState(node.Guid, true); // 通知环境，该节点的数据更新后需要传到UI
                 }
 
@@ -2533,6 +2540,23 @@ namespace Serein.WorkBench
                     break;
             }
 
+            // 计算角落
+            //switch (localhost)
+            //{
+            //    case Localhost.Right:
+            //        point = new Point(0, element.ActualHeight / 2); // 左边中心
+            //        break;
+            //    case Localhost.Left:
+            //        point = new Point(element.ActualWidth, element.ActualHeight / 2); // 右边中心
+            //        break;
+            //    case Localhost.Bottom:
+            //        point = new Point(element.ActualWidth / 2, 0); // 上边中心
+            //        break;
+            //    case Localhost.Top:
+            //        point = new Point(element.ActualWidth / 2, element.ActualHeight); // 下边中心
+            //        break;
+            //}
+
             // 将相对控件的坐标转换到画布中的全局坐标
             return element.TranslatePoint(point, canvas);
         }

WorkBench/Node/NodeControlViewModelBase.cs

@@ -49,7 +49,7 @@ namespace Serein.WorkBench.Node.ViewModel
                 if (value != null)
                 {
                     Node.DebugSetting = value;
-                    OnPropertyChanged(nameof(DebugSetting));
+                    OnPropertyChanged(/*nameof(DebugSetting)*/);
                 }
             }
         }
@@ -62,7 +62,7 @@ namespace Serein.WorkBench.Node.ViewModel
                 if(value != null)
                 {
                     Node.MethodDetails = value;
-                    OnPropertyChanged(nameof(MethodDetails));
+                    OnPropertyChanged(/*nameof(MethodDetails)*/);
                 }
             }
         }
@@ -74,7 +74,7 @@ namespace Serein.WorkBench.Node.ViewModel
             set
             {
                 isInterrupt = value;
-                OnPropertyChanged(nameof(IsInterrupt));
+                OnPropertyChanged(/*nameof(IsInterrupt)*/);
             }
         }
 

WorkBench/Node/View/ActionNodeControl.xaml

@@ -24,7 +24,6 @@
                     <Setter Property="BorderBrush" Value="Transparent" />
                     <Setter Property="BorderThickness" Value="0" />
                     <Style.Triggers>
-                        <!-- 当 DebugSetting.IsInterrupt 为 True 时，显示红色边框 -->
                         <DataTrigger Binding="{Binding IsInterrupt}" Value="True">
                             <Setter Property="BorderBrush" Value="Red" />
                             <Setter Property="BorderThickness" Value="2" />

WorkBench/Themes/ObjectViewerControl.xaml

@@ -8,7 +8,7 @@
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
+            <!--<RowDefinition Height="Auto" />-->
             <!-- 按钮 -->
             <RowDefinition Height="*" />
             <!-- 树视图 -->
@@ -19,11 +19,11 @@
              Click="TimerRefreshButton_Click"-->
             <!--<Button Grid.Row="0" HorizontalAlignment="Left" Margin="4,2,4,2" Content="刷新" Width="100" Height="20"  Name="RefreshButton"/>-->
             <!--<Button Grid.Row="0" HorizontalAlignment="Left" Margin="14,2,4,2" Content="监视" Width="100" Height="20" Name="TimerRefreshButton"/>-->
-            <Button Grid.Row="0" HorizontalAlignment="Left" Margin="14,2,4,2" Content="添加监视表达式" Width="100" Height="20" Name="AddMonitorExpressionButton" Click="AddMonitorExpressionButton_Click"/>
+            <!--<Button Grid.Row="0" HorizontalAlignment="Left" Margin="14,2,4,2" Content="添加监视表达式" Width="100" Height="20" Name="AddMonitorExpressionButton" Click="AddMonitorExpressionButton_Click"/>-->
         </StackPanel>
         <!-- 刷新按钮 -->
 
         <!-- 树视图，用于显示对象属性 -->
-        <TreeView FontSize="13" x:Name="ObjectTreeView" Grid.Row="1" />
+        <TreeView FontSize="13" x:Name="ObjectTreeView" Grid.Row="0" />
     </Grid>
 </UserControl>

WorkBench/Themes/ObjectViewerControl.xaml.cs

@@ -1,4 +1,5 @@
-using Serein.NodeFlow.Base;
+using Serein.Library.Api;
+using Serein.NodeFlow.Base;
 using Serein.NodeFlow.Tool.SereinExpression;
 using System;
 using System.Collections.Generic;
@@ -55,6 +56,7 @@ namespace Serein.WorkBench.Themes
     {
         private object _objectInstance;
         public string NodeGuid { get;set; }
+        public IFlowEnvironment FlowEnvironment { get;set; }
 
         // private NodeModelBase _nodeFlowData;
 
@@ -79,9 +81,28 @@ namespace Serein.WorkBench.Themes
            
         }
 
+        /// <summary>
+        /// 添加表达式
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void AddMonitorExpressionButton_Click(object sender, RoutedEventArgs e)
         {
+            //string fullPath = GetNodeFullPath(memberNode);
+            //Clipboard.SetDataObject(fullPath);
+            OpenInputDialog((exp) =>
+            {
+                FlowEnvironment.AddInterruptExpression(NodeGuid, exp);
 
+                //if (node.DebugSetting.InterruptExpression.Contains(exp))
+                //{
+                //    Console.WriteLine("表达式已存在");
+                //}
+                //else
+                //{
+                //    node.DebugSetting.InterruptExpression.Add(exp);
+                //}
+            });
         }