This commit is contained in:
kwai
2023-06-28 12:06:58 +08:00
parent a4ea9f334e
commit 1f20aad2c7
10 changed files with 86 additions and 68 deletions

View File

@@ -607,7 +607,7 @@ namespace AIStudio.Wpf.DiagramDesigner
SetSinkPort(nearPort);
}
}
Root?.ClearNearPort();
Root?.ClearAttachTo();
}
break;
}

View File

@@ -9,7 +9,7 @@ using AIStudio.Wpf.DiagramDesigner.Models;
namespace AIStudio.Wpf.DiagramDesigner
{
public abstract class ConnectorInfoBase : SelectableViewModelBase
public abstract class ConnectorInfoBase : SelectableViewModelBase, IAttachTo
{
public ConnectorInfoBase(ConnectorOrientation orientation) : this(null, orientation)
{

View File

@@ -10,7 +10,7 @@ using AIStudio.Wpf.DiagramDesigner.Models;
namespace AIStudio.Wpf.DiagramDesigner
{
public class BlockItemsContainerInfo : SelectableViewModelBase
public class BlockItemsContainerInfo : SelectableViewModelBase, IAttachTo
{
public BlockItemsContainerInfo(BlockDesignerItemViewModel dataItem, bool onlyOneChild, List<string> childFlag) : this(null, dataItem, onlyOneChild, childFlag)
{

View File

@@ -2979,7 +2979,7 @@ namespace AIStudio.Wpf.DiagramDesigner
});
}
}
#endregion
#endregion
public override string ToString()
{

View File

@@ -6,8 +6,13 @@ using AIStudio.Wpf.DiagramDesigner.Geometrys;
namespace AIStudio.Wpf.DiagramDesigner
{
public static class DiagramViewModelHelper
public static partial class DiagramViewModelHelper
{
static List<IAttachTo> AttachTos
{
get; set;
} = new List<IAttachTo>();
public static DesignerItemViewModelBase GetConnectorDataItem(IEnumerable<SelectableDesignerItemViewModelBase> items, Guid conectorDataItemId, Type connectorDataItemType)
{
DesignerItemViewModelBase dataItem = items.OfType<DesignerItemViewModelBase>().Single(x => x.Id == conectorDataItemId);
@@ -44,7 +49,7 @@ namespace AIStudio.Wpf.DiagramDesigner
if (partialConnection == null)
return null;
diagramViewModel.ClearNearPort();
diagramViewModel.ClearAttachTo();
foreach (var port in diagramViewModel.Items.OfType<DesignerItemViewModelBase>().ToList().SelectMany(n => n.Connectors))
{
if (connectorVertexType == ConnectorVertexType.Start)
@@ -54,13 +59,13 @@ namespace AIStudio.Wpf.DiagramDesigner
if (partialConnection.SinkConnectorInfo?.CanAttachTo(port) == true)
{
port.DataItem.ShowConnectors = true;
port.BeAttachTo = true;
diagramViewModel.AddAttachTo(port, true);
return port;
}
else
{
port.DataItem.ShowConnectors = true;
port.DisableAttachTo = true;
diagramViewModel.AddAttachTo(port, false);
return null;
}
}
@@ -72,13 +77,13 @@ namespace AIStudio.Wpf.DiagramDesigner
if (partialConnection.SourceConnectorInfo?.CanAttachTo(port) == true)
{
port.DataItem.ShowConnectors = true;
port.BeAttachTo = true;
diagramViewModel.AddAttachTo(port, true);
return port;
}
else
{
port.DataItem.ShowConnectors = true;
port.DisableAttachTo = true;
diagramViewModel.AddAttachTo(port, false);
return null;
}
}
@@ -93,7 +98,7 @@ namespace AIStudio.Wpf.DiagramDesigner
if (partialConnection == null)
return null;
diagramViewModel.ClearNearPort();
diagramViewModel.ClearAttachTo();
foreach (var port in diagramViewModel.Items.OfType<DesignerItemViewModelBase>().ToList().SelectMany(n => n.Connectors))
{
if (partialConnection.OnGoingPosition.DistanceTo(port.Position) < diagramViewModel.DiagramOption.SnappingOption.SnappingRadius)
@@ -101,31 +106,44 @@ namespace AIStudio.Wpf.DiagramDesigner
port.DataItem.ShowConnectors = true;
if (partialConnection.SourceConnectorInfo?.CanAttachTo(port) == true)
{
port.BeAttachTo = true;
diagramViewModel.AddAttachTo(port, true);
return port;
}
else
{
port.DisableAttachTo = true;
diagramViewModel.AddAttachTo(port, false);
return null;
}
}
}
}
return null;
}
public static void ClearNearPort(this IDiagramViewModel diagramViewModel)
public static void AddAttachTo(this IDiagramViewModel diagramViewModel, IAttachTo item, bool beAttachTo)
{
diagramViewModel.Items.OfType<DesignerItemViewModelBase>().ToList().SelectMany(n => n.Connectors).Where(p => p.BeAttachTo == true || p.DisableAttachTo == true).ToList()
.ForEach(p => {
p.DisableAttachTo = false;
p.BeAttachTo = false;
});
if (beAttachTo)
{
item.BeAttachTo = true;
}
else
{
item.DisableAttachTo = true;
}
AttachTos.Add(item);
}
public static void ClearAttachTo(this IDiagramViewModel diagramViewModel)
{
AttachTos.ForEach(p => {
p.DisableAttachTo = false;
p.BeAttachTo = false;
});
AttachTos.Clear();
}
#endregion
}
}