From 77305eb8a26d9c42243a7b3b8b6a94da03839904 Mon Sep 17 00:00:00 2001
From: zengwenjie <1663900244@qq.com>
Date: Mon, 15 Sep 2025 15:58:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{DeedyViewer.cs => ActionViewer.cs}            | 14 +++++++-------
 .../Collection/DeedyElementCollection.cs           |  2 +-
 .../Deedy.Design/Contract/IContainerElement.cs     |  2 +-
 .../Deedy.Design/Contract/IVariableContainer.cs    |  2 +-
 .../{Deedy.Design.csproj => Deedy.Activity.csproj} |  3 +--
 DeedyDesigner/Deedy.Design/DeedyAction.cs          |  4 ++--
 DeedyDesigner/Deedy.Design/DeedyHelper.cs          |  2 +-
 .../Deedy.Design/DeedyVisual/DeedyLayout.cs        |  2 +-
 .../Deedy.Design/DeedyVisual/IDeedyLayout.cs       |  2 +-
 .../{IDeedyViewer.cs => IActionViewer.cs}          |  4 ++--
 DeedyDesigner/Deedy.Design/IDeedyAction.cs         |  4 ++--
 DeedyDesigner/Deedy.Design/IDeedyElement.cs        |  2 +-
 DeedyDesigner/Deedy.Design/IDeedyVisual.cs         |  2 +-
 DeedyDesigner/Deedy.Design/Themes/Generic.xaml     |  6 +++---
 DeedyDesigner/DeedyDesigner.sln                    |  4 ++--
 15 files changed, 27 insertions(+), 28 deletions(-)
 rename DeedyDesigner/Deedy.Design/{DeedyViewer.cs => ActionViewer.cs} (90%)
 rename DeedyDesigner/Deedy.Design/{Deedy.Design.csproj => Deedy.Activity.csproj} (72%)
 rename DeedyDesigner/Deedy.Design/{IDeedyViewer.cs => IActionViewer.cs} (76%)

diff --git a/DeedyDesigner/Deedy.Design/DeedyViewer.cs b/DeedyDesigner/Deedy.Design/ActionViewer.cs
similarity index 90%
rename from DeedyDesigner/Deedy.Design/DeedyViewer.cs
rename to DeedyDesigner/Deedy.Design/ActionViewer.cs
index 948fbcf..d296079 100644
--- a/DeedyDesigner/Deedy.Design/DeedyViewer.cs
+++ b/DeedyDesigner/Deedy.Design/ActionViewer.cs
@@ -16,7 +16,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace Deedy.Design
+namespace Deedy.Activity
 {
     /// <summary>
     /// 按照步骤 1a 或 1b 操作，然后执行步骤 2 以在 XAML 文件中使用此自定义控件。
@@ -44,14 +44,14 @@ namespace Deedy.Design
     /// 步骤 2)
     /// 继续操作并在 XAML 文件中使用控件。
     ///
-    ///     <MyNamespace:DeedyViewer/>
+    ///     <MyNamespace:ActionViewer/>
     ///
     /// </summary>
-    public class DeedyViewer : Control, IDeedyViewer
+    public class ActionViewer : Control, IActionViewer
     {
-        static DeedyViewer()
+        static ActionViewer()
         {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(DeedyViewer), new FrameworkPropertyMetadata(typeof(DeedyViewer)));
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(ActionViewer), new FrameworkPropertyMetadata(typeof(ActionViewer)));
         }
 
         public event PropertyChangedEventHandler? PropertyChanged;
@@ -98,8 +98,8 @@ namespace Deedy.Design
             set { SetValue(DeedyActionProperty, value); }
         }
         public static readonly DependencyProperty DeedyActionProperty =
-            DependencyProperty.Register("DeedyAction", typeof(IDeedyAction), typeof(DeedyViewer), new PropertyMetadata(null,
-                (d, e) => (d as DeedyViewer)?.DeedyAction_PropertyChangedCallback(d, e)));
+            DependencyProperty.Register("DeedyAction", typeof(IDeedyAction), typeof(ActionViewer), new PropertyMetadata(null,
+                (d, e) => (d as ActionViewer)?.DeedyAction_PropertyChangedCallback(d, e)));
         /// <summary>
         /// 处理「DeedyActionViewer.DeedyAction」属性变更
         /// </summary>
diff --git a/DeedyDesigner/Deedy.Design/Collection/DeedyElementCollection.cs b/DeedyDesigner/Deedy.Design/Collection/DeedyElementCollection.cs
index ea1eb80..86c462a 100644
--- a/DeedyDesigner/Deedy.Design/Collection/DeedyElementCollection.cs
+++ b/DeedyDesigner/Deedy.Design/Collection/DeedyElementCollection.cs
@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Deedy.Design
+namespace Deedy.Activity
 {
     public class DeedyElementCollection : ObservableCollection<IDeedyElement>
     {
diff --git a/DeedyDesigner/Deedy.Design/Contract/IContainerElement.cs b/DeedyDesigner/Deedy.Design/Contract/IContainerElement.cs
index ba1d4e9..6ba813b 100644
--- a/DeedyDesigner/Deedy.Design/Contract/IContainerElement.cs
+++ b/DeedyDesigner/Deedy.Design/Contract/IContainerElement.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Deedy.Design
+namespace Deedy.Activity
 {
     public interface IContainerElement : IDeedyElement
     {
diff --git a/DeedyDesigner/Deedy.Design/Contract/IVariableContainer.cs b/DeedyDesigner/Deedy.Design/Contract/IVariableContainer.cs
index c94f0a2..cd7af67 100644
--- a/DeedyDesigner/Deedy.Design/Contract/IVariableContainer.cs
+++ b/DeedyDesigner/Deedy.Design/Contract/IVariableContainer.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Deedy.Design
+namespace Deedy.Activity
 {
     public interface IVariableContainer : IContainerElement
     {
diff --git a/DeedyDesigner/Deedy.Design/Deedy.Design.csproj b/DeedyDesigner/Deedy.Design/Deedy.Activity.csproj
similarity index 72%
rename from DeedyDesigner/Deedy.Design/Deedy.Design.csproj
rename to DeedyDesigner/Deedy.Design/Deedy.Activity.csproj
index 13fd88a..97b83cf 100644
--- a/DeedyDesigner/Deedy.Design/Deedy.Design.csproj
+++ b/DeedyDesigner/Deedy.Design/Deedy.Activity.csproj
@@ -8,8 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Remove="DeedyAction.cs~RF1708d6d.TMP" />
-    <None Remove="DeedyVisual.cs~RF13b8243.TMP" />
+    <Folder Include="Attribute\" />
   </ItemGroup>
 
 </Project>
diff --git a/DeedyDesigner/Deedy.Design/DeedyAction.cs b/DeedyDesigner/Deedy.Design/DeedyAction.cs
index 6ba912e..cf3baca 100644
--- a/DeedyDesigner/Deedy.Design/DeedyAction.cs
+++ b/DeedyDesigner/Deedy.Design/DeedyAction.cs
@@ -6,7 +6,7 @@ using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Deedy.Design
+namespace Deedy.Activity
 {
     public abstract class DeedyAction : IDeedyAction
     {
@@ -15,7 +15,7 @@ namespace Deedy.Design
         public string DERemark { get; set; } = "";
         public string DEIdentify { get; set; } = "";
         public IDeedyElement? DeedyParent { get; protected internal set; }
-        public IDeedyViewer? DeedyViewer { get; protected internal set; }
+        public IActionViewer? DeedyViewer { get; protected internal set; }
         public DeedyElementCollection Children { get; set; } = new();
 
         public IDeedyElement DeedyRoot => (this.DeedyParent == null) ? this : this.DeedyParent.DeedyRoot;
diff --git a/DeedyDesigner/Deedy.Design/DeedyHelper.cs b/DeedyDesigner/Deedy.Design/DeedyHelper.cs
index e6d952c..0628840 100644
--- a/DeedyDesigner/Deedy.Design/DeedyHelper.cs
+++ b/DeedyDesigner/Deedy.Design/DeedyHelper.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Deedy.Design
+namespace Deedy.Activity
 {
     public static class DeedyHelper
     {
diff --git a/DeedyDesigner/Deedy.Design/DeedyVisual/DeedyLayout.cs b/DeedyDesigner/Deedy.Design/DeedyVisual/DeedyLayout.cs
index 979626a..4267ec0 100644
--- a/DeedyDesigner/Deedy.Design/DeedyVisual/DeedyLayout.cs
+++ b/DeedyDesigner/Deedy.Design/DeedyVisual/DeedyLayout.cs
@@ -6,7 +6,7 @@ using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Deedy.Design
+namespace Deedy.Activity
 {
     public class DeedyLayout : IDeedyLayout
     {
diff --git a/DeedyDesigner/Deedy.Design/DeedyVisual/IDeedyLayout.cs b/DeedyDesigner/Deedy.Design/DeedyVisual/IDeedyLayout.cs
index 00851d2..c0c65c4 100644
--- a/DeedyDesigner/Deedy.Design/DeedyVisual/IDeedyLayout.cs
+++ b/DeedyDesigner/Deedy.Design/DeedyVisual/IDeedyLayout.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Deedy.Design
+namespace Deedy.Activity
 {
     public interface IDeedyLayout : IVariableContainer
     {
diff --git a/DeedyDesigner/Deedy.Design/IDeedyViewer.cs b/DeedyDesigner/Deedy.Design/IActionViewer.cs
similarity index 76%
rename from DeedyDesigner/Deedy.Design/IDeedyViewer.cs
rename to DeedyDesigner/Deedy.Design/IActionViewer.cs
index 7b7ca11..ab13ade 100644
--- a/DeedyDesigner/Deedy.Design/IDeedyViewer.cs
+++ b/DeedyDesigner/Deedy.Design/IActionViewer.cs
@@ -6,9 +6,9 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Deedy.Design
+namespace Deedy.Activity
 {
-    public interface IDeedyViewer : INotifyPropertyChanged
+    public interface IActionViewer : INotifyPropertyChanged
     {
         [AllowNull]
         public IDeedyAction DeedyAction { get; set; }
diff --git a/DeedyDesigner/Deedy.Design/IDeedyAction.cs b/DeedyDesigner/Deedy.Design/IDeedyAction.cs
index 66ba99f..8eef5c4 100644
--- a/DeedyDesigner/Deedy.Design/IDeedyAction.cs
+++ b/DeedyDesigner/Deedy.Design/IDeedyAction.cs
@@ -4,10 +4,10 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Deedy.Design
+namespace Deedy.Activity
 {
     public interface IDeedyAction : IDeedyElement
     {
-        public IDeedyViewer? DeedyViewer { get; }
+        public IActionViewer? DeedyViewer { get; }
     }
 }
diff --git a/DeedyDesigner/Deedy.Design/IDeedyElement.cs b/DeedyDesigner/Deedy.Design/IDeedyElement.cs
index 2d684a0..7226420 100644
--- a/DeedyDesigner/Deedy.Design/IDeedyElement.cs
+++ b/DeedyDesigner/Deedy.Design/IDeedyElement.cs
@@ -6,7 +6,7 @@ using System.Runtime.CompilerServices;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Deedy.Design
+namespace Deedy.Activity
 {
     public interface IDeedyElement : INotifyPropertyChanged
     {
diff --git a/DeedyDesigner/Deedy.Design/IDeedyVisual.cs b/DeedyDesigner/Deedy.Design/IDeedyVisual.cs
index 288a2cf..70ba1d2 100644
--- a/DeedyDesigner/Deedy.Design/IDeedyVisual.cs
+++ b/DeedyDesigner/Deedy.Design/IDeedyVisual.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Deedy.Design
+namespace Deedy.Activity
 {
     public interface IDeedyVisual : IDeedyElement
     {
diff --git a/DeedyDesigner/Deedy.Design/Themes/Generic.xaml b/DeedyDesigner/Deedy.Design/Themes/Generic.xaml
index 268bfe2..db27fec 100644
--- a/DeedyDesigner/Deedy.Design/Themes/Generic.xaml
+++ b/DeedyDesigner/Deedy.Design/Themes/Generic.xaml
@@ -1,13 +1,13 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="clr-namespace:Deedy.Design">
+    xmlns:local="clr-namespace:Deedy.Activity">
 
 
-    <Style TargetType="{x:Type local:DeedyViewer}">
+    <Style TargetType="{x:Type local:ActionViewer}">
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:DeedyViewer}">
+                <ControlTemplate TargetType="{x:Type local:ActionViewer}">
                     <Border Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}">
diff --git a/DeedyDesigner/DeedyDesigner.sln b/DeedyDesigner/DeedyDesigner.sln
index 56da7c8..84be204 100644
--- a/DeedyDesigner/DeedyDesigner.sln
+++ b/DeedyDesigner/DeedyDesigner.sln
@@ -1,9 +1,9 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
-VisualStudioVersion = 17.12.35527.113 d17.12
+VisualStudioVersion = 17.12.35527.113
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deedy.Design", "Deedy.Design\Deedy.Design.csproj", "{31386106-38FB-4CF6-A379-936CC292AFAE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Deedy.Activity", "Deedy.Design\Deedy.Activity.csproj", "{31386106-38FB-4CF6-A379-936CC292AFAE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution