From a69631293667d225918e647d33dd2f004e0eb65a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=89=BE=E7=AB=B9?= <akwkevin@126.com>
Date: Sun, 13 Aug 2023 23:05:06 +0800
Subject: [PATCH] block

---
 .../Models/Values/ConstParameter.cs           |  5 ++++
 .../BlockDesignerItemViewModel.cs             | 26 +++++++++----------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/AIStudio.Wpf.DiagramDesigner/Models/Values/ConstParameter.cs b/AIStudio.Wpf.DiagramDesigner/Models/Values/ConstParameter.cs
index be71378..4f375b8 100644
--- a/AIStudio.Wpf.DiagramDesigner/Models/Values/ConstParameter.cs
+++ b/AIStudio.Wpf.DiagramDesigner/Models/Values/ConstParameter.cs
@@ -68,5 +68,10 @@ namespace AIStudio.Wpf.DiagramDesigner
             return var1;
 
         }
+
+        public override string ToString()
+        {
+            return $"{Text}:{Value}";
+        }
     }
 }
diff --git a/AIStudio.Wpf.DiagramDesigner/ViewModels/BlockViewModel/BlockDesignerItemViewModel.cs b/AIStudio.Wpf.DiagramDesigner/ViewModels/BlockViewModel/BlockDesignerItemViewModel.cs
index c1e0ed7..850f6e9 100644
--- a/AIStudio.Wpf.DiagramDesigner/ViewModels/BlockViewModel/BlockDesignerItemViewModel.cs
+++ b/AIStudio.Wpf.DiagramDesigner/ViewModels/BlockViewModel/BlockDesignerItemViewModel.cs
@@ -244,7 +244,7 @@ namespace AIStudio.Wpf.DiagramDesigner
             IsSelected = selected;
         }
 
-        public virtual void InsertChild(BlockDesignerItemViewModel child, BlockItemsContainerInfo container, int index)
+        public virtual void InsertChild(BlockDesignerItemViewModel child, BlockItemsContainerInfo container, int index = -1)
         {
             if (container == null)
             {
@@ -285,7 +285,7 @@ namespace AIStudio.Wpf.DiagramDesigner
 
                 items.ForEach(p => {
                     Root.Items.Remove(p);
-                    container.InsertChild(p, index);
+                    container.InsertChild(p, index++);
                 });
 
             }
@@ -296,7 +296,7 @@ namespace AIStudio.Wpf.DiagramDesigner
             System.Windows.Application.Current?.Dispatcher.BeginInvoke(new Action(async () => {
                 await Task.Delay(10);
                 AlignNext(LinkNode?.Next);
-            }));          
+            }));
         }
 
         public virtual void RemoveChild(BlockDesignerItemViewModel child, BlockItemsContainerInfo container)
@@ -317,8 +317,8 @@ namespace AIStudio.Wpf.DiagramDesigner
             }));
         }
 
-        private bool _isExecuting;
-        public bool IsExecuting
+        private int _isExecuting;
+        public int ExecutStatus
         {
             get
             {
@@ -457,19 +457,19 @@ namespace AIStudio.Wpf.DiagramDesigner
         {
             var items = this.LinkNode.List.ToList();
 
-            items.ForEach(p => p.IsExecuting = true);
+            items.ForEach(p => p.ExecutStatus = 1);
         }
 
         public override void ExitPreviewExecuteEdit()
         {
             var items = this.LinkNode.List.ToList();
 
-            items.ForEach(p => p.IsExecuting = false);
+            items.ForEach(p => p.ExecutStatus = 0);
         }
 
         public async Task Execute()
         {
-            await StopExecution();
+            await StopExecution(0);
             await BeforeExecution();
             if (await Executing())
             {
@@ -477,13 +477,13 @@ namespace AIStudio.Wpf.DiagramDesigner
             }
             else
             {
-                IsExecuting = false;
+                ExecutStatus = 0;
             }
         }
 
         public virtual Task BeforeExecution()
         {
-            IsExecuting = true;
+            ExecutStatus = 1;
             return Task.CompletedTask;
         }
 
@@ -492,16 +492,16 @@ namespace AIStudio.Wpf.DiagramDesigner
             return Task.FromResult(true);
         }
 
-        public virtual Task StopExecution()
+        public virtual Task StopExecution(int status)
         {
             return Task.CompletedTask;
         }
 
         public virtual async Task AfterExecution()
         {
-            if (IsExecuting)
+            if (ExecutStatus == 1)
             {
-                IsExecuting = false;
+                ExecutStatus = 0;
                 if (LinkNode.Next != null)
                     await LinkNode.Next.Value.Execute();
             }