zhusenlin/aistudio-wpf-diagram
1
0
Fork 0
mirror of https://gitee.com/akwkevin/aistudio.-wpf.-diagram synced 2026-04-09 02:36:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

xx

Browse Source
This commit is contained in:
kwai
2023-04-07 19:21:27 +08:00
parent afea559325
commit 347488e8e9
3 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AIStudio.Wpf.DiagramDesigner.Demo/ViewModels/Groups/CustomDefinedGroupViewModel.cs
View File

@@ -35,7 +35,7 @@ namespace AIStudio.Wpf.DiagramDesigner.Demo.ViewModels.Groups
DiagramViewModel.Add(connector2); DiagramViewModel.Add(connector2);
//Custom 需要设置为True，表示外面自定义的Group替换默认的。 //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; group.FontViewModel.FontColor = System.Windows.Media.Colors.Orange;
DiagramViewModel.GroupCommand.Execute(new List<DesignerItemViewModelBase> { group, node1, node2 }); DiagramViewModel.GroupCommand.Execute(new List<DesignerItemViewModelBase> { group, node1, node2 });
} }

11
AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DiagramViewModel.cs
View File

@@ -2475,11 +2475,13 @@ namespace AIStudio.Wpf.DiagramDesigner
DoCommandManager.DoNewCommand(this.ToString(), DoCommandManager.DoNewCommand(this.ToString(),
() => { () => {
//ToDo,整体移动到中心，而不是单个移动到中心
var BoundingRect = DiagramViewModelHelper.GetBoundingRectangle(selectedItems);
var oldcenter = BoundingRect.Center;
foreach (var item in selectedItems.OfType<DesignerItemViewModelBase>()) foreach (var item in selectedItems.OfType<DesignerItemViewModelBase>())
{ {
item.Left = (PageSize.Width - item.ItemWidth) / 2; item.Left = item.Left - oldcenter.X + PageSize.Width / 2;
item.Top = (PageSize.Height - item.ItemHeight) / 2; item.Top = item.Top - oldcenter.Y + PageSize.Height / 2;
} }
FitViewModel = new FitViewModel() { BoundingRect = DiagramViewModelHelper.GetBoundingRectangle(selectedItems) }; FitViewModel = new FitViewModel() { BoundingRect = DiagramViewModelHelper.GetBoundingRectangle(selectedItems) };
@@ -2678,9 +2680,8 @@ namespace AIStudio.Wpf.DiagramDesigner
GroupDesignerItemViewModel groupItem = null; GroupDesignerItemViewModel groupItem = null;
if (parameter is IEnumerable<DesignerItemViewModelBase> para) 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; groupItem = groupDesignerItemViewModel;
items = para.Skip(1).ToList(); items = para.Skip(1).ToList();
} }

8
AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/GroupDesignerItemViewModel.cs
View File

@@ -79,13 +79,5 @@ namespace AIStudio.Wpf.DiagramDesigner
} }
Resize(); Resize();
} }
/// <summary>
/// 打标记使用
/// </summary>
public bool Custom
{
get;set;
}
} }
} }