diff --git a/AIStudio.Wpf.DiagramDesigner/Models/Values/ConstParameter.cs b/AIStudio.Wpf.DiagramDesigner/Models/Values/ConstParameter.cs index 6c7cf02..3fdb703 100644 --- a/AIStudio.Wpf.DiagramDesigner/Models/Values/ConstParameter.cs +++ b/AIStudio.Wpf.DiagramDesigner/Models/Values/ConstParameter.cs @@ -10,19 +10,7 @@ namespace AIStudio.Wpf.DiagramDesigner { public class ConstParameter : BindableBase, IParameter { - private ISelectable _item; - - public ISelectable Item - { - get - { - return _item; - } - set - { - SetProperty(ref _item, value); - } - } + private string _text; @@ -53,7 +41,6 @@ namespace AIStudio.Wpf.DiagramDesigner } - public bool IsPublic { get; set; } = true; public void Add(object value) { diff --git a/AIStudio.Wpf.DiagramDesigner/Models/Values/IParameter.cs b/AIStudio.Wpf.DiagramDesigner/Models/Values/IParameter.cs index b12469e..c15a0c8 100644 --- a/AIStudio.Wpf.DiagramDesigner/Models/Values/IParameter.cs +++ b/AIStudio.Wpf.DiagramDesigner/Models/Values/IParameter.cs @@ -2,11 +2,6 @@ { public interface IParameter { - ISelectable Item - { - get; set; - } - string Text { get; set; @@ -17,11 +12,6 @@ get; set; } - bool IsPublic - { - get; set; - } - void Add(object value); } diff --git a/AIStudio.Wpf.DiagramDesigner/Models/Values/VarParameter.cs b/AIStudio.Wpf.DiagramDesigner/Models/Values/VarParameter.cs deleted file mode 100644 index 85cd1c5..0000000 --- a/AIStudio.Wpf.DiagramDesigner/Models/Values/VarParameter.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System; -using AIStudio.Wpf.DiagramDesigner; - -namespace AIStudio.Wpf.DiagramDesigner -{ - public class VarParameter : ConstParameter - { - - } -} diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DesignerItemViewModelBase.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DesignerItemViewModelBase.cs index 59f1a67..0b46d91 100644 --- a/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DesignerItemViewModelBase.cs +++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/BaseViewModel/DesignerItemViewModelBase.cs @@ -435,6 +435,7 @@ namespace AIStudio.Wpf.DiagramDesigner { Left = value.X; Top = value.Y; + RaisePropertyChanged(nameof(TopLeft)); } } diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/BlockViewModel/BlockDesignerItemViewModel.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/BlockViewModel/BlockDesignerItemViewModel.cs index 117adf9..9f7305d 100644 --- a/AIStudio.Wpf.DiagramDesigner/ViewModels/BlockViewModel/BlockDesignerItemViewModel.cs +++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/BlockViewModel/BlockDesignerItemViewModel.cs @@ -41,7 +41,7 @@ namespace AIStudio.Wpf.DiagramDesigner ItemHeight = double.NaN; AddConnector(new BlockConnectorInfo(this.Root, this, ConnectorOrientation.Top)); AddConnector(new BlockConnectorInfo(this.Root, this, ConnectorOrientation.Bottom)); - + } protected override void Init(IDiagramViewModel root, bool initNew) @@ -423,27 +423,29 @@ namespace AIStudio.Wpf.DiagramDesigner } #region 执行 - public void Execute() + public async Task Execute() { - BeforeExecute(); - Executing(); - AfterExecute(); + await BeforeExecute(); + await Executing(); + await AfterExecute(); } - public virtual void BeforeExecute() + public virtual Task BeforeExecute() { IsExecuting = true; + return Task.CompletedTask; } - public virtual void Executing() + public virtual Task Executing() { - + return Task.CompletedTask; } - public virtual void AfterExecute() + public virtual async Task AfterExecute() { IsExecuting = false; - Next?.Execute(); + if (Next != null) + await Next.Execute(); } public virtual object GetResult()