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

Mind

Browse Source
This commit is contained in:
艾竹
2023-03-07 22:59:27 +08:00
parent f042f95ee0
commit f48838f54a
7 changed files with 66 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
AIStudio.Wpf.DiagramDesigner/Controls/DragThumb.cs
View File

@@ -30,6 +30,11 @@ namespace AIStudio.Wpf.DiagramDesigner.Controls
{
// we only move DesignerItems
designerItems = designerItem.Root.SelectedItems.ToList();
if (designerItem is IGroupable groupable)
{
designerItems.AddRange(designerItem.Root.SelectionService.GetGroupMembers(groupable).OfType<SelectableDesignerItemViewModelBase>());
}
if (designerItem is ConnectionViewModel connector)
{
designerItems.Add(connector.SourceConnectorInfo.DataItem);
@@ -44,6 +49,8 @@ namespace AIStudio.Wpf.DiagramDesigner.Controls
designerItems = new List<SelectableDesignerItemViewModelBase> { designerItem };
}
designerItems = designerItems.Distinct().ToList();
foreach (DesignerItemViewModelBase item in designerItems.OfType<DesignerItemViewModelBase>())
{
item.BeginDo = true;

8
AIStudio.Wpf.DiagramDesigner/Controls/ResizeThumb.cs
View File

@@ -115,7 +115,7 @@ namespace AIStudio.Wpf.DiagramDesigner.Controls
private void DragLeft(double scale, DesignerItemViewModelBase item, SelectionService selectionService)
{
IEnumerable<DesignerItemViewModelBase> groupItems = selectionService.GetGroupMembers(item).Cast<DesignerItemViewModelBase>();
IEnumerable<DesignerItemViewModelBase> groupItems = selectionService.GetGroupMembers(item, false).Cast<DesignerItemViewModelBase>();
double groupLeft = item.Left + item.ItemWidth;
foreach (DesignerItemViewModelBase groupItem in groupItems)
@@ -129,7 +129,7 @@ namespace AIStudio.Wpf.DiagramDesigner.Controls
private void DragTop(double scale, DesignerItemViewModelBase item, SelectionService selectionService)
{
IEnumerable<DesignerItemViewModelBase> groupItems = selectionService.GetGroupMembers(item).Cast<DesignerItemViewModelBase>();
IEnumerable<DesignerItemViewModelBase> groupItems = selectionService.GetGroupMembers(item, false).Cast<DesignerItemViewModelBase>();
double groupBottom = item.Top + item.ItemHeight;
foreach (DesignerItemViewModelBase groupItem in groupItems)
{
@@ -142,7 +142,7 @@ namespace AIStudio.Wpf.DiagramDesigner.Controls
private void DragRight(double scale, DesignerItemViewModelBase item, SelectionService selectionService)
{
IEnumerable<DesignerItemViewModelBase> groupItems = selectionService.GetGroupMembers(item).Cast<DesignerItemViewModelBase>();
IEnumerable<DesignerItemViewModelBase> groupItems = selectionService.GetGroupMembers(item, false).Cast<DesignerItemViewModelBase>();
double groupLeft = item.Left;
foreach (DesignerItemViewModelBase groupItem in groupItems)
@@ -157,7 +157,7 @@ namespace AIStudio.Wpf.DiagramDesigner.Controls
private void DragBottom(double scale, DesignerItemViewModelBase item, SelectionService selectionService)
{
IEnumerable<DesignerItemViewModelBase> groupItems = selectionService.GetGroupMembers(item).Cast<DesignerItemViewModelBase>();
IEnumerable<DesignerItemViewModelBase> groupItems = selectionService.GetGroupMembers(item, false).Cast<DesignerItemViewModelBase>();
double groupTop = item.Top;
foreach (DesignerItemViewModelBase groupItem in groupItems)
{

7
AIStudio.Wpf.DiagramDesigner/UserControls/DiagramControl.xaml
View File

@@ -415,6 +415,13 @@
</MultiDataTrigger.Conditions>
<Setter TargetName="PART_ResizeDecorator" Property="Visibility" Value="Visible"/>
</MultiDataTrigger>
<MultiDataTrigger>
<MultiDataTrigger.Conditions>
<Condition Value="True" Binding="{Binding IsSelected}"/>
<Condition Value="True" Binding="{Binding AlwayForResized}"/>
</MultiDataTrigger.Conditions>
<Setter TargetName="PART_ResizeDecorator" Property="Visibility" Value="Visible"/>
</MultiDataTrigger>
<Trigger Property="IsMouseOver"
Value="true">
<Setter TargetName="PART_ConnectorDecorator" Property="Visibility" Value="Visible"/>

18
AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DesignerItemViewModelBase.cs
View File

@@ -315,6 +315,24 @@ namespace AIStudio.Wpf.DiagramDesigner
public bool ShowArrow { get; set; } = true;
public bool ShowResized
{
get; set;
}
private bool alwayForResized;
public bool AlwayForResized
{
get
{
return alwayForResized;
}
set
{
SetProperty(ref alwayForResized, value);
}
}
private bool enabledForConnection = true;
public bool EnabledForConnection
{

17
AIStudio.Wpf.DiagramDesigner/ViewModels/SelectionService.cs
View File

@@ -48,7 +48,7 @@ namespace AIStudio.Wpf.DiagramDesigner
}
}
internal List<IGroupable> GetGroupMembers(IGroupable item)
internal List<IGroupable> GetGroupMembers(IGroupable item, bool withchildren=true)
{
IEnumerable<IGroupable> list = DiagramViewModel.Items.OfType<IGroupable>();
IGroupable rootItem = GetRoot(list, item);
@@ -56,7 +56,18 @@ namespace AIStudio.Wpf.DiagramDesigner
{
return new List<IGroupable>();
}
return GetGroupMembers(list, rootItem);
if (rootItem.IsGroup)//分组状态下，获取全部成员
{
return GetGroupMembers(list, rootItem);
}
else
{
if (withchildren)
return GetGroupMembers(list, item);//普通的Parent关系，获取其Children
else
return new List<IGroupable>() { item };
}
}
internal IGroupable GetGroupRoot(IGroupable item)
@@ -98,5 +109,7 @@ namespace AIStudio.Wpf.DiagramDesigner
return groupMembers;
}
}
}