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

bug优化

Browse Source
This commit is contained in:
艾竹
2025-01-19 11:02:03 +08:00
parent 4582897817
commit ddf89e21e4
12 changed files with 160 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/ConnectionViewModel.cs
View File

@@ -561,6 +561,8 @@ namespace AIStudio.Wpf.DiagramDesigner
case nameof(DesignerItemViewModelBase.ItemWidth):
case nameof(DesignerItemViewModelBase.Left):
case nameof(DesignerItemViewModelBase.Top):
case nameof(DesignerItemViewModelBase.ActualItemHeight):
case nameof(DesignerItemViewModelBase.ActualItemWidth):
if (IsFullConnection)
{
//减少触发一次画线

32
AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/Connector/LogicalConnectorInfo.cs
View File

@@ -41,6 +41,7 @@ namespace AIStudio.Wpf.DiagramDesigner
ConnectorValue = designer.ConnectorValue;
ConnectorValueType = designer.ConnectorValueType;
ConnectorString = designer.ConnectorString;
ConnectorRemark = designer.ConnectorRemark;
}
}
@@ -71,6 +72,19 @@ namespace AIStudio.Wpf.DiagramDesigner
}
}
private string _connectorRemark;
public string ConnectorRemark
{
get
{
return _connectorRemark;
}
set
{
SetProperty(ref _connectorRemark, value);
}
}
private ConnectorValueType _connectorValueType;
public ConnectorValueType ConnectorValueType
{
@@ -154,7 +168,23 @@ namespace AIStudio.Wpf.DiagramDesigner
{
return true;
}
else if (logical.ConnectorValueType <= ConnectorValueType.ValueType && this.ConnectorValueType <= ConnectorValueType.ValueType)
else if (logical.ConnectorValueType == ConnectorValueType.Int && this.ConnectorValueType == ConnectorValueType.Int)
{
return true;
}
else if (logical.ConnectorValueType == ConnectorValueType.Real && this.ConnectorValueType == ConnectorValueType.Real)
{
return true;
}
else if (logical.ConnectorValueType == ConnectorValueType.Bool && this.ConnectorValueType == ConnectorValueType.Bool)
{
return true;
}
else if (logical.ConnectorValueType == ConnectorValueType.ValueType && this.ConnectorValueType <= ConnectorValueType.ValueType)
{
return true;
}
else if (logical.ConnectorValueType <= ConnectorValueType.ValueType && this.ConnectorValueType == ConnectorValueType.ValueType)
{
return true;
}

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

@@ -1259,9 +1259,9 @@ namespace AIStudio.Wpf.DiagramDesigner
item.Id = Guid.NewGuid();
}
if (item is LogicalGateItemViewModelBase logical)
if (item is LogicalGateItemViewModelBase logical && logical.OrderNumber == 0)
{
logical.OrderNumber = Items.OfType<LogicalGateItemViewModelBase>().Count() + 1;
logical.OrderNumber = Items.OfType<LogicalGateItemViewModelBase>().Where(p => p.OrderNumber > 0).Count() + 1;
}
//if (item is BlockDesignerItemViewModel block)
//{

10
AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/SelectableViewModelBase.cs
View File

@@ -458,9 +458,17 @@ namespace AIStudio.Wpf.DiagramDesigner
}
[Browsable(true)]
private string _name;
public string Name
{
get; set;
get
{
return _name;
}
set
{
SetProperty(ref _name, value);
}
}
private string _text;