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

修复一个sfc的bug

Browse Source
This commit is contained in:
艾竹
2023-04-16 10:10:12 +08:00
parent f05654309b
commit 5dee3a9907
10 changed files with 110 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
AIStudio.Wpf.DiagramDesigner/Helpers/MemberInfoGettingHelper.cs Normal file
View File

@@ -0,0 +1,18 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
using System.Text;
using System.Threading.Tasks;
namespace AIStudio.Wpf.DiagramDesigner.Helpers
{
public class MemberInfoGettingHelper
{
public static string GetMemberName<T>(Expression<Func<T>> memberExpression)
{
MemberExpression expressionBody = (MemberExpression)memberExpression.Body;
return expressionBody.Member.Name;
}
}
}

7
AIStudio.Wpf.DiagramDesigner/Models/Serializables/SelectableItemBase.cs
View File

@@ -34,6 +34,7 @@ namespace AIStudio.Wpf.DiagramDesigner
this.IsGroup = viewmodel.IsGroup;
this.ParentId = viewmodel.ParentId;
this.Text = viewmodel.Text;
this.Name = viewmodel.Name;
ColorItem = CopyHelper.Mapper<ColorItem>(viewmodel.ColorViewModel);
FontItem = CopyHelper.Mapper<FontItem, IFontViewModel>(viewmodel.FontViewModel);
@@ -64,6 +65,12 @@ namespace AIStudio.Wpf.DiagramDesigner
get; set;
}
[XmlAttribute]
public string Name
{
get; set;
}
[XmlAttribute]
public string Text
{

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

@@ -2,9 +2,11 @@
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Linq.Expressions;
using System.Text;
using System.Windows.Input;
using System.Windows.Media;
using AIStudio.Wpf.DiagramDesigner.Helpers;
using AIStudio.Wpf.DiagramDesigner.Models;
using AIStudio.Wpf.DiagramDesigner.ViewModels;
using AIStudio.Wpf.DiagramDesigner.ViewModels.BaseViewModel;
@@ -113,7 +115,7 @@ namespace AIStudio.Wpf.DiagramDesigner
protected virtual void InitNew()
{
}
protected virtual void LoadDesignerItemViewModel(SelectableItemBase designerbase)
@@ -369,6 +371,12 @@ namespace AIStudio.Wpf.DiagramDesigner
get; set;
}
[Browsable(true)]
public string Name
{
get;set;
}
private string _text;
[Browsable(true)]
[CanDo]
@@ -450,10 +458,9 @@ namespace AIStudio.Wpf.DiagramDesigner
RaisePropertyChanged(sender, e);
}
public override string ToString()
{
return $"{Id}-{Text}";
return $"{Id}-{Name}-{Text}";
}
public virtual void Dispose()

5
AIStudio.Wpf.DiagramDesigner/ViewModels/DefaultViewModel/LogicalGateItemViewModelBase.cs
View File

@@ -304,6 +304,11 @@ namespace AIStudio.Wpf.DiagramDesigner
}
}
public void Execute()
{
GetInput();
CalculateOutput();
}
public virtual void GetInput()
{