From 6995fe147648010338d38753ee43c5b7229eb354 Mon Sep 17 00:00:00 2001
From: kwai <kwai@KWAI-NET>
Date: Tue, 27 Jun 2023 19:58:08 +0800
Subject: [PATCH] block

---
 .../Controls/BlockConnector.cs                |  2 +-
 .../Controls/BlockItemsContainer.cs           |  2 +-
 .../Controls/BlockItemsControl.xaml           | 46 ++++++++++++++++++-
 .../Connector/BlockConnectorInfo.cs           | 24 ++++++++++
 .../Container/BlockItemsContainerInfo.cs      | 22 +++++++--
 .../BlockDesignerItemViewModelHelper.cs       |  4 +-
 6 files changed, 91 insertions(+), 9 deletions(-)

diff --git a/AIStudio.Wpf.DiagramDesigner/Controls/BlockConnector.cs b/AIStudio.Wpf.DiagramDesigner/Controls/BlockConnector.cs
index 639ce98..0b01c42 100644
--- a/AIStudio.Wpf.DiagramDesigner/Controls/BlockConnector.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Controls/BlockConnector.cs
@@ -26,7 +26,7 @@ namespace AIStudio.Wpf.DiagramDesigner
 
     }
 
-    public class BlockBorder : Border
+    public class BlockGrid : Grid
     {
     }
 
diff --git a/AIStudio.Wpf.DiagramDesigner/Controls/BlockItemsContainer.cs b/AIStudio.Wpf.DiagramDesigner/Controls/BlockItemsContainer.cs
index b20d225..95eab66 100644
--- a/AIStudio.Wpf.DiagramDesigner/Controls/BlockItemsContainer.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Controls/BlockItemsContainer.cs
@@ -160,7 +160,7 @@ namespace AIStudio.Wpf.DiagramDesigner
                     FirstPoint = null;
                     if (Info?.Children?.Count > 0)
                     {
-                        var borders = VisualHelper.FindVisualChildren<BlockBorder>(this);
+                        var borders = VisualHelper.FindVisualChildren<BlockGrid>(this);
                         foreach (var border in borders)
                         {
                             var itemsContainers = VisualHelper.TryFindParent<BlockItemsContainer>(border);
diff --git a/AIStudio.Wpf.DiagramDesigner/Controls/BlockItemsControl.xaml b/AIStudio.Wpf.DiagramDesigner/Controls/BlockItemsControl.xaml
index a26c554..b51de0e 100644
--- a/AIStudio.Wpf.DiagramDesigner/Controls/BlockItemsControl.xaml
+++ b/AIStudio.Wpf.DiagramDesigner/Controls/BlockItemsControl.xaml
@@ -7,17 +7,59 @@
              xmlns:dd="clr-namespace:AIStudio.Wpf.DiagramDesigner"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
+    <ItemsControl.Resources>
+        <ResourceDictionary>
+            <ControlTemplate x:Key="BlockConnectorDecoratorTemplate"
+                     TargetType="{x:Type Control}">
+                <Grid Margin="{Binding ConnectorMargin}">
+                    <dd:BlockConnector 
+                        Content="{Binding LeftConnector}" 
+                        SnapsToDevicePixels="True"
+                        Orientation="Left"
+                        VerticalAlignment="Stretch"
+                        HorizontalAlignment="Left"/>
+                    <dd:BlockConnector 
+                        Content="{Binding TopConnector}"
+                        SnapsToDevicePixels="True"
+                        Orientation="Top"
+                        VerticalAlignment="Top"
+                        HorizontalAlignment="Stretch"/>
+                    <dd:BlockConnector 
+                        Content="{Binding RightConnector}"
+                        SnapsToDevicePixels="True"
+                        Orientation="Right"
+                        VerticalAlignment="Stretch"
+                        HorizontalAlignment="Right"/>
+                    <dd:BlockConnector 
+                        Content="{Binding BottomConnector}"
+                        SnapsToDevicePixels="True"
+                        Orientation="Bottom"
+                        VerticalAlignment="Bottom"
+                        HorizontalAlignment="Stretch"/>
+                </Grid>
+            </ControlTemplate>
+        </ResourceDictionary>
+    </ItemsControl.Resources>
+    
     <ItemsControl.ItemContainerStyle>
         <Style TargetType="{x:Type ListBoxItem}">
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type ListBoxItem}">
-                        <dd:BlockBorder 
+                        <dd:BlockGrid 
                             dd:WidthAndHeightProps.Active="True"
                             dd:WidthAndHeightProps.BoundActualWidth="{Binding ActualItemWidth,Mode=OneWayToSource}"
                             dd:WidthAndHeightProps.BoundActualHeight="{Binding ActualItemHeight,Mode=OneWayToSource}">
                             <ContentControl Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}"/>
-                        </dd:BlockBorder>
+                            <!-- PART_ConnectorDecorator -->
+                            <Control x:Name="PART_ConnectorDecorator" Template="{StaticResource BlockConnectorDecoratorTemplate}"/>
+                        </dd:BlockGrid>
+
+                        <ControlTemplate.Triggers>
+                            <DataTrigger Binding="{Binding Connectors.Count}" Value="0">
+                                <Setter TargetName="PART_ConnectorDecorator" Property="Visibility" Value="Collapsed" />
+                            </DataTrigger>
+                        </ControlTemplate.Triggers>
                     </ControlTemplate>
                 </Setter.Value>
             </Setter>
diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/Connector/BlockConnectorInfo.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/Connector/BlockConnectorInfo.cs
index 52dfcc2..15e6c5d 100644
--- a/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/Connector/BlockConnectorInfo.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/Connector/BlockConnectorInfo.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Media;
+using AIStudio.Wpf.DiagramDesigner.Geometrys;
 using AIStudio.Wpf.DiagramDesigner.Models;
 
 namespace AIStudio.Wpf.DiagramDesigner
@@ -52,6 +53,29 @@ namespace AIStudio.Wpf.DiagramDesigner
             }
         }
 
+        public override PointBase Position
+        {
+            get
+            {
+                if (DataItem?.ParentContainer == null)
+                {
+                    return PointHelper.GetPointForConnector(this);
+                }
+                else
+                {
+                    return PointHelper.GetPointForConnector(this);//Todo
+                }
+            }
+        }
+
+        public override PointBase MiddlePosition
+        {
+            get
+            {
+                return PointHelper.GetPointForConnector(this, true);
+            }
+        }
+
         public override bool CanAttachTo(ConnectorInfoBase port)
         {
             if (port is BlockConnectorInfo blockConnectorInfo)
diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/Container/BlockItemsContainerInfo.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/Container/BlockItemsContainerInfo.cs
index f297fe4..2c5badc 100644
--- a/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/Container/BlockItemsContainerInfo.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/Container/BlockItemsContainerInfo.cs
@@ -137,14 +137,28 @@ namespace AIStudio.Wpf.DiagramDesigner
             var offset = GetOffSetFunc?.Invoke() ?? new Point(0, 0);
 
             var containBound = new RectangleBase(DataItem.Left + offset.X, DataItem.Top + offset.Y, GetItemWidth(), GetItemHeight());
-            //foreach(var child in Children) 
-            //{ 
-            //    var bound = new RectangleBase(DataItem.Left + offset.X, DataItem.Top + offset.Y, child.GetItemWidth(), child.GetItemHeight());
-            //}
 
             return containBound;
         }
 
+        public List<RectangleBase> GetChildrenBounds()
+        {
+            List<RectangleBase> bounds = new List<RectangleBase>();
+            var offset = GetOffSetFunc?.Invoke() ?? new Point(0, 0);
+
+            var containBound = new RectangleBase(DataItem.Left + offset.X, DataItem.Top + offset.Y, GetItemWidth(), GetItemHeight());
+            double height = 0;
+            foreach (var child in Children)
+            {
+                var bound = new RectangleBase(DataItem.Left + offset.X, DataItem.Top + offset.Y + height, child.GetItemWidth(), child.GetItemHeight());
+                bounds.Add(bound);
+
+                height += child.GetItemHeight();
+            }
+
+            return bounds;
+        }
+
         public BlockDesignerItemViewModel DataItem
         {
             get
diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/BlockViewModel/BlockDesignerItemViewModelHelper.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/BlockViewModel/BlockDesignerItemViewModelHelper.cs
index d6812de..f1d6916 100644
--- a/AIStudio.Wpf.DiagramDesigner/ViewModels/BlockViewModel/BlockDesignerItemViewModelHelper.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/BlockViewModel/BlockDesignerItemViewModelHelper.cs
@@ -126,13 +126,15 @@ namespace AIStudio.Wpf.DiagramDesigner
                         innerport.DataItem.ShowConnectors = true;
                         if (innerport.CanAttachTo(blockDesignerItemTempLink.Items.FirstOrDefault()) == true)
                         {
-                            if (innerport.OnlyOneChild)
+                            if (innerport.OnlyOneChild || innerport.Children.Count == 0)
                             {
                                 innerport.BeAttachTo = true;
                                 return innerport;
                             }
                             else
                             {
+                                var childrenbounds = container.GetChildrenBounds();
+
                                 innerport.BeAttachTo = true;
                                 return innerport;
                             }