From 0dd8696c78fed8a8c76ab2777eff2a55e5d024f4 Mon Sep 17 00:00:00 2001 From: zengwenjie <1663900244@qq.com> Date: Tue, 16 Sep 2025 09:32:07 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DeedyDesigner/Deedy.Activity/ActionViewer.cs | 2 +- DeedyDesigner/Deedy.Activity/BasalAction.cs | 12 ++++---- .../Collection/DeedyElementCollection.cs | 8 ++--- .../Contract/Interface/ICombinedElement.cs | 2 +- .../Contract/Interface/IContainerElement.cs | 4 +-- .../DeedyAction/FlowAction/ContainerBlock.cs | 4 +-- .../FuncAction/ContainerFunction.cs | 4 +-- .../Deedy.Activity/DeedyVisual/DeedyLayout.cs | 21 +++++-------- .../Deedy.Activity/IActionElement.cs | 2 +- DeedyDesigner/Deedy.Activity/IActionViewer.cs | 2 +- .../{IDeedyActivity.cs => IActivity.cs} | 4 +-- .../{IElementActivity.cs => IElement.cs} | 30 +++++++++---------- .../Deedy.Activity/IVisualElement.cs | 2 +- 13 files changed, 46 insertions(+), 51 deletions(-) rename DeedyDesigner/Deedy.Activity/{IDeedyActivity.cs => IActivity.cs} (55%) rename DeedyDesigner/Deedy.Activity/{IElementActivity.cs => IElement.cs} (77%) diff --git a/DeedyDesigner/Deedy.Activity/ActionViewer.cs b/DeedyDesigner/Deedy.Activity/ActionViewer.cs index 7eb3c8a..927faf2 100644 --- a/DeedyDesigner/Deedy.Activity/ActionViewer.cs +++ b/DeedyDesigner/Deedy.Activity/ActionViewer.cs @@ -107,7 +107,7 @@ namespace Deedy.Activity { // } - public void ReadyToWorking(IElementActivity? element = null, Output? output = null) + public void ReadyToWorking(IElement? element = null, Output? output = null) { throw new NotImplementedException(); } diff --git a/DeedyDesigner/Deedy.Activity/BasalAction.cs b/DeedyDesigner/Deedy.Activity/BasalAction.cs index 1eada7f..38399e1 100644 --- a/DeedyDesigner/Deedy.Activity/BasalAction.cs +++ b/DeedyDesigner/Deedy.Activity/BasalAction.cs @@ -16,10 +16,10 @@ namespace Deedy.Activity public string DERemark { get; set; } = ""; public string DEIdentify { get; set; } = ""; public int DepthLevel { get; protected internal set; } = 0; - public IElementActivity? ParentElement { get; protected internal set; } + public IElement? ParentElement { get; protected internal set; } public IActionViewer? ActionViewer { get; protected internal set; } - public IElementActivity RootElement => (this.ParentElement == null) ? this : this.ParentElement.RootElement; + public IElement RootElement => (this.ParentElement == null) ? this : this.ParentElement.RootElement; public event PropertyChangedEventHandler? PropertyChanged; @@ -55,22 +55,22 @@ namespace Deedy.Activity return true; } - public void InsertToFore(IElementActivity deedyElement) + public void InsertToFore(IElement element) { throw new NotImplementedException(); } - public void InsertAtRear(IElementActivity deedyElement) + public void InsertAtRear(IElement element) { throw new NotImplementedException(); } - public void SwapIndex(IElementActivity deedyElement) + public void SwapIndex(IElement element) { throw new NotImplementedException(); } - public void ReadyToWorking(IElementActivity? element = null, Output? output = null) + public void ReadyToWorking(IElement? element = null, Output? output = null) { throw new NotImplementedException(); } diff --git a/DeedyDesigner/Deedy.Activity/Collection/DeedyElementCollection.cs b/DeedyDesigner/Deedy.Activity/Collection/DeedyElementCollection.cs index b1a3fe8..c907416 100644 --- a/DeedyDesigner/Deedy.Activity/Collection/DeedyElementCollection.cs +++ b/DeedyDesigner/Deedy.Activity/Collection/DeedyElementCollection.cs @@ -8,7 +8,7 @@ using System.Threading.Tasks; namespace Deedy.Activity { - public class DeedyElementCollection : ObservableCollection + public class DeedyElementCollection : ObservableCollection { public DeedyElementCollection() : this(false) { } public DeedyElementCollection(bool needDistinct = false) @@ -16,15 +16,15 @@ namespace Deedy.Activity this._needDistinct = needDistinct; } private bool _needDistinct = false; - public void AddRange(params IElementActivity[] elements) + public void AddRange(params IElement[] elements) { foreach (var element in elements) this.Add(element); } - public void AddRange([AllowNull] IEnumerable elements) + public void AddRange([AllowNull] IEnumerable elements) { if (elements != null) foreach (var element in elements) this.Add(element); } - public new void Add([AllowNull] IElementActivity element) + public new void Add([AllowNull] IElement element) { if (element == null) return; if (this._needDistinct) diff --git a/DeedyDesigner/Deedy.Activity/Contract/Interface/ICombinedElement.cs b/DeedyDesigner/Deedy.Activity/Contract/Interface/ICombinedElement.cs index 8e4e344..89e1d74 100644 --- a/DeedyDesigner/Deedy.Activity/Contract/Interface/ICombinedElement.cs +++ b/DeedyDesigner/Deedy.Activity/Contract/Interface/ICombinedElement.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; namespace Deedy.Activity { - public interface ICombinedElement : IElementActivity + public interface ICombinedElement : IElement { public DeedyElementCollection Elements { get; set; } } diff --git a/DeedyDesigner/Deedy.Activity/Contract/Interface/IContainerElement.cs b/DeedyDesigner/Deedy.Activity/Contract/Interface/IContainerElement.cs index 42d5b1e..f99439f 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(IElementActivity deedyElement); - public void Remove(IElementActivity deedyElement); + public void Append(IElement deedyElement); + public void Remove(IElement deedyElement); } } diff --git a/DeedyDesigner/Deedy.Activity/DeedyAction/FlowAction/ContainerBlock.cs b/DeedyDesigner/Deedy.Activity/DeedyAction/FlowAction/ContainerBlock.cs index b7f7259..2894c95 100644 --- a/DeedyDesigner/Deedy.Activity/DeedyAction/FlowAction/ContainerBlock.cs +++ b/DeedyDesigner/Deedy.Activity/DeedyAction/FlowAction/ContainerBlock.cs @@ -12,12 +12,12 @@ namespace Deedy.Activity public DeedyElementCollection Elements { get => throw new NotImplementedException(); set => throw new NotImplementedException(); } - public void Append(IElementActivity deedyElement) + public void Append(IElement deedyElement) { throw new NotImplementedException(); } - public void Remove(IElementActivity deedyElement) + public void Remove(IElement deedyElement) { throw new NotImplementedException(); } diff --git a/DeedyDesigner/Deedy.Activity/DeedyAction/FuncAction/ContainerFunction.cs b/DeedyDesigner/Deedy.Activity/DeedyAction/FuncAction/ContainerFunction.cs index 9ad0895..aae857a 100644 --- a/DeedyDesigner/Deedy.Activity/DeedyAction/FuncAction/ContainerFunction.cs +++ b/DeedyDesigner/Deedy.Activity/DeedyAction/FuncAction/ContainerFunction.cs @@ -12,12 +12,12 @@ namespace Deedy.Activity public DeedyElementCollection Elements { get => throw new NotImplementedException(); set => throw new NotImplementedException(); } - public void Append(IElementActivity deedyElement) + public void Append(IElement deedyElement) { throw new NotImplementedException(); } - public void Remove(IElementActivity deedyElement) + public void Remove(IElement deedyElement) { throw new NotImplementedException(); } diff --git a/DeedyDesigner/Deedy.Activity/DeedyVisual/DeedyLayout.cs b/DeedyDesigner/Deedy.Activity/DeedyVisual/DeedyLayout.cs index 8e60251..59672d5 100644 --- a/DeedyDesigner/Deedy.Activity/DeedyVisual/DeedyLayout.cs +++ b/DeedyDesigner/Deedy.Activity/DeedyVisual/DeedyLayout.cs @@ -15,9 +15,9 @@ namespace Deedy.Activity public string DERemark { get; set; } = ""; public string DEIdentify { get; set; } = ""; public int DepthLevel { get; protected internal set; } = 0; - public IElementActivity? ParentElement { get; protected internal set; } + public IElement? ParentElement { get; protected internal set; } - public IElementActivity RootElement => (this.ParentElement == null) ? this : this.ParentElement.RootElement; + public IElement RootElement => (this.ParentElement == null) ? this : this.ParentElement.RootElement; public DeedyElementCollection Elements { get => throw new NotImplementedException(); set => throw new NotImplementedException(); } @@ -57,37 +57,32 @@ namespace Deedy.Activity return true; } - public void Append(IElementActivity deedyElement) + public void Append(IElement element) { throw new NotImplementedException(); } - public void Remove(IElementActivity deedyElement) + public void Remove(IElement element) { throw new NotImplementedException(); } - public void InsertToFore(IElementActivity deedyElement) + public void InsertToFore(IElement element) { throw new NotImplementedException(); } - public void InsertAtRear(IElementActivity deedyElement) + public void InsertAtRear(IElement element) { throw new NotImplementedException(); } - public void SwapIndex(IElementActivity element1, IElementActivity element2) + public void SwapIndex(IElement element) { throw new NotImplementedException(); } - public void SwapIndex(IElementActivity deedyElement) - { - throw new NotImplementedException(); - } - - public void ReadyToWorking(IElementActivity? element = null, Output? output = null) + public void ReadyToWorking(IElement? element = null, Output? output = null) { throw new NotImplementedException(); } diff --git a/DeedyDesigner/Deedy.Activity/IActionElement.cs b/DeedyDesigner/Deedy.Activity/IActionElement.cs index eb2cc97..9b9019f 100644 --- a/DeedyDesigner/Deedy.Activity/IActionElement.cs +++ b/DeedyDesigner/Deedy.Activity/IActionElement.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace Deedy.Activity { - public interface IActionElement : IElementActivity + public interface IActionElement : IElement { public IActionViewer? ActionViewer { get; } } diff --git a/DeedyDesigner/Deedy.Activity/IActionViewer.cs b/DeedyDesigner/Deedy.Activity/IActionViewer.cs index 7a1c90b..30d5363 100644 --- a/DeedyDesigner/Deedy.Activity/IActionViewer.cs +++ b/DeedyDesigner/Deedy.Activity/IActionViewer.cs @@ -9,7 +9,7 @@ using System.Windows; namespace Deedy.Activity { - public interface IActionViewer : IDeedyActivity, INotifyPropertyChanged + public interface IActionViewer : IActivity, INotifyPropertyChanged { [AllowNull] public IActionElement DeedyAction { get; set; } diff --git a/DeedyDesigner/Deedy.Activity/IDeedyActivity.cs b/DeedyDesigner/Deedy.Activity/IActivity.cs similarity index 55% rename from DeedyDesigner/Deedy.Activity/IDeedyActivity.cs rename to DeedyDesigner/Deedy.Activity/IActivity.cs index f76203f..b320821 100644 --- a/DeedyDesigner/Deedy.Activity/IDeedyActivity.cs +++ b/DeedyDesigner/Deedy.Activity/IActivity.cs @@ -6,8 +6,8 @@ using System.Threading.Tasks; namespace Deedy.Activity { - public interface IDeedyActivity + public interface IActivity { - public void ReadyToWorking(IElementActivity? element = null, Output? output = null); + public void ReadyToWorking(IElement? element = null, Output? output = null); } } diff --git a/DeedyDesigner/Deedy.Activity/IElementActivity.cs b/DeedyDesigner/Deedy.Activity/IElement.cs similarity index 77% rename from DeedyDesigner/Deedy.Activity/IElementActivity.cs rename to DeedyDesigner/Deedy.Activity/IElement.cs index 0c4ee02..608c30c 100644 --- a/DeedyDesigner/Deedy.Activity/IElementActivity.cs +++ b/DeedyDesigner/Deedy.Activity/IElement.cs @@ -10,23 +10,23 @@ using System.Windows.Markup; namespace Deedy.Activity { - public interface IElementActivity : IDeedyActivity, INotifyPropertyChanged + public interface IElement : IActivity, INotifyPropertyChanged { public string DEClass { get; } public string DETitle { get; set; } public string DERemark { get; set; } public string DEIdentify { get; set; } public int DepthLevel { get; } - public IElementActivity? ParentElement { get; } - public IElementActivity RootElement { get; } - public void InsertToFore(IElementActivity deedyElement); - public void InsertAtRear(IElementActivity deedyElement); - public void SwapIndex(IElementActivity deedyElement); + public IElement? ParentElement { get; } + public IElement RootElement { get; } + public void InsertToFore(IElement element); + public void InsertAtRear(IElement element); + public void SwapIndex(IElement element); /// /// 将当前节点链接到一个节点上 /// /// 要链接到的节点 - public virtual void LinkTo([AllowNull] IElementActivity element) + public virtual void LinkTo([AllowNull] IElement element) { if (element == null) { @@ -58,26 +58,26 @@ namespace Deedy.Activity public virtual void Unlink() { (this.ParentElement as IContainerElement)?.Remove(this); - this.SetNamedPropertyValue(nameof(ParentElement), null); + this.SetNamedPropertyValue(nameof(ParentElement), null); this.SetNamedPropertyValue(nameof(DepthLevel), 0); } /// /// 构建结构树，设置层级：并且完成参数映射的刷新 /// /// - public new void ReadyToWorking(IElementActivity? element = null, Output? output = null) + public new void ReadyToWorking(IElement? element = null, Output? output = null) { //TODO：刷新参数映射 this.LinkTo(element); if (this is IContainerElement container) - foreach (IElementActivity subElement in container.Elements) + foreach (IElement subElement in container.Elements) subElement.ReadyToWorking(this); } - public virtual IElementActivity? Clone() + public virtual IElement? Clone() { try { - return XamlReader.Parse(XamlWriter.Save(this)) as IElementActivity; + return XamlReader.Parse(XamlWriter.Save(this)) as IElement; } catch { return null; } } @@ -92,13 +92,13 @@ namespace Deedy.Activity catch { document = string.Empty; } return result; } - public static virtual bool TryDecode(string document, out IElementActivity? element) + public static virtual bool TryDecode(string document, out IElement? element) { - IElementActivity? instance = null; + IElement? instance = null; bool result = false; try { - instance = XamlReader.Parse(document) as IElementActivity; + instance = XamlReader.Parse(document) as IElement; result = instance != null; } catch { } diff --git a/DeedyDesigner/Deedy.Activity/IVisualElement.cs b/DeedyDesigner/Deedy.Activity/IVisualElement.cs index 3f8571a..da79d96 100644 --- a/DeedyDesigner/Deedy.Activity/IVisualElement.cs +++ b/DeedyDesigner/Deedy.Activity/IVisualElement.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace Deedy.Activity { - public interface IVisualElement : IElementActivity + public interface IVisualElement : IElement { } }