diff --git a/Bin/net40/SunnyUI.Demo.exe b/Bin/net40/SunnyUI.Demo.exe
index 563d3f08..5e88dd20 100644
Binary files a/Bin/net40/SunnyUI.Demo.exe and b/Bin/net40/SunnyUI.Demo.exe differ
diff --git a/Bin/net40/SunnyUI.dll b/Bin/net40/SunnyUI.dll
index 586d6184..0a2da46b 100644
Binary files a/Bin/net40/SunnyUI.dll and b/Bin/net40/SunnyUI.dll differ
diff --git a/Bin/net5.0-windows/SunnyUI.dll b/Bin/net5.0-windows/SunnyUI.dll
index 09edecb1..7e0464b8 100644
Binary files a/Bin/net5.0-windows/SunnyUI.dll and b/Bin/net5.0-windows/SunnyUI.dll differ
diff --git a/Bin/netcoreapp3.1/SunnyUI.dll b/Bin/netcoreapp3.1/SunnyUI.dll
index bea70561..c2dcdd3b 100644
Binary files a/Bin/netcoreapp3.1/SunnyUI.dll and b/Bin/netcoreapp3.1/SunnyUI.dll differ
diff --git a/SunnyUI/Forms/UIEditForm.cs b/SunnyUI/Forms/UIEditForm.cs
index b03f3072..8c29a168 100644
--- a/SunnyUI/Forms/UIEditForm.cs
+++ b/SunnyUI/Forms/UIEditForm.cs
@@ -90,6 +90,7 @@ namespace Sunny.UI
                     edit.Parent = this;
                     edit.Name = "Edit_" + info.DataPropertyName;
                     edit.EnterAsTab = true;
+                    edit.Enabled = info.Enabled;
                     ctrls.Add(edit);
                 }
 
@@ -104,6 +105,7 @@ namespace Sunny.UI
                     edit.PasswordChar = '*';
                     edit.Name = "Edit_" + info.DataPropertyName;
                     edit.EnterAsTab = true;
+                    edit.Enabled = info.Enabled;
                     ctrls.Add(edit);
                 }
 
@@ -117,6 +119,7 @@ namespace Sunny.UI
                     edit.IntValue = info.Value.ToString().ToInt();
                     edit.Parent = this;
                     edit.Name = "Edit_" + info.DataPropertyName;
+                    edit.Enabled = info.Enabled;
                     ctrls.Add(edit);
                 }
 
@@ -131,6 +134,7 @@ namespace Sunny.UI
                     edit.Parent = this;
                     edit.Name = "Edit_" + info.DataPropertyName;
                     edit.EnterAsTab = true;
+                    edit.Enabled = info.Enabled;
                     ctrls.Add(edit);
                 }
 
@@ -143,6 +147,7 @@ namespace Sunny.UI
                     edit.Value = (DateTime)info.Value;
                     edit.Parent = this;
                     edit.Name = "Edit_" + info.DataPropertyName;
+                    edit.Enabled = info.Enabled;
                     ctrls.Add(edit);
                 }
 
@@ -155,6 +160,7 @@ namespace Sunny.UI
                     edit.Value = (DateTime)info.Value;
                     edit.Parent = this;
                     edit.Name = "Edit_" + info.DataPropertyName;
+                    edit.Enabled = info.Enabled;
                     ctrls.Add(edit);
                 }