From 347488e8e9a3a49c19a96f43352290b67ea0497d Mon Sep 17 00:00:00 2001
From: kwai <kwai@KWAI-NET>
Date: Fri, 7 Apr 2023 19:21:27 +0800
Subject: [PATCH] xx

---
 .../ViewModels/Groups/CustomDefinedGroupViewModel.cs  |  2 +-
 .../ViewModels/BaseViewModel/DiagramViewModel.cs      | 11 ++++++-----
 .../BaseViewModel/GroupDesignerItemViewModel.cs       |  8 --------
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/AIStudio.Wpf.DiagramDesigner.Demo/ViewModels/Groups/CustomDefinedGroupViewModel.cs b/AIStudio.Wpf.DiagramDesigner.Demo/ViewModels/Groups/CustomDefinedGroupViewModel.cs
index 2f3cbda..96c04c1 100644
--- a/AIStudio.Wpf.DiagramDesigner.Demo/ViewModels/Groups/CustomDefinedGroupViewModel.cs
+++ b/AIStudio.Wpf.DiagramDesigner.Demo/ViewModels/Groups/CustomDefinedGroupViewModel.cs
@@ -35,7 +35,7 @@ namespace AIStudio.Wpf.DiagramDesigner.Demo.ViewModels.Groups
             DiagramViewModel.Add(connector2);
 
             //Custom 需要设置为True，表示外面自定义的Group替换默认的。
-            CustomDefinedGroupDesignerItemViewModel group = new CustomDefinedGroupDesignerItemViewModel() { Describe = "This is a custom group", Custom = true};
+            CustomDefinedGroupDesignerItemViewModel group = new CustomDefinedGroupDesignerItemViewModel() { Describe = "This is a custom group"};
             group.FontViewModel.FontColor = System.Windows.Media.Colors.Orange;
             DiagramViewModel.GroupCommand.Execute(new List<DesignerItemViewModelBase> { group, node1, node2 });
         }
diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DiagramViewModel.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DiagramViewModel.cs
index 80b7f0d..4a263a0 100644
--- a/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DiagramViewModel.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DiagramViewModel.cs
@@ -2475,11 +2475,13 @@ namespace AIStudio.Wpf.DiagramDesigner
 
                 DoCommandManager.DoNewCommand(this.ToString(),
                 () => {
-                    //ToDo,整体移动到中心，而不是单个移动到中心
+
+                    var BoundingRect = DiagramViewModelHelper.GetBoundingRectangle(selectedItems);
+                    var oldcenter = BoundingRect.Center;
                     foreach (var item in selectedItems.OfType<DesignerItemViewModelBase>())
                     {
-                        item.Left = (PageSize.Width - item.ItemWidth) / 2;
-                        item.Top = (PageSize.Height - item.ItemHeight) / 2;
+                        item.Left = item.Left - oldcenter.X + PageSize.Width  / 2;
+                        item.Top = item.Top - oldcenter.Y + PageSize.Height / 2;
                     }
 
                     FitViewModel = new FitViewModel() { BoundingRect = DiagramViewModelHelper.GetBoundingRectangle(selectedItems) };
@@ -2678,9 +2680,8 @@ namespace AIStudio.Wpf.DiagramDesigner
             GroupDesignerItemViewModel groupItem = null;
             if (parameter is IEnumerable<DesignerItemViewModelBase> para)
             {
-                if (para.FirstOrDefault() is GroupDesignerItemViewModel groupDesignerItemViewModel && groupDesignerItemViewModel.Custom)
+                if (para.FirstOrDefault() is GroupDesignerItemViewModel groupDesignerItemViewModel)
                 {
-                    groupDesignerItemViewModel.Custom = false;
                     groupItem = groupDesignerItemViewModel;
                     items = para.Skip(1).ToList();
                 }
diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/GroupDesignerItemViewModel.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/GroupDesignerItemViewModel.cs
index 312dead..0ca831f 100644
--- a/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/GroupDesignerItemViewModel.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/GroupDesignerItemViewModel.cs
@@ -79,13 +79,5 @@ namespace AIStudio.Wpf.DiagramDesigner
             }
             Resize();   
         }
-
-        /// <summary>
-        /// 打标记使用
-        /// </summary>
-        public bool Custom
-        {
-            get;set;
-        }
     }
 }