diff --git a/Bin/net40/SunnyUI.dll b/Bin/net40/SunnyUI.dll index 235ed925..b4678996 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 5d0971c9..58a8e746 100644 Binary files a/Bin/net5.0-windows/SunnyUI.dll and b/Bin/net5.0-windows/SunnyUI.dll differ diff --git a/Bin/net5.0-windows/ref/SunnyUI.dll b/Bin/net5.0-windows/ref/SunnyUI.dll index 7f41ff11..24571a04 100644 Binary files a/Bin/net5.0-windows/ref/SunnyUI.dll and b/Bin/net5.0-windows/ref/SunnyUI.dll differ diff --git a/Bin/netcoreapp3.1/SunnyUI.dll b/Bin/netcoreapp3.1/SunnyUI.dll index fac207d5..4d553b90 100644 Binary files a/Bin/netcoreapp3.1/SunnyUI.dll and b/Bin/netcoreapp3.1/SunnyUI.dll differ diff --git a/SunnyUI/Controls/UIDoubleUpDown.cs b/SunnyUI/Controls/UIDoubleUpDown.cs index c4608edc..12327271 100644 --- a/SunnyUI/Controls/UIDoubleUpDown.cs +++ b/SunnyUI/Controls/UIDoubleUpDown.cs @@ -194,10 +194,26 @@ namespace Sunny.UI return value; } + [DefaultValue(false)] + [Description("是否判断最大值显示"), Category("SunnyUI")] + public bool MaximumEnabled + { + get => HasMaximum; + set => HasMaximum = value; + } + + [DefaultValue(false)] + [Description("是否判断最小值显示"), Category("SunnyUI")] + public bool MinimumEnabled + { + get => HasMinimum; + set => HasMinimum = value; + } + private bool hasMaximum; private bool hasMinimum; - [DefaultValue(false)] + [DefaultValue(false), Browsable(false)] [Description("检查最大值"), Category("SunnyUI")] public bool HasMaximum { @@ -214,7 +230,7 @@ namespace Sunny.UI } } - [DefaultValue(false)] + [DefaultValue(false), Browsable(false)] [Description("检查最小值"), Category("SunnyUI")] public bool HasMinimum { diff --git a/SunnyUI/Controls/UIIntegerUpDown.cs b/SunnyUI/Controls/UIIntegerUpDown.cs index fcd1f8b6..fdcc9337 100644 --- a/SunnyUI/Controls/UIIntegerUpDown.cs +++ b/SunnyUI/Controls/UIIntegerUpDown.cs @@ -188,10 +188,26 @@ namespace Sunny.UI return value; } + [DefaultValue(false)] + [Description("是否判断最大值显示"), Category("SunnyUI")] + public bool MaximumEnabled + { + get => HasMaximum; + set => HasMaximum = value; + } + + [DefaultValue(false)] + [Description("是否判断最小值显示"), Category("SunnyUI")] + public bool MinimumEnabled + { + get => HasMinimum; + set => HasMinimum = value; + } + private bool hasMaximum; private bool hasMinimum; - [DefaultValue(false)] + [DefaultValue(false), Browsable(false)] [Description("检查最大值"), Category("SunnyUI")] public bool HasMaximum { @@ -208,7 +224,7 @@ namespace Sunny.UI } } - [DefaultValue(false)] + [DefaultValue(false), Browsable(false)] [Description("检查最小值"), Category("SunnyUI")] public bool HasMinimum { diff --git a/SunnyUI/Controls/UITextBox.cs b/SunnyUI/Controls/UITextBox.cs index 1e531504..09666738 100644 --- a/SunnyUI/Controls/UITextBox.cs +++ b/SunnyUI/Controls/UITextBox.cs @@ -475,13 +475,29 @@ namespace Sunny.UI [DefaultValue(false)] [Description("是否判断最大值显示"), Category("SunnyUI")] + public bool MaximumEnabled + { + get => HasMaximum; + set => HasMaximum = value; + } + + [DefaultValue(false)] + [Description("是否判断最小值显示"), Category("SunnyUI")] + public bool MinimumEnabled + { + get => HasMinimum; + set => HasMinimum = value; + } + + [DefaultValue(false), Browsable(false)] + [Description("是否判断最大值显示"), Category("SunnyUI")] public bool HasMaximum { get => edit.HasMaxValue; set => edit.HasMaxValue = value; } - [DefaultValue(false)] + [DefaultValue(false), Browsable(false)] [Description("是否判断最小值显示"), Category("SunnyUI")] public bool HasMinimum {