From 35447c65d916cdc78498f171944b717b4b255b93 Mon Sep 17 00:00:00 2001
From: zengwenjie <1663900244@qq.com>
Date: Tue, 16 Sep 2025 10:11:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=86=E5=A4=87=E5=B0=86=E9=80=BB=E8=BE=91?=
=?UTF-8?q?=E6=A0=91=E5=8F=98=E6=9B=B4=E6=96=B9=E6=B3=95=E8=BF=81=E7=A7=BB?=
=?UTF-8?q?=E5=88=B0=E5=8F=AF=E5=8F=98=E5=AE=B9=E5=99=A8=E5=85=83=E7=B4=A0?=
=?UTF-8?q?=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
DeedyDesigner/Deedy.Activity/ActionViewer.cs | 29 ++++++++++++++-----
DeedyDesigner/Deedy.Activity/BasalAction.cs | 12 ++++++++
.../Contract/Interface/IContainerElement.cs | 4 +--
.../{AtomicityStep.cs => AtomicityLogical.cs} | 4 +--
.../{CombinedNode.cs => CombinedLogical.cs} | 4 +--
...{ContainerBlock.cs => ContainerLogical.cs} | 4 +--
DeedyDesigner/Deedy.Activity/DeedyHelper.cs | 9 ++++++
.../Deedy.Activity/DeedyVisual/DeedyLayout.cs | 12 ++++++++
DeedyDesigner/Deedy.Activity/IActionViewer.cs | 2 +-
DeedyDesigner/Deedy.Activity/IActivity.cs | 3 ++
DeedyDesigner/Deedy.Activity/IElement.cs | 3 +-
11 files changed, 68 insertions(+), 18 deletions(-)
rename DeedyDesigner/Deedy.Activity/DeedyAction/FlowAction/{AtomicityStep.cs => AtomicityLogical.cs} (63%)
rename DeedyDesigner/Deedy.Activity/DeedyAction/FlowAction/{CombinedNode.cs => CombinedLogical.cs} (73%)
rename DeedyDesigner/Deedy.Activity/DeedyAction/FlowAction/{ContainerBlock.cs => ContainerLogical.cs} (82%)
diff --git a/DeedyDesigner/Deedy.Activity/ActionViewer.cs b/DeedyDesigner/Deedy.Activity/ActionViewer.cs
index 927faf2..4e690d7 100644
--- a/DeedyDesigner/Deedy.Activity/ActionViewer.cs
+++ b/DeedyDesigner/Deedy.Activity/ActionViewer.cs
@@ -92,18 +92,21 @@ namespace Deedy.Activity
///
/// 动作节点
///
- public IActionElement DeedyAction
+ public IActionElement ActionElement
{
- get { return (IActionElement)GetValue(DeedyActionProperty); }
- set { SetValue(DeedyActionProperty, value); }
+ get { return (IActionElement)GetValue(ActionElementProperty); }
+ set { SetValue(ActionElementProperty, value); }
}
- public static readonly DependencyProperty DeedyActionProperty =
- DependencyProperty.Register("DeedyAction", typeof(IActionElement), typeof(ActionViewer), new PropertyMetadata(null,
- (d, e) => (d as ActionViewer)?.DeedyAction_PropertyChangedCallback(e)));
+
+ public Runtime Runtime => throw new NotImplementedException();
+
+ public static readonly DependencyProperty ActionElementProperty =
+ DependencyProperty.Register("ActionElement", typeof(IActionElement), typeof(ActionViewer), new PropertyMetadata(null,
+ (d, e) => (d as ActionViewer)?.ActionElement_PropertyChangedCallback(e)));
///
- /// 处理「DeedyActionViewer.DeedyAction」属性变更
+ /// 处理「ActionElementViewer.ActionElement」属性变更
///
- protected virtual void DeedyAction_PropertyChangedCallback(DependencyPropertyChangedEventArgs e)
+ protected virtual void ActionElement_PropertyChangedCallback(DependencyPropertyChangedEventArgs e)
{
//
}
@@ -111,5 +114,15 @@ namespace Deedy.Activity
{
throw new NotImplementedException();
}
+
+ public void ReadyToEditing(Runtime runtime)
+ {
+ throw new NotImplementedException();
+ }
+
+ public void ReadyToRunning(Runtime runtime)
+ {
+ throw new NotImplementedException();
+ }
}
}
diff --git a/DeedyDesigner/Deedy.Activity/BasalAction.cs b/DeedyDesigner/Deedy.Activity/BasalAction.cs
index 38399e1..2b6467f 100644
--- a/DeedyDesigner/Deedy.Activity/BasalAction.cs
+++ b/DeedyDesigner/Deedy.Activity/BasalAction.cs
@@ -21,6 +21,8 @@ namespace Deedy.Activity
public IElement RootElement => (this.ParentElement == null) ? this : this.ParentElement.RootElement;
+ public Runtime Runtime => throw new NotImplementedException();
+
public event PropertyChangedEventHandler? PropertyChanged;
///
@@ -74,5 +76,15 @@ namespace Deedy.Activity
{
throw new NotImplementedException();
}
+
+ public void ReadyToEditing(Runtime runtime)
+ {
+ throw new NotImplementedException();
+ }
+
+ public void ReadyToRunning(Runtime runtime)
+ {
+ throw new NotImplementedException();
+ }
}
}
diff --git a/DeedyDesigner/Deedy.Activity/Contract/Interface/IContainerElement.cs b/DeedyDesigner/Deedy.Activity/Contract/Interface/IContainerElement.cs
index f99439f..6f3f765 100644
--- a/DeedyDesigner/Deedy.Activity/Contract/Interface/IContainerElement.cs
+++ b/DeedyDesigner/Deedy.Activity/Contract/Interface/IContainerElement.cs
@@ -8,7 +8,7 @@ namespace Deedy.Activity
{
public interface IContainerElement : ICombinedElement
{
- public void Append(IElement deedyElement);
- public void Remove(IElement deedyElement);
+ public void Append(IElement element);
+ public void Remove(IElement element);
}
}
diff --git a/DeedyDesigner/Deedy.Activity/DeedyAction/FlowAction/AtomicityStep.cs b/DeedyDesigner/Deedy.Activity/DeedyAction/FlowAction/AtomicityLogical.cs
similarity index 63%
rename from DeedyDesigner/Deedy.Activity/DeedyAction/FlowAction/AtomicityStep.cs
rename to DeedyDesigner/Deedy.Activity/DeedyAction/FlowAction/AtomicityLogical.cs
index 273bdd0..4cbe6fd 100644
--- a/DeedyDesigner/Deedy.Activity/DeedyAction/FlowAction/AtomicityStep.cs
+++ b/DeedyDesigner/Deedy.Activity/DeedyAction/FlowAction/AtomicityLogical.cs
@@ -6,8 +6,8 @@ using System.Threading.Tasks;
namespace Deedy.Activity
{
- public abstract class AtomicityStep : FlowAction
+ public abstract class AtomicityLogical : FlowAction
{
- public AtomicityStep() { }
+ public AtomicityLogical() { }
}
}
diff --git a/DeedyDesigner/Deedy.Activity/DeedyAction/FlowAction/CombinedNode.cs b/DeedyDesigner/Deedy.Activity/DeedyAction/FlowAction/CombinedLogical.cs
similarity index 73%
rename from DeedyDesigner/Deedy.Activity/DeedyAction/FlowAction/CombinedNode.cs
rename to DeedyDesigner/Deedy.Activity/DeedyAction/FlowAction/CombinedLogical.cs
index 22a214f..190e081 100644
--- a/DeedyDesigner/Deedy.Activity/DeedyAction/FlowAction/CombinedNode.cs
+++ b/DeedyDesigner/Deedy.Activity/DeedyAction/FlowAction/CombinedLogical.cs
@@ -6,9 +6,9 @@ using System.Threading.Tasks;
namespace Deedy.Activity
{
- public abstract class CombinedNode : FlowAction, ICombinedElement
+ public abstract class CombinedLogical : FlowAction, ICombinedElement
{
- public CombinedNode() { }
+ public CombinedLogical() { }
public DeedyElementCollection Elements { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
}
diff --git a/DeedyDesigner/Deedy.Activity/DeedyAction/FlowAction/ContainerBlock.cs b/DeedyDesigner/Deedy.Activity/DeedyAction/FlowAction/ContainerLogical.cs
similarity index 82%
rename from DeedyDesigner/Deedy.Activity/DeedyAction/FlowAction/ContainerBlock.cs
rename to DeedyDesigner/Deedy.Activity/DeedyAction/FlowAction/ContainerLogical.cs
index 2894c95..c0f71ee 100644
--- a/DeedyDesigner/Deedy.Activity/DeedyAction/FlowAction/ContainerBlock.cs
+++ b/DeedyDesigner/Deedy.Activity/DeedyAction/FlowAction/ContainerLogical.cs
@@ -6,9 +6,9 @@ using System.Threading.Tasks;
namespace Deedy.Activity
{
- public abstract class ContainerBlock : FlowAction, IContainerElement
+ public abstract class ContainerLogical : FlowAction, IContainerElement
{
- public ContainerBlock() { }
+ public ContainerLogical() { }
public DeedyElementCollection Elements { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
diff --git a/DeedyDesigner/Deedy.Activity/DeedyHelper.cs b/DeedyDesigner/Deedy.Activity/DeedyHelper.cs
index 5e505ba..19e3604 100644
--- a/DeedyDesigner/Deedy.Activity/DeedyHelper.cs
+++ b/DeedyDesigner/Deedy.Activity/DeedyHelper.cs
@@ -48,5 +48,14 @@ namespace Deedy.Activity
if (typeof(TValue).IsInstanceOfType(value)) return (TValue?)value;
throw new Exception("对象上指定属性的当前值不是期望类型的有效实例...");
}
+ ///
+ /// 帮助一个IElement节点构建参数映射表
+ ///
+ /// 需要构建参数映射表的Element节点
+ /// 消息输出器
+ internal static void BuildParamMapping(this IElement element, Output? output = null)
+ {
+ //
+ }
}
}
diff --git a/DeedyDesigner/Deedy.Activity/DeedyVisual/DeedyLayout.cs b/DeedyDesigner/Deedy.Activity/DeedyVisual/DeedyLayout.cs
index 59672d5..bee968e 100644
--- a/DeedyDesigner/Deedy.Activity/DeedyVisual/DeedyLayout.cs
+++ b/DeedyDesigner/Deedy.Activity/DeedyVisual/DeedyLayout.cs
@@ -21,6 +21,8 @@ namespace Deedy.Activity
public DeedyElementCollection Elements { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+ public Runtime Runtime => throw new NotImplementedException();
+
public event PropertyChangedEventHandler? PropertyChanged;
///
@@ -86,5 +88,15 @@ namespace Deedy.Activity
{
throw new NotImplementedException();
}
+
+ public void ReadyToEditing(Runtime runtime)
+ {
+ throw new NotImplementedException();
+ }
+
+ public void ReadyToRunning(Runtime runtime)
+ {
+ throw new NotImplementedException();
+ }
}
}
diff --git a/DeedyDesigner/Deedy.Activity/IActionViewer.cs b/DeedyDesigner/Deedy.Activity/IActionViewer.cs
index 30d5363..3f601a1 100644
--- a/DeedyDesigner/Deedy.Activity/IActionViewer.cs
+++ b/DeedyDesigner/Deedy.Activity/IActionViewer.cs
@@ -12,6 +12,6 @@ namespace Deedy.Activity
public interface IActionViewer : IActivity, INotifyPropertyChanged
{
[AllowNull]
- public IActionElement DeedyAction { get; set; }
+ public IActionElement ActionElement { get; set; }
}
}
diff --git a/DeedyDesigner/Deedy.Activity/IActivity.cs b/DeedyDesigner/Deedy.Activity/IActivity.cs
index b320821..4eddd66 100644
--- a/DeedyDesigner/Deedy.Activity/IActivity.cs
+++ b/DeedyDesigner/Deedy.Activity/IActivity.cs
@@ -8,6 +8,9 @@ namespace Deedy.Activity
{
public interface IActivity
{
+ public Runtime Runtime { get; }
public void ReadyToWorking(IElement? element = null, Output? output = null);
+ public void ReadyToEditing(Runtime runtime);
+ public void ReadyToRunning(Runtime runtime);
}
}
diff --git a/DeedyDesigner/Deedy.Activity/IElement.cs b/DeedyDesigner/Deedy.Activity/IElement.cs
index 608c30c..5fec1dd 100644
--- a/DeedyDesigner/Deedy.Activity/IElement.cs
+++ b/DeedyDesigner/Deedy.Activity/IElement.cs
@@ -67,7 +67,8 @@ namespace Deedy.Activity
///
public new void ReadyToWorking(IElement? element = null, Output? output = null)
{
- //TODO：刷新参数映射
+ this.BuildParamMapping(output);
+
this.LinkTo(element);
if (this is IContainerElement container)
foreach (IElement subElement in container.Elements)