mirror of
https://gitee.com/akwkevin/aistudio.-wpf.-diagram
synced 2026-03-03 00:00:57 +08:00
block使用linklist重写,把代码复杂度降低点
This commit is contained in:
@@ -19,17 +19,17 @@ namespace AIStudio.Wpf.DiagramDesigner
|
||||
/// <returns></returns>
|
||||
public static Tuple<FullyCreatedConnectorInfo, FullyCreatedConnectorInfo> FindNearPortToAttachTo(this IDiagramViewModel diagramViewModel, BlockDesignerItemTempLink blockDesignerItemTempLink)
|
||||
{
|
||||
if (blockDesignerItemTempLink == null || blockDesignerItemTempLink.Items == null || blockDesignerItemTempLink.Items.Count == 0)
|
||||
if (blockDesignerItemTempLink == null || blockDesignerItemTempLink.LinkList == null || blockDesignerItemTempLink.LinkList.Count == 0)
|
||||
return new Tuple<FullyCreatedConnectorInfo, FullyCreatedConnectorInfo>(null, null);
|
||||
|
||||
List<BlockDesignerItemViewModel> items = diagramViewModel.Items.OfType<BlockDesignerItemViewModel>().Where(p => !blockDesignerItemTempLink.Items.Contains(p)).ToList();
|
||||
List<BlockDesignerItemViewModel> items = diagramViewModel.Items.OfType<BlockDesignerItemViewModel>().Where(p => !blockDesignerItemTempLink.LinkList.Contains(p)).ToList();
|
||||
|
||||
return diagramViewModel.FindNearPortToAttachTo(items, blockDesignerItemTempLink);
|
||||
}
|
||||
|
||||
public static Tuple<FullyCreatedConnectorInfo, FullyCreatedConnectorInfo> FindNearPortToAttachTo(this IDiagramViewModel diagramViewModel, List<BlockDesignerItemViewModel> items, BlockDesignerItemTempLink blockDesignerItemTempLink)
|
||||
{
|
||||
if (blockDesignerItemTempLink == null || blockDesignerItemTempLink.Items == null || blockDesignerItemTempLink.Items.Count == 0)
|
||||
if (blockDesignerItemTempLink == null || blockDesignerItemTempLink.LinkList == null || blockDesignerItemTempLink.LinkList.Count == 0)
|
||||
return new Tuple<FullyCreatedConnectorInfo, FullyCreatedConnectorInfo>(null, null);
|
||||
|
||||
FullyCreatedConnectorInfo parent = null;
|
||||
@@ -40,11 +40,11 @@ namespace AIStudio.Wpf.DiagramDesigner
|
||||
{
|
||||
bool success = false;
|
||||
foreach (var item in items)
|
||||
{
|
||||
{
|
||||
foreach (var port in item.Connectors.OfType<BlockConnectorInfo>())
|
||||
{
|
||||
//已经被连接的不允许在顶部吸附了
|
||||
if ((port.Orientation == ConnectorOrientation.Top || port.Orientation == ConnectorOrientation.Left) && port.DataItem.Prev != null)
|
||||
if ((port.Orientation == ConnectorOrientation.Top || port.Orientation == ConnectorOrientation.Left) && port.DataItem.LinkNode.Previous != null)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
@@ -121,12 +121,12 @@ namespace AIStudio.Wpf.DiagramDesigner
|
||||
|
||||
public static BlockItemsContainerInfo FindNearContainerToAttachTo(this IDiagramViewModel diagramViewModel, BlockDesignerItemTempLink blockDesignerItemTempLink)
|
||||
{
|
||||
if (blockDesignerItemTempLink == null || blockDesignerItemTempLink.Items == null || blockDesignerItemTempLink.Items.Count == 0)
|
||||
if (blockDesignerItemTempLink == null || blockDesignerItemTempLink.LinkList == null || blockDesignerItemTempLink.LinkList.Count == 0)
|
||||
return null;
|
||||
|
||||
List<BlockDesignerItemViewModel> items;
|
||||
|
||||
items = diagramViewModel.Items.OfType<BlockDesignerItemViewModel>().Where(p => !blockDesignerItemTempLink.Items.Contains(p)).ToList();
|
||||
items = diagramViewModel.Items.OfType<BlockDesignerItemViewModel>().Where(p => !blockDesignerItemTempLink.LinkList.Contains(p)).ToList();
|
||||
|
||||
foreach (var container in items.SelectMany(n => n.Containers))
|
||||
{
|
||||
@@ -135,7 +135,7 @@ namespace AIStudio.Wpf.DiagramDesigner
|
||||
var innerport = container.GetAllContainers(container.Children, false).Where(p => p.GetBounds().IntersectsWith(blockDesignerItemTempLink.GetBounds())).OrderByDescending(p => p.ContainerLevel).FirstOrDefault();
|
||||
if (innerport != null)
|
||||
{
|
||||
if (innerport.CanAttachTo(blockDesignerItemTempLink.Items.FirstOrDefault()) == true)
|
||||
if (innerport.CanAttachTo(blockDesignerItemTempLink.LinkList.FirstOrDefault()) == true)
|
||||
{
|
||||
innerport.DataItem.ShowConnectors = true;
|
||||
if (innerport.OnlyOneChild || innerport.Children.Count == 0)
|
||||
@@ -158,7 +158,7 @@ namespace AIStudio.Wpf.DiagramDesigner
|
||||
else
|
||||
{
|
||||
|
||||
if (container.CanAttachTo(blockDesignerItemTempLink.Items.FirstOrDefault()) == true)
|
||||
if (container.CanAttachTo(blockDesignerItemTempLink.LinkList.FirstOrDefault()) == true)
|
||||
{
|
||||
container.DataItem.ShowConnectors = true;
|
||||
if (container.OnlyOneChild || container.Children.Count == 0)
|
||||
@@ -195,6 +195,10 @@ namespace AIStudio.Wpf.DiagramDesigner
|
||||
var links = BlockDesignerItemTempLink.Build(blocks);
|
||||
|
||||
blocks.ToList().ForEach(p => {
|
||||
if (p.ZIndex != int.MaxValue)
|
||||
{
|
||||
p.SetOldValue(p.ZIndex, "ZIndex");
|
||||
}
|
||||
p.ZIndex = int.MaxValue;
|
||||
});
|
||||
|
||||
@@ -222,7 +226,10 @@ namespace AIStudio.Wpf.DiagramDesigner
|
||||
var links = BlockDesignerItemTempLink.Build(blocks);
|
||||
|
||||
blocks.ToList().ForEach(p => {
|
||||
p.ZIndex = diagramViewModel.Items.Where(q => q.ZIndex != int.MaxValue).Any() ? diagramViewModel.Items.Where(q => q.ZIndex != int.MaxValue).Max(r => r.ZIndex) + 1 : 0;
|
||||
if (p.HasOldValue("ZIndex"))
|
||||
{
|
||||
p.ZIndex = p.GetOldValue<int>("ZIndex");
|
||||
}
|
||||
});
|
||||
|
||||
foreach (BlockDesignerItemTempLink item in links)
|
||||
@@ -240,7 +247,7 @@ namespace AIStudio.Wpf.DiagramDesigner
|
||||
index++;
|
||||
}
|
||||
}
|
||||
diagramViewModel.InsertChildCommand.Execute(new BlockContainerPara() { Item = container.DataItem, Child = item.Items.FirstOrDefault(), Container = container, Index = index });
|
||||
diagramViewModel.InsertChildCommand.Execute(new BlockContainerPara() { Item = container.DataItem, Child = item.LinkList.FirstOrDefault(), Container = container, Index = index });
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -250,29 +257,21 @@ namespace AIStudio.Wpf.DiagramDesigner
|
||||
|
||||
if (portParent != null)
|
||||
{
|
||||
diagramViewModel.AddNextCommand.Execute(new BlockNextPara() { Item = portParent.DataItem as BlockDesignerItemViewModel, Next = item.Items.FirstOrDefault() });
|
||||
diagramViewModel.AddNextCommand.Execute(new BlockNextPara() { Item = portParent.DataItem as BlockDesignerItemViewModel, Next = item.LinkList.FirstOrDefault() });
|
||||
portParent.BeAttachTo = false;
|
||||
portParent.DisableAttachTo = false;
|
||||
}
|
||||
else
|
||||
else if (portNext != null)
|
||||
{
|
||||
if (item.Items.FirstOrDefault().Parent != null)
|
||||
{
|
||||
diagramViewModel.RemoveNextCommand.Execute(new BlockNextPara() { Item = item.Items.FirstOrDefault().Parent as BlockDesignerItemViewModel, Next = (item.Items.FirstOrDefault().Parent as BlockDesignerItemViewModel)?.Next });
|
||||
}
|
||||
}
|
||||
|
||||
if (portNext != null)
|
||||
{
|
||||
diagramViewModel.AddNextCommand.Execute(new BlockNextPara() { Item = item.Items.LastOrDefault(), Next = portNext.DataItem as BlockDesignerItemViewModel });
|
||||
diagramViewModel.AddNextCommand.Execute(new BlockNextPara() { First = item.LinkList.FirstOrDefault(), Item = item.LinkList.LastOrDefault(), Next = portNext.DataItem as BlockDesignerItemViewModel });
|
||||
portNext.BeAttachTo = false;
|
||||
portNext.DisableAttachTo = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (item.Items.LastOrDefault().Next != null)
|
||||
if (item.LinkList.FirstOrDefault().LinkNode.Previous != null)
|
||||
{
|
||||
diagramViewModel.RemoveNextCommand.Execute(new BlockNextPara() { Item = item.Items.LastOrDefault(), Next = item.Items.LastOrDefault()?.Next });
|
||||
diagramViewModel.RemoveNextCommand.Execute(new BlockNextPara() { Item = item.LinkList.FirstOrDefault().LinkNode.Previous.Value, Next = item.LinkList.FirstOrDefault().LinkNode.Value });
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -284,4 +283,55 @@ namespace AIStudio.Wpf.DiagramDesigner
|
||||
|
||||
#endregion
|
||||
}
|
||||
|
||||
public static class LinkedListExtensions
|
||||
{
|
||||
public static void InsertRange(this LinkedList<BlockDesignerItemViewModel> source, LinkedListNode<BlockDesignerItemViewModel> node, IEnumerable<BlockDesignerItemViewModel> items)
|
||||
{
|
||||
if (node == null || items.Count() == 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
BlockDesignerItemViewModel last = null;
|
||||
foreach (var item in items)
|
||||
{
|
||||
item.LinkNode = source.AddAfter(node, item);
|
||||
item.ParentId = item.LinkNode.Previous.Value.Id;
|
||||
node = item.LinkNode;
|
||||
|
||||
last = item;
|
||||
}
|
||||
|
||||
//把后面的接上
|
||||
var lastnode = source.Find(last);
|
||||
if (lastnode.Next != null)
|
||||
{
|
||||
lastnode.Next.Value.ParentId = last.Id;
|
||||
}
|
||||
}
|
||||
|
||||
public static void AppendRange(this LinkedList<BlockDesignerItemViewModel> source, IEnumerable<BlockDesignerItemViewModel> items)
|
||||
{
|
||||
foreach (var item in items)
|
||||
{
|
||||
item.LinkNode = source.AddLast(item);
|
||||
item.ParentId = item.LinkNode.Previous?.Value.Id ?? new Guid();
|
||||
}
|
||||
}
|
||||
|
||||
public static void PrependRange(this LinkedList<BlockDesignerItemViewModel> source, IEnumerable<BlockDesignerItemViewModel> items)
|
||||
{
|
||||
var first = source.First; // If the list is empty, we can just append everything.
|
||||
if (first is null)
|
||||
{
|
||||
AppendRange(source, items); return;
|
||||
} // Otherwise, add each item in turn just before the original first item
|
||||
foreach (var item in items)
|
||||
{
|
||||
item.LinkNode = source.AddBefore(first, item);
|
||||
item.ParentId = item.LinkNode.Previous.Value.Id;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user