From a6e92b67043651a3de8502d1ad6a791d3ac4f46e Mon Sep 17 00:00:00 2001 From: zengwenjie <1663900244@qq.com> Date: Mon, 15 Sep 2025 19:16:51 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=AE=9A=E4=B9=89=E6=A0=B9=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Contract/Interface/IContainerElement.cs | 1 - DeedyDesigner/Deedy.Activity/DeedyAction.cs | 15 ++++++++++++--- .../Deedy.Activity/DeedyAction/ExecAction.cs | 2 +- .../Deedy.Activity/DeedyAction/FlowAction.cs | 2 +- .../Deedy.Activity/DeedyAction/FuncAction.cs | 2 +- .../Deedy.Activity/DeedyVisual/DeedyLayout.cs | 15 ++++++++++++--- DeedyDesigner/Deedy.Activity/IDeedyElement.cs | 6 ++++-- 7 files changed, 31 insertions(+), 12 deletions(-) diff --git a/DeedyDesigner/Deedy.Activity/Contract/Interface/IContainerElement.cs b/DeedyDesigner/Deedy.Activity/Contract/Interface/IContainerElement.cs index b53c7e9..138d86b 100644 --- a/DeedyDesigner/Deedy.Activity/Contract/Interface/IContainerElement.cs +++ b/DeedyDesigner/Deedy.Activity/Contract/Interface/IContainerElement.cs @@ -10,6 +10,5 @@ namespace Deedy.Activity { public void Append(IDeedyElement deedyElement); public void Remove(IDeedyElement deedyElement); - public void SwapIndex(IDeedyElement element1, IDeedyElement element2); } } diff --git a/DeedyDesigner/Deedy.Activity/DeedyAction.cs b/DeedyDesigner/Deedy.Activity/DeedyAction.cs index 9f0e2dd..66af921 100644 --- a/DeedyDesigner/Deedy.Activity/DeedyAction.cs +++ b/DeedyDesigner/Deedy.Activity/DeedyAction.cs @@ -15,11 +15,10 @@ namespace Deedy.Activity public string DETitle { get; set; } = ""; public string DERemark { get; set; } = ""; public string DEIdentify { get; set; } = ""; - public IDeedyElement? DeedyParent { get; protected internal set; } + public IDeedyElement? ParentElement { get; protected internal set; } public IActionViewer? ActionViewer { get; protected internal set; } - public DeedyElementCollection Children { get; set; } = new(); - public IDeedyElement DeedyRoot => (this.DeedyParent == null) ? this : this.DeedyParent.DeedyRoot; + public IDeedyElement RootElement => (this.ParentElement == null) ? this : this.ParentElement.RootElement; public event PropertyChangedEventHandler? PropertyChanged; @@ -64,5 +63,15 @@ namespace Deedy.Activity { throw new NotImplementedException(); } + + public void SwapIndex(IDeedyElement deedyElement) + { + throw new NotImplementedException(); + } + + public void ReadyToWorking(Runtime? runtime) + { + throw new NotImplementedException(); + } } } diff --git a/DeedyDesigner/Deedy.Activity/DeedyAction/ExecAction.cs b/DeedyDesigner/Deedy.Activity/DeedyAction/ExecAction.cs index 8c6a168..22897ed 100644 --- a/DeedyDesigner/Deedy.Activity/DeedyAction/ExecAction.cs +++ b/DeedyDesigner/Deedy.Activity/DeedyAction/ExecAction.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace Deedy.Activity { - public abstract class ExecAction + public abstract class ExecAction : DeedyAction { protected internal ExecAction() { } } diff --git a/DeedyDesigner/Deedy.Activity/DeedyAction/FlowAction.cs b/DeedyDesigner/Deedy.Activity/DeedyAction/FlowAction.cs index c2f2637..082a416 100644 --- a/DeedyDesigner/Deedy.Activity/DeedyAction/FlowAction.cs +++ b/DeedyDesigner/Deedy.Activity/DeedyAction/FlowAction.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace Deedy.Activity { - public abstract class FlowAction + public abstract class FlowAction : DeedyAction { protected internal FlowAction() { } } diff --git a/DeedyDesigner/Deedy.Activity/DeedyAction/FuncAction.cs b/DeedyDesigner/Deedy.Activity/DeedyAction/FuncAction.cs index f50e039..de4e48b 100644 --- a/DeedyDesigner/Deedy.Activity/DeedyAction/FuncAction.cs +++ b/DeedyDesigner/Deedy.Activity/DeedyAction/FuncAction.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace Deedy.Activity { - public abstract class FuncAction + public abstract class FuncAction : DeedyAction { protected internal FuncAction() { } } diff --git a/DeedyDesigner/Deedy.Activity/DeedyVisual/DeedyLayout.cs b/DeedyDesigner/Deedy.Activity/DeedyVisual/DeedyLayout.cs index ac81d4a..4fe42a8 100644 --- a/DeedyDesigner/Deedy.Activity/DeedyVisual/DeedyLayout.cs +++ b/DeedyDesigner/Deedy.Activity/DeedyVisual/DeedyLayout.cs @@ -14,10 +14,9 @@ namespace Deedy.Activity public string DETitle { get; set; } = ""; public string DERemark { get; set; } = ""; public string DEIdentify { get; set; } = ""; - public IDeedyElement? DeedyParent { get; protected internal set; } - public DeedyElementCollection Children { get; set; } = new(); + public IDeedyElement? ParentElement { get; protected internal set; } - public IDeedyElement DeedyRoot => (this.DeedyParent == null) ? this : this.DeedyParent.DeedyRoot; + public IDeedyElement RootElement => (this.ParentElement == null) ? this : this.ParentElement.RootElement; public DeedyElementCollection Elements { get => throw new NotImplementedException(); set => throw new NotImplementedException(); } @@ -81,5 +80,15 @@ namespace Deedy.Activity { throw new NotImplementedException(); } + + public void SwapIndex(IDeedyElement deedyElement) + { + throw new NotImplementedException(); + } + + public void ReadyToWorking(Runtime? runtime) + { + throw new NotImplementedException(); + } } } diff --git a/DeedyDesigner/Deedy.Activity/IDeedyElement.cs b/DeedyDesigner/Deedy.Activity/IDeedyElement.cs index f4df7ab..3e6941a 100644 --- a/DeedyDesigner/Deedy.Activity/IDeedyElement.cs +++ b/DeedyDesigner/Deedy.Activity/IDeedyElement.cs @@ -14,9 +14,11 @@ namespace Deedy.Activity public string DETitle { get; set; } public string DERemark { get; set; } public string DEIdentify { get; set; } - public IDeedyElement? DeedyParent { get; } - public IDeedyElement DeedyRoot { get; } + public IDeedyElement? ParentElement { get; } + public IDeedyElement RootElement { get; } public void InsertToFore(IDeedyElement deedyElement); public void InsertAtRear(IDeedyElement deedyElement); + public void SwapIndex(IDeedyElement deedyElement); + public void ReadyToWorking(Runtime? runtime); } }