From 380c126e332f8795c45033b4ffb5a8cd7bb3ca60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=89=BE=E7=AB=B9?= <akwkevin@126.com>
Date: Sun, 9 Jul 2023 21:03:35 +0800
Subject: [PATCH] block

---
 .../Controls/BlockItemsControl.xaml           |  1 -
 .../Controls/DesignerCanvas.cs                |  3 +-
 .../Models/ToolBoxData.cs                     |  4 +-
 .../Services/ApplicationServicesProvider.cs   |  9 +++-
 .../Themes/DiagramControl.xaml                |  3 ++
 .../DesignerItemViewModelBase.cs              |  5 ---
 .../BlockDesignerItemViewModel.cs             | 45 ++++++++++++++-----
 7 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/AIStudio.Wpf.DiagramDesigner/Controls/BlockItemsControl.xaml b/AIStudio.Wpf.DiagramDesigner/Controls/BlockItemsControl.xaml
index b51de0e..d87ef01 100644
--- a/AIStudio.Wpf.DiagramDesigner/Controls/BlockItemsControl.xaml
+++ b/AIStudio.Wpf.DiagramDesigner/Controls/BlockItemsControl.xaml
@@ -40,7 +40,6 @@
             </ControlTemplate>
         </ResourceDictionary>
     </ItemsControl.Resources>
-    
     <ItemsControl.ItemContainerStyle>
         <Style TargetType="{x:Type ListBoxItem}">
             <Setter Property="Template">
diff --git a/AIStudio.Wpf.DiagramDesigner/Controls/DesignerCanvas.cs b/AIStudio.Wpf.DiagramDesigner/Controls/DesignerCanvas.cs
index b17fd83..e920432 100644
--- a/AIStudio.Wpf.DiagramDesigner/Controls/DesignerCanvas.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Controls/DesignerCanvas.cs
@@ -277,9 +277,8 @@ namespace AIStudio.Wpf.DiagramDesigner
 
         protected void DesignerCanvas_Loaded(object sender, RoutedEventArgs e)
         {
-            Mediator.Instance.Register(this);
+            //Mediator.Instance.Register(this);
             this.Focus();
-            int xx = this.GetHashCode();
             _service.PropertyChanged += _service_PropertyChanged;
         }
 
diff --git a/AIStudio.Wpf.DiagramDesigner/Models/ToolBoxData.cs b/AIStudio.Wpf.DiagramDesigner/Models/ToolBoxData.cs
index eefedc0..d18a121 100644
--- a/AIStudio.Wpf.DiagramDesigner/Models/ToolBoxData.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Models/ToolBoxData.cs
@@ -7,9 +7,9 @@ using System.Windows;
 
 namespace AIStudio.Wpf.DiagramDesigner
 {
-    public class ToolBoxData
+    public class ToolBoxData : BindableBase
     {
-        public string Text
+        public virtual string Text
         {
             get; protected set;
         }
diff --git a/AIStudio.Wpf.DiagramDesigner/Services/ApplicationServicesProvider.cs b/AIStudio.Wpf.DiagramDesigner/Services/ApplicationServicesProvider.cs
index dfe8b97..d1cbd48 100644
--- a/AIStudio.Wpf.DiagramDesigner/Services/ApplicationServicesProvider.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Services/ApplicationServicesProvider.cs
@@ -7,7 +7,10 @@ namespace AIStudio.Wpf.DiagramDesigner.Services
     /// </summary>
     public interface IServiceProvider
     {
-        IUIVisualizerService VisualizerService { get; }
+        IUIVisualizerService VisualizerService 
+        {
+            get; set;
+        }
         IMessageBoxService MessageBoxService { get; }
         //IDatabaseAccessService DatabaseAccessService { get; }
     }
@@ -25,6 +28,10 @@ namespace AIStudio.Wpf.DiagramDesigner.Services
         public IUIVisualizerService VisualizerService
         {
             get { return visualizerService; }
+            set
+            {
+                visualizerService = value;
+            }
         }
 
         public IMessageBoxService MessageBoxService
diff --git a/AIStudio.Wpf.DiagramDesigner/Themes/DiagramControl.xaml b/AIStudio.Wpf.DiagramDesigner/Themes/DiagramControl.xaml
index ca93d4f..ed3ce7c 100644
--- a/AIStudio.Wpf.DiagramDesigner/Themes/DiagramControl.xaml
+++ b/AIStudio.Wpf.DiagramDesigner/Themes/DiagramControl.xaml
@@ -502,6 +502,9 @@
                             </MultiDataTrigger.Conditions>
                             <Setter TargetName="PART_ResizeDecorator" Property="Visibility" Value="Visible"/>
                         </MultiDataTrigger>
+                        <DataTrigger Binding="{Binding ShowResize}" Value="false">
+                            <Setter TargetName="PART_ResizeDecorator" Property="Visibility" Value="Collapsed"/>
+                        </DataTrigger>
                         <DataTrigger Binding="{Binding Connectors.Count}" Value="0">
                             <Setter TargetName="PART_ConnectorDecorator" Property="Visibility" Value="Collapsed" />
                         </DataTrigger>
diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DesignerItemViewModelBase.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DesignerItemViewModelBase.cs
index c5f0d9a..3fb0546 100644
--- a/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DesignerItemViewModelBase.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DesignerItemViewModelBase.cs
@@ -330,11 +330,6 @@ namespace AIStudio.Wpf.DiagramDesigner
 
         public bool ShowArrow { get; set; } = true;
 
-        public bool ShowResized
-        {
-            get; set;
-        }
-
         private bool alwayForResized;
         public bool AlwayForResized
         {
diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/BlockViewModel/BlockDesignerItemViewModel.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/BlockViewModel/BlockDesignerItemViewModel.cs
index 4bc4871..e224dde 100644
--- a/AIStudio.Wpf.DiagramDesigner/ViewModels/BlockViewModel/BlockDesignerItemViewModel.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/BlockViewModel/BlockDesignerItemViewModel.cs
@@ -63,10 +63,17 @@ namespace AIStudio.Wpf.DiagramDesigner
             }
             if (oldnext != null && first == true)
             {
-                System.Windows.Application.Current?.Dispatcher.BeginInvoke(new Action(async () => {
-                    await Task.Delay(10);
-                    GetLast().AddNext(oldnext, false);
-                }));
+                //if (this.GetItemHeight() > 0)
+                //{
+                //    GetLast().AddNext(oldnext, false);
+                //}
+                //else
+                {
+                    System.Windows.Application.Current?.Dispatcher.BeginInvoke(new Action(async () => {
+                        await Task.Delay(10);
+                        GetLast().AddNext(oldnext, false);
+                    }));
+                }
 
             }
         }
@@ -162,10 +169,17 @@ namespace AIStudio.Wpf.DiagramDesigner
             child.RemoveFromSelection();
             this.GetRootContainItem.AddToSelection(true, true);
 
-            System.Windows.Application.Current?.Dispatcher.BeginInvoke(new Action(async () => {
-                await Task.Delay(10);
-                AlignNext(this.Next);
-            }));
+            //if (this.GetItemHeight() > 0)
+            //{
+            //    AlignNext(this.Next);
+            //}
+            //else
+            {
+                System.Windows.Application.Current?.Dispatcher.BeginInvoke(new Action(async () => {
+                    await Task.Delay(10);
+                    AlignNext(this.Next);
+                }));
+            }
         }
 
         public virtual void RemoveChild(BlockDesignerItemViewModel child, BlockItemsContainerInfo container)
@@ -180,10 +194,17 @@ namespace AIStudio.Wpf.DiagramDesigner
             this.RemoveFromSelection();
             child.AddToSelection(true, true);
 
-            System.Windows.Application.Current?.Dispatcher.BeginInvoke(new Action(async () => {
-                await Task.Delay(10);
-                AlignNext(this.Next);
-            }));
+            //if (this.GetItemHeight() > 0)
+            //{
+            //    AlignNext(this.Next);
+            //}
+            //else
+            {
+                System.Windows.Application.Current?.Dispatcher.BeginInvoke(new Action(async () => {
+                    await Task.Delay(10);
+                    AlignNext(this.Next);
+                }));
+            }
         }
 
         public string Flag