diff --git a/AIStudio.Wpf.DiagramDesigner/Controls/DragThumb.cs b/AIStudio.Wpf.DiagramDesigner/Controls/DragThumb.cs
index d3e2011..6b02b6f 100644
--- a/AIStudio.Wpf.DiagramDesigner/Controls/DragThumb.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Controls/DragThumb.cs
@@ -194,7 +194,7 @@ namespace AIStudio.Wpf.DiagramDesigner.Controls
             }
         }
 
-        #region
+        #region 点击
 
         private Point? firstPoint;
         protected override void OnPreviewMouseLeftButtonDown(MouseButtonEventArgs e)
@@ -217,6 +217,7 @@ namespace AIStudio.Wpf.DiagramDesigner.Controls
 
             if (EditClickCount == 1)
             {
+                DesignerItem.ExitPreviewExecuteEdit();
                 if (firstPoint == e.GetPosition(this))
                 {
                     DesignerItem.EditCommand?.Execute(e.GetPosition(this));
diff --git a/AIStudio.Wpf.DiagramDesigner/Themes/DiagramControl.xaml b/AIStudio.Wpf.DiagramDesigner/Themes/DiagramControl.xaml
index 2a23aba..98d13ff 100644
--- a/AIStudio.Wpf.DiagramDesigner/Themes/DiagramControl.xaml
+++ b/AIStudio.Wpf.DiagramDesigner/Themes/DiagramControl.xaml
@@ -411,12 +411,7 @@
                         </Grid.ContextMenu>
 
                         <!-- PART_DragThumb -->
-                        <c:DragThumb x:Name="PART_DragThumb" 
-                                                            Cursor="SizeAll" >
-                            <c:DragThumb.InputBindings>
-                                <MouseBinding MouseAction="LeftDoubleClick" Command="{Binding EditCommand}" CommandParameter="{Binding }" />
-                            </c:DragThumb.InputBindings>
-                        </c:DragThumb>
+                        <c:DragThumb x:Name="PART_DragThumb" EditClickCount="{Binding EditClickCount}" Cursor="SizeAll" />
 
                         <Grid RenderTransformOrigin="0.5,0.5">
 
@@ -566,12 +561,7 @@
                         <dd:LineControl x:Name="line"/>
 
                         <!-- PART_DragThumb -->
-                        <c:DragThumb x:Name="PART_DragThumb" Margin="{Binding DragThumbMargin}"
-                                                            Cursor="SizeAll" >
-                            <c:DragThumb.InputBindings>
-                                <MouseBinding MouseAction="LeftDoubleClick" Command="{Binding EditCommand}" CommandParameter="{Binding }" />
-                            </c:DragThumb.InputBindings>
-                        </c:DragThumb>
+                        <c:DragThumb x:Name="PART_DragThumb" EditClickCount="{Binding EditClickCount}" Cursor="SizeAll" Margin="{Binding DragThumbMargin}"/>
 
                         <dd:PointContainer x:Name="PART_VerticesContainer" Style="{StaticResource ItemsControlStyle}" ItemsSource="{Binding Vertices}" Visibility="Collapsed">
                             <dd:PointContainer.ItemTemplate>
@@ -674,8 +664,8 @@
                             </ContextMenu>
                         </Grid.ContextMenu>
                         <!-- PART_DragThumb -->
-                        <c:DragThumb x:Name="PART_DragThumb"
-                                                            Cursor="SizeAll" />
+                        <c:DragThumb x:Name="PART_DragThumb" EditClickCount="{Binding EditClickCount}" Cursor="SizeAll"/>
+                        
                         <Grid RenderTransformOrigin="0.5,0.5">
                             <!-- PART_ResizeDecorator -->
                             <Control x:Name="PART_ResizeDecorator" 
@@ -771,12 +761,8 @@
                             </dd:ConnectorContainer.ItemTemplate>
                         </dd:ConnectorContainer>
                         <!-- PART_DragThumb -->
-                        <c:DragThumb x:Name="PART_DragThumb"
-                                                            Cursor="SizeAll" >
-                            <c:DragThumb.InputBindings>
-                                <MouseBinding MouseAction="LeftDoubleClick" Command="{Binding EditCommand}" CommandParameter="{Binding }" />
-                            </c:DragThumb.InputBindings>
-                        </c:DragThumb>
+                        <c:DragThumb x:Name="PART_DragThumb" EditClickCount="{Binding EditClickCount}" Cursor="SizeAll"/>
+                        
                         <!-- PART_ResizeDecorator -->
                         <Control x:Name="PART_ResizeDecorator" 
                                                  Visibility="Collapsed"
diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/SelectableDesignerItemViewModelBase.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/SelectableDesignerItemViewModelBase.cs
index c60c995..940e928 100644
--- a/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/SelectableDesignerItemViewModelBase.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/SelectableDesignerItemViewModelBase.cs
@@ -194,6 +194,10 @@ namespace AIStudio.Wpf.DiagramDesigner
         
         }
 
+        public virtual void ExitPreviewExecuteEdit()
+        {
+        }
+
         protected virtual void ExecuteEditCommand(object param)
         {
             if (IsReadOnly == true) return;
diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/BlockViewModel/BlockDesignerItemViewModel.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/BlockViewModel/BlockDesignerItemViewModel.cs
index 661508f..c9bbb91 100644
--- a/AIStudio.Wpf.DiagramDesigner/ViewModels/BlockViewModel/BlockDesignerItemViewModel.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/BlockViewModel/BlockDesignerItemViewModel.cs
@@ -430,7 +430,16 @@ namespace AIStudio.Wpf.DiagramDesigner
 
         public override async void PreviewExecuteEdit()
         {
-            await BeforeExecute();
+            var items = (this.GetFirst() ?? this).GetNexts(true);
+
+            items.ForEach(p => p.IsExecuting = true);
+        }
+
+        public override async void ExitPreviewExecuteEdit()
+        {
+            var items = (this.GetFirst() ?? this).GetNexts(true);
+
+            items.ForEach(p => p.IsExecuting = false);
         }
 
         public async Task Execute()