From 072a0653e7b2741a6151447bfe70f495963474d5 Mon Sep 17 00:00:00 2001
From: zengwenjie <1663900244@qq.com>
Date: Mon, 15 Sep 2025 18:11:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=E9=9B=86=E5=90=88?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Contract/Interface/ICombinedElement.cs        | 14 ++++++++++++++
 .../Contract/Interface/IContainerElement.cs       |  7 ++++---
 .../Contract/Interface/IVariableContainer.cs      | 15 ---------------
 .../{CombineDiagram.cs => CombinedDiagram.cs}     |  4 ++--
 .../{CombineFunction.cs => CombinedFunction.cs}   |  4 ++--
 .../Deedy.Activity/DeedyVisual/IDeedyLayout.cs    |  2 +-
 6 files changed, 23 insertions(+), 23 deletions(-)
 create mode 100644 DeedyDesigner/Deedy.Activity/Contract/Interface/ICombinedElement.cs
 delete mode 100644 DeedyDesigner/Deedy.Activity/Contract/Interface/IVariableContainer.cs
 rename DeedyDesigner/Deedy.Activity/DeedyAction/FlowAction/{CombineDiagram.cs => CombinedDiagram.cs} (63%)
 rename DeedyDesigner/Deedy.Activity/DeedyAction/FuncAction/{CombineFunction.cs => CombinedFunction.cs} (63%)

diff --git a/DeedyDesigner/Deedy.Activity/Contract/Interface/ICombinedElement.cs b/DeedyDesigner/Deedy.Activity/Contract/Interface/ICombinedElement.cs
new file mode 100644
index 0000000..7de00fc
--- /dev/null
+++ b/DeedyDesigner/Deedy.Activity/Contract/Interface/ICombinedElement.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Deedy.Activity
+{
+    public interface ICombinedElement : IDeedyElement
+    {
+        public DeedyElementCollection Elements { get; set; }
+    }
+}
diff --git a/DeedyDesigner/Deedy.Activity/Contract/Interface/IContainerElement.cs b/DeedyDesigner/Deedy.Activity/Contract/Interface/IContainerElement.cs
index 6ba813b..b53c7e9 100644
--- a/DeedyDesigner/Deedy.Activity/Contract/Interface/IContainerElement.cs
+++ b/DeedyDesigner/Deedy.Activity/Contract/Interface/IContainerElement.cs
@@ -1,14 +1,15 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace Deedy.Activity
 {
-    public interface IContainerElement : IDeedyElement
+    public interface IContainerElement : ICombinedElement
     {
-        public DeedyElementCollection Elements { get; set; }
+        public void Append(IDeedyElement deedyElement);
+        public void Remove(IDeedyElement deedyElement);
+        public void SwapIndex(IDeedyElement element1, IDeedyElement element2);
     }
 }
diff --git a/DeedyDesigner/Deedy.Activity/Contract/Interface/IVariableContainer.cs b/DeedyDesigner/Deedy.Activity/Contract/Interface/IVariableContainer.cs
deleted file mode 100644
index cd7af67..0000000
--- a/DeedyDesigner/Deedy.Activity/Contract/Interface/IVariableContainer.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Deedy.Activity
-{
-    public interface IVariableContainer : IContainerElement
-    {
-        public void Append(IDeedyElement deedyElement);
-        public void Remove(IDeedyElement deedyElement);
-        public void SwapIndex(IDeedyElement element1, IDeedyElement element2);
-    }
-}
diff --git a/DeedyDesigner/Deedy.Activity/DeedyAction/FlowAction/CombineDiagram.cs b/DeedyDesigner/Deedy.Activity/DeedyAction/FlowAction/CombinedDiagram.cs
similarity index 63%
rename from DeedyDesigner/Deedy.Activity/DeedyAction/FlowAction/CombineDiagram.cs
rename to DeedyDesigner/Deedy.Activity/DeedyAction/FlowAction/CombinedDiagram.cs
index 49f78c2..1811b87 100644
--- a/DeedyDesigner/Deedy.Activity/DeedyAction/FlowAction/CombineDiagram.cs
+++ b/DeedyDesigner/Deedy.Activity/DeedyAction/FlowAction/CombinedDiagram.cs
@@ -6,8 +6,8 @@ using System.Threading.Tasks;
 
 namespace Deedy.Activity
 {
-    public abstract class CombineDiagram : FlowAction
+    public abstract class CombinedDiagram : FlowAction
     {
-        public CombineDiagram() { }
+        public CombinedDiagram() { }
     }
 }
diff --git a/DeedyDesigner/Deedy.Activity/DeedyAction/FuncAction/CombineFunction.cs b/DeedyDesigner/Deedy.Activity/DeedyAction/FuncAction/CombinedFunction.cs
similarity index 63%
rename from DeedyDesigner/Deedy.Activity/DeedyAction/FuncAction/CombineFunction.cs
rename to DeedyDesigner/Deedy.Activity/DeedyAction/FuncAction/CombinedFunction.cs
index ecae849..7b194d5 100644
--- a/DeedyDesigner/Deedy.Activity/DeedyAction/FuncAction/CombineFunction.cs
+++ b/DeedyDesigner/Deedy.Activity/DeedyAction/FuncAction/CombinedFunction.cs
@@ -6,8 +6,8 @@ using System.Threading.Tasks;
 
 namespace Deedy.Activity
 {
-    public abstract class CombineFunction : FuncAction
+    public abstract class CombinedFunction : FuncAction
     {
-        public CombineFunction() { }
+        public CombinedFunction() { }
     }
 }
diff --git a/DeedyDesigner/Deedy.Activity/DeedyVisual/IDeedyLayout.cs b/DeedyDesigner/Deedy.Activity/DeedyVisual/IDeedyLayout.cs
index c0c65c4..8ddae95 100644
--- a/DeedyDesigner/Deedy.Activity/DeedyVisual/IDeedyLayout.cs
+++ b/DeedyDesigner/Deedy.Activity/DeedyVisual/IDeedyLayout.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace Deedy.Activity
 {
-    public interface IDeedyLayout : IVariableContainer
+    public interface IDeedyLayout : IContainerElement
     {
     }
 }