diff --git a/DeedyDesigner/Deedy.Activity/Helpers/ActionHelper.cs b/DeedyDesigner/Deedy.Activity/Helpers/ActionHelper.cs
index 49a2477..b10e8ea 100644
--- a/DeedyDesigner/Deedy.Activity/Helpers/ActionHelper.cs
+++ b/DeedyDesigner/Deedy.Activity/Helpers/ActionHelper.cs
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
+using System.Runtime.CompilerServices;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
@@ -129,38 +130,48 @@ namespace Deedy.Activity
///
/// 将使用部件声明特性声明的动作部件与主体组装到一起并连接
///
- ///
+ /// 要进行组装的组合元素
public static void Help_CombineElements(this ICombinedElement combined)
{
if (combined == null) return;
if (combined.Elements == null) combined.Elements = [];
var props = combined.GetType().GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.GetField | BindingFlags.SetField);
+ SortedList sortedElements = new();
+ Dictionary properties = new();
foreach (var prop in props)
{
- if (prop.CanWrite && prop.CanRead)
- {
- if (!prop.PropertyType.IsAssignableFrom(typeof(IElement))) continue;
+ if (!prop.CanRead || !prop.CanWrite) continue;
+ if (!prop.PropertyType.IsAssignableFrom(typeof(IElement))) continue;
+ var cpd = prop.GetCustomAttribute();
+ if (cpd == null) continue;
+ var element = prop.GetValue(combined) as IElement;
+ if (element == null) continue;
- bool hasPart = false;
- foreach (var element in combined.Elements)
+ element.Help_SetAttachValue(CombinePartActionAttribute.CombinePartSign, prop.Name);
+ sortedElements.Add(cpd.InitialSort, element);
+ properties.Add(prop.Name, prop);
+ }
+ foreach (var partElement in sortedElements.Values)
+ {
+ string partSign = partElement.Help_GetAttachValue(CombinePartActionAttribute.CombinePartSign);
+ if (string.IsNullOrEmpty(partSign)) continue;
+ bool hasPart = false;
+ foreach (var element in combined.Elements)
+ {
+ if (element.Help_GetAttachValue(CombinePartActionAttribute.CombinePartSign) == partSign)
{
- if (element.Help_GetAttachValue(CombinePartActionAttribute.CombinePartSign) == prop.Name)
- {
- element.LinkTo(combined);
- prop.SetValue(combined, element);
- hasPart = true;
- break;
- }
- }
- if (!hasPart)
- {
- IElement? partElement = prop.GetValue(combined) as IElement;
- if (partElement == null) continue;
- combined.Elements.Add(partElement);
- partElement.LinkTo(combined);
- partElement.Help_SetAttachValue(CombinePartActionAttribute.CombinePartSign, prop.Name);
+ element.LinkTo(combined);
+ properties[partSign].SetValue(combined, element);
+ hasPart = true;
+ break;
}
}
+ if (!hasPart)
+ {
+ combined.Elements.Add(partElement);
+ partElement.LinkTo(combined);
+ if (partElement is IActionElement actionElement) actionElement.IsLocked = true;
+ }
}
}
///
diff --git a/DeedyDesigner/Deedy.Activity/IElement.cs b/DeedyDesigner/Deedy.Activity/IElement.cs
index d5bbc06..ea2c94e 100644
--- a/DeedyDesigner/Deedy.Activity/IElement.cs
+++ b/DeedyDesigner/Deedy.Activity/IElement.cs
@@ -76,8 +76,8 @@ namespace Deedy.Activity
combinedElement.Help_CombineElements();
this.LinkTo(element);
- if (this is IContainerElement container)
- foreach (IElement subElement in container.Elements)
+ if (this is ICombinedElement combined)
+ foreach (IElement subElement in combined.Elements)
subElement.ReadyToWorking(this);
}
public virtual IElement? Clone()