自定义group完成

AIStudio.Wpf.DiagramDesigner.Demo/ViewModels/Groups/CustomDefinedGroupDesignerItemViewModel.cs

@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using AIStudio.Wpf.DiagramDesigner.Models;
+
+namespace AIStudio.Wpf.DiagramDesigner.Demo.ViewModels
+{
+    public class CustomDefinedGroupDesignerItemViewModel : GroupDesignerItemViewModel
+    {
+        public CustomDefinedGroupDesignerItemViewModel() : this(null)
+        {
+        }
+
+        public CustomDefinedGroupDesignerItemViewModel(IDiagramViewModel root) : base(root)
+        {
+        }
+
+        public CustomDefinedGroupDesignerItemViewModel(IDiagramViewModel root, SelectableItemBase designer) : base(root, designer)
+        {
+
+        }
+
+        public CustomDefinedGroupDesignerItemViewModel(IDiagramViewModel root, SerializableItem serializableItem, string serializableType) : base(root, serializableItem, serializableType)
+        {
+
+        }
+
+        public override SelectableItemBase GetSerializableObject()
+        {
+            return new DesignerItemBase(this, Describe);
+        }
+
+        protected override void LoadDesignerItemViewModel(SelectableItemBase designerbase)
+        {
+            base.LoadDesignerItemViewModel(designerbase);
+
+            if (designerbase is DesignerItemBase designer)
+            {
+                this.Describe = designer.Reserve;
+            }
+        }
+
+        private string _describe;
+        public string Describe
+        {
+            get
+            {
+                return _describe;
+            }
+            set
+            {
+                SetProperty(ref _describe, value);
+            }
+        }
+    }
+}

AIStudio.Wpf.DiagramDesigner.Demo/ViewModels/Groups/CustomDefinedGroupDesignerItemViewModel.xaml

@@ -0,0 +1,24 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"                    
+                    xmlns:dd="https://gitee.com/akwkevin/aistudio.-wpf.-diagram"
+                    xmlns:viewmodel="clr-namespace:AIStudio.Wpf.DiagramDesigner.Demo.ViewModels">
+
+    <dd:ColorBrushConverter x:Key="ColorBrushConverter" />
+
+    <DataTemplate DataType="{x:Type viewmodel:CustomDefinedGroupDesignerItemViewModel}">
+        <Grid IsHitTestVisible="False">
+            <TextBlock Text="{Binding Describe}"
+                       Foreground="{Binding FontViewModel.FontColor,Converter={StaticResource ColorBrushConverter}}"
+                       FontSize="{Binding FontViewModel.FontSize}" 
+                       FontFamily="{Binding FontViewModel.FontFamily}"  
+                       FontWeight="{Binding FontViewModel.FontWeight}"
+                       FontStyle="{Binding FontViewModel.FontStyle}"                         
+                       FontStretch="{Binding FontViewModel.FontStretch}"
+                       TextDecorations="{Binding FontViewModel.TextDecorations}"
+                       HorizontalAlignment="Center" 
+                       VerticalAlignment="Bottom"></TextBlock>
+        </Grid>
+    </DataTemplate>
+
+
+</ResourceDictionary>

AIStudio.Wpf.DiagramDesigner.Demo/ViewModels/Groups/CustomDefinedGroupViewModel.cs

@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows;
+
+namespace AIStudio.Wpf.DiagramDesigner.Demo.ViewModels.Groups
+{
+    class CustomDefinedGroupViewModel : BaseViewModel
+    {
+        public CustomDefinedGroupViewModel()
+        {
+            Title = "Grouping";
+            Info = "You can (un)group nodes using CTRL+ALT+G.<br>" +
+                    "Currently, the library doesn't handle nested groups yet nor ports.";
+
+            DiagramViewModel = new DiagramViewModel();
+            DiagramViewModel.PageSizeType = PageSizeType.Custom;
+            DiagramViewModel.PageSize = new Size(double.NaN, double.NaN);
+            DiagramViewModel.ColorViewModel = new ColorViewModel();
+            DiagramViewModel.ColorViewModel.FillColor.Color = System.Windows.Media.Colors.Orange;
+
+            DefaultDesignerItemViewModel node1 = new DefaultDesignerItemViewModel(DiagramViewModel) { Left = 50, Top = 50, Text = "1" };
+            DiagramViewModel.DirectAddItemCommand.Execute(node1);
+
+            DefaultDesignerItemViewModel node2 = new DefaultDesignerItemViewModel(DiagramViewModel) { Left = 300, Top = 300, Text = "2" };
+            DiagramViewModel.DirectAddItemCommand.Execute(node2);
+
+            DefaultDesignerItemViewModel node3 = new DefaultDesignerItemViewModel(DiagramViewModel) { Left = 300, Top = 50, Text = "3" };
+            DiagramViewModel.DirectAddItemCommand.Execute(node3);
+
+            ConnectionViewModel connector1 = new ConnectionViewModel(DiagramViewModel, node1.RightConnector, node2.LeftConnector, DrawMode.ConnectingLineSmooth, RouterMode.RouterNormal);
+            DiagramViewModel.DirectAddItemCommand.Execute(connector1);
+
+            ConnectionViewModel connector2 = new ConnectionViewModel(DiagramViewModel, node2.RightConnector, node3.RightConnector, DrawMode.ConnectingLineStraight, RouterMode.RouterOrthogonal);
+            DiagramViewModel.DirectAddItemCommand.Execute(connector2);
+
+            //Custom 需要设置为True，表示外面自定义的Group替换默认的。
+            CustomDefinedGroupDesignerItemViewModel group = new CustomDefinedGroupDesignerItemViewModel() { Describe = "This is a custom group", Custom = true};
+            group.FontViewModel.FontColor = System.Windows.Media.Colors.Orange;
+            DiagramViewModel.GroupCommand.Execute(new List<DesignerItemViewModelBase> { group, node1, node2 });
+
+            DiagramViewModel.ClearSelectedItemsCommand.Execute(null);
+        }
+    }
+}

AIStudio.Wpf.DiagramDesigner.Demo/ViewModels/Nodes/CustomDefinedDesignerItemViewModel.cs

@@ -0,0 +1,73 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using AIStudio.Wpf.DiagramDesigner.Models;
+
+namespace AIStudio.Wpf.DiagramDesigner.Demo.ViewModels
+{
+    public class CustomDefinedDesignerItemViewModel : DesignerItemViewModelBase
+    {
+        public CustomDefinedDesignerItemViewModel() : this(null)
+        {
+
+        }
+
+        public CustomDefinedDesignerItemViewModel(IDiagramViewModel root) : base(root)
+        {
+
+        }
+
+        public CustomDefinedDesignerItemViewModel(IDiagramViewModel root, SelectableItemBase designer) : base(root, designer)
+        {
+
+        }
+
+        public CustomDefinedDesignerItemViewModel(IDiagramViewModel root, SerializableItem serializableItem, string serializableType) : base(root, serializableItem, serializableType)
+        {
+
+        }
+
+        public override SelectableItemBase GetSerializableObject()
+        {
+            return new DesignerItemBase(this, Answer);
+        }
+
+        protected override void Init(IDiagramViewModel root)
+        {
+            base.Init(root);
+
+            this.ItemWidth = 150;
+            this.ItemHeight = 80;
+            InitConnector();
+        }
+
+        protected override void InitConnector()
+        {
+            connectors.Add(new FullyCreatedConnectorInfo(this, ConnectorOrientation.Top));
+            connectors.Add(new FullyCreatedConnectorInfo(this, ConnectorOrientation.Bottom));
+        }
+
+        protected override void LoadDesignerItemViewModel(SelectableItemBase designerbase)
+        {
+            base.LoadDesignerItemViewModel(designerbase);
+
+            if (designerbase is DesignerItemBase designer)
+            {
+                this.Answer = designer.Reserve;
+            }
+        }
+
+        private string _answer;
+        public string Answer
+        {
+            get
+            {
+                return _answer;
+            }
+            set
+            {
+                SetProperty(ref _answer, value);
+            }
+        }
+    }
+}

AIStudio.Wpf.DiagramDesigner.Demo/ViewModels/Nodes/CustomDefinedNodeViewModel.cs

@@ -38,69 +38,5 @@ namespace AIStudio.Wpf.DiagramDesigner.Demo.ViewModels
         }
     }
 
-    public class CustomDefinedDesignerItemViewModel : DesignerItemViewModelBase
-    {
-        public CustomDefinedDesignerItemViewModel() : this(null)
-        {
-
-        }
-
-        public CustomDefinedDesignerItemViewModel(IDiagramViewModel root) : base(root)
-        {
-
-        }
-
-        public CustomDefinedDesignerItemViewModel(IDiagramViewModel root, SelectableItemBase designer) : base(root, designer)
-        {
-
-        }
-
-        public CustomDefinedDesignerItemViewModel(IDiagramViewModel root, SerializableItem serializableItem, string serializableType) : base(root, serializableItem, serializableType)
-        {
-
-        }
-
-        public override SelectableItemBase GetSerializableObject()
-        {
-            return new DesignerItemBase(this, Answer);
-        }
-
-        protected override void Init(IDiagramViewModel root)
-        {
-            base.Init(root);
-
-            this.ItemWidth = 150;
-            this.ItemHeight = 80;
-            InitConnector();
-        }
-
-        protected override void InitConnector()
-        {
-            connectors.Add(new FullyCreatedConnectorInfo(this, ConnectorOrientation.Top));
-            connectors.Add(new FullyCreatedConnectorInfo(this, ConnectorOrientation.Bottom));
-        }
-
-        protected override void LoadDesignerItemViewModel(SelectableItemBase designerbase)
-        {
-            base.LoadDesignerItemViewModel(designerbase);
-
-            if (designerbase is DesignerItemBase designer)
-            {
-                this.Answer = designer.Reserve;
-            }
-        }
-
-        private string _answer;
-        public string Answer
-        {
-            get
-            {
-                return _answer;
-            }
-            set
-            {
-                SetProperty(ref _answer, value);
-            }
-        }
-    }
+ 
 }