diff --git a/AIStudio.Wpf.DiagramDesigner/AIStudio.Wpf.DiagramDesigner.csproj b/AIStudio.Wpf.DiagramDesigner/AIStudio.Wpf.DiagramDesigner.csproj index f6d4714..f631e7f 100644 --- a/AIStudio.Wpf.DiagramDesigner/AIStudio.Wpf.DiagramDesigner.csproj +++ b/AIStudio.Wpf.DiagramDesigner/AIStudio.Wpf.DiagramDesigner.csproj @@ -8,7 +8,7 @@ A.png - 1.1.1 + 1.1.4 一个Wpf的Diagram控件基础库 diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/DefaultViewModel/LogicalGateItemViewModelBase.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/DefaultViewModel/LogicalGateItemViewModelBase.cs index 7b75373..80ea4b4 100644 --- a/AIStudio.Wpf.DiagramDesigner/ViewModels/DefaultViewModel/LogicalGateItemViewModelBase.cs +++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/DefaultViewModel/LogicalGateItemViewModelBase.cs @@ -177,7 +177,7 @@ namespace AIStudio.Wpf.DiagramDesigner public Dictionary Input { get; set; } = new Dictionary(); public Dictionary Output { get; set; } = new Dictionary(); - public virtual void ExecuteAddInput(object parameter, int index = 0) + public virtual LogicalConnectorInfo ExecuteAddInput(object parameter, int index = 0) { if (Input.Values.Count >= 2) { @@ -191,9 +191,11 @@ namespace AIStudio.Wpf.DiagramDesigner Input[i].YRatio = (i + 1.0) / (Input.Values.Count + 1.0); } AddConnector(connector); + + return connector; } - public virtual void ExecuteAddOutput(object parameter, int index = 0) + public virtual LogicalConnectorInfo ExecuteAddOutput(object parameter, int index = 0) { LogicalConnectorInfo connector = new LogicalConnectorInfo(this, ConnectorOrientation.Right, true, false, ValueTypeOutput.Count > index ? ValueTypeOutput[index] : ValueTypeInput[0]); connector.XRatio = 1; @@ -203,6 +205,8 @@ namespace AIStudio.Wpf.DiagramDesigner Output[i].YRatio = (i + 1.0) / (Output.Values.Count + 1.0); } AddConnector(connector); + + return connector; } public List ValueTypeInput @@ -268,6 +272,7 @@ namespace AIStudio.Wpf.DiagramDesigner if (connector.SourceConnectorInfo.DataItem is LogicalGateItemViewModelBase) { input.Value.ConnectorValue = (connector.SourceConnectorInfo as LogicalConnectorInfo).ConnectorValue; + input.Value.ConnectorString = (connector.SourceConnectorInfo as LogicalConnectorInfo).ConnectorString; input.Value.ColorViewModel.FillColor.Color = connector.SourceConnectorInfo.ColorViewModel.FillColor.Color; connector.ColorViewModel.LineColor.Color = connector.SourceConnectorInfo.ColorViewModel.FillColor.Color;