refactor: DateTimePicker and TimePicker formatting.

NaBian · NaBian · commit dd6c83a535b1 · 2025-11-12T21:36:38.000+08:00
Improved code formatting and consistency in DateTimePicker.cs and TimePicker.cs by splitting long lines and enhancing readability. Also fixed null handling and text synchronization for selected values in TimePicker.
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/DateTimePicker.cs b/src/Shared/HandyControl_Shared/Controls/Input/DateTimePicker.cs
@@ -75,8 +75,10 @@ public event EventHandler<FunctionEventArgs<DateTime?>> SelectedDateTimeChanged
     static DateTimePicker()
     {
         EventManager.RegisterClassHandler(typeof(DateTimePicker), GotFocusEvent, new RoutedEventHandler(OnGotFocus));
-        KeyboardNavigation.TabNavigationProperty.OverrideMetadata(typeof(DateTimePicker), new FrameworkPropertyMetadata(KeyboardNavigationMode.Once));
-        KeyboardNavigation.IsTabStopProperty.OverrideMetadata(typeof(DateTimePicker), new FrameworkPropertyMetadata(ValueBoxes.FalseBox));
+        KeyboardNavigation.TabNavigationProperty.OverrideMetadata(typeof(DateTimePicker),
+            new FrameworkPropertyMetadata(KeyboardNavigationMode.Once));
+        KeyboardNavigation.IsTabStopProperty.OverrideMetadata(typeof(DateTimePicker),
+            new FrameworkPropertyMetadata(ValueBoxes.FalseBox));
     }
 
     public DateTimePicker()
@@ -111,7 +113,9 @@ public Style CalendarStyle
     }
 
     public static readonly DependencyProperty DisplayDateTimeProperty = DependencyProperty.Register(
-        nameof(DisplayDateTime), typeof(DateTime), typeof(DateTimePicker), new FrameworkPropertyMetadata(DateTime.Now, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, null, CoerceDisplayDateTime));
+        nameof(DisplayDateTime), typeof(DateTime), typeof(DateTimePicker),
+        new FrameworkPropertyMetadata(DateTime.Now, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, null,
+            CoerceDisplayDateTime));
 
     private static object CoerceDisplayDateTime(DependencyObject d, object value)
     {
@@ -128,7 +132,9 @@ public DateTime DisplayDateTime
     }
 
     public static readonly DependencyProperty IsDropDownOpenProperty = DependencyProperty.Register(
-        nameof(IsDropDownOpen), typeof(bool), typeof(DateTimePicker), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnIsDropDownOpenChanged, OnCoerceIsDropDownOpen));
+        nameof(IsDropDownOpen), typeof(bool), typeof(DateTimePicker),
+        new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault,
+            OnIsDropDownOpenChanged, OnCoerceIsDropDownOpen));
 
     private static object OnCoerceIsDropDownOpen(DependencyObject d, object baseValue) =>
         d is DateTimePicker
@@ -165,7 +171,9 @@ public bool IsDropDownOpen
     }
 
     public static readonly DependencyProperty SelectedDateTimeProperty = DependencyProperty.Register(
-        nameof(SelectedDateTime), typeof(DateTime?), typeof(DateTimePicker), new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnSelectedDateTimeChanged, CoerceSelectedDateTime));
+        nameof(SelectedDateTime), typeof(DateTime?), typeof(DateTimePicker),
+        new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault,
+            OnSelectedDateTimeChanged, CoerceSelectedDateTime));
 
     private static object CoerceSelectedDateTime(DependencyObject d, object value)
     {
@@ -185,7 +193,6 @@ private static void OnSelectedDateTimeChanged(DependencyObject d, DependencyProp
         }
         else
         {
-            // 修复：当 SelectedDateTime 为 null 时，清空文本框
             dp.SetTextInternal(string.Empty);
         }
 
@@ -202,7 +209,8 @@ public DateTime? SelectedDateTime
     }
 
     public static readonly DependencyProperty TextProperty = DependencyProperty.Register(
-        nameof(Text), typeof(string), typeof(DateTimePicker), new FrameworkPropertyMetadata(string.Empty, OnTextChanged));
+        nameof(Text), typeof(string), typeof(DateTimePicker),
+        new FrameworkPropertyMetadata(string.Empty, OnTextChanged));
 
     private static void OnTextChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
@@ -333,7 +341,8 @@ public override void OnApplyTemplate()
         {
             _textBox.SetBinding(SelectionBrushProperty, new Binding(SelectionBrushProperty.Name) { Source = this });
 #if !(NET40 || NET45 || NET451 || NET452 || NET46 || NET461 || NET462 || NET47 || NET471 || NET472)
-            _textBox.SetBinding(SelectionTextBrushProperty, new Binding(SelectionTextBrushProperty.Name) { Source = this });
+            _textBox.SetBinding(SelectionTextBrushProperty,
+                new Binding(SelectionTextBrushProperty.Name) { Source = this });
 #endif
             _textBox.SetBinding(SelectionOpacityProperty, new Binding(SelectionOpacityProperty.Name) { Source = this });
             _textBox.SetBinding(CaretBrushProperty, new Binding(CaretBrushProperty.Name) { Source = this });
@@ -407,7 +416,8 @@ private void InitCalendarWithClock()
 
     private void CalendarWithClock_Confirmed() => TogglePopup();
 
-    private void CalendarWithClock_SelectedDateTimeChanged(object sender, FunctionEventArgs<DateTime?> e) => SelectedDateTime = e.Info;
+    private void CalendarWithClock_SelectedDateTimeChanged(object sender, FunctionEventArgs<DateTime?> e) =>
+        SelectedDateTime = e.Info;
 
     private void TextBox_LostFocus(object sender, RoutedEventArgs e)
     {
@@ -450,29 +460,29 @@ private bool ProcessDateTimePickerKey(KeyEventArgs e)
         switch (e.Key)
         {
             case Key.System:
+            {
+                switch (e.SystemKey)
                 {
-                    switch (e.SystemKey)
+                    case Key.Down:
                     {
-                        case Key.Down:
-                            {
-                                if ((Keyboard.Modifiers & ModifierKeys.Alt) == ModifierKeys.Alt)
-                                {
-                                    TogglePopup();
-                                    return true;
-                                }
-
-                                break;
-                            }
-                    }
+                        if ((Keyboard.Modifiers & ModifierKeys.Alt) == ModifierKeys.Alt)
+                        {
+                            TogglePopup();
+                            return true;
+                        }
 
-                    break;
+                        break;
+                    }
                 }
 
+                break;
+            }
+
             case Key.Enter:
-                {
-                    SetSelectedDateTime();
-                    return true;
-                }
+            {
+                SetSelectedDateTime();
+                return true;
+            }
         }
 
         return false;
@@ -593,10 +603,10 @@ private void SafeSetText(string s)
 
         if (SelectedDateTime != null)
         {
-            var newtext = DateTimeToString(SelectedDateTime.Value);
-            SafeSetText(newtext);
+            SafeSetText(DateTimeToString(SelectedDateTime.Value));
             return SelectedDateTime;
         }
+
         SafeSetText(DateTimeToString(DisplayDateTime));
         return DisplayDateTime;
     }
@@ -625,7 +635,6 @@ private void SetSelectedDateTime()
                 }
 
                 var d = SetTextBoxValue(s);
-                // 修复：使用静态的 Equals 方法进行安全的 null 比较
                 if (!Equals(SelectedDateTime, d))
                 {
                     SetCurrentValue(SelectedDateTimeProperty, d);
@@ -640,15 +649,13 @@ private void SetSelectedDateTime()
                 }
                 else
                 {
-                    // 修复：确保文本框同步清空
                     SetTextInternal(string.Empty);
                 }
             }
         }
         else
         {
             var d = SetTextBoxValue(_defaultText);
-            // 修复：使用静态的 Equals 方法进行安全的 null 比较
             if (!Equals(SelectedDateTime, d))
             {
                 SetCurrentValue(SelectedDateTimeProperty, d);
diff --git a/src/Shared/HandyControl_Shared/Controls/Input/TimePicker.cs b/src/Shared/HandyControl_Shared/Controls/Input/TimePicker.cs
@@ -73,8 +73,10 @@ public event EventHandler<FunctionEventArgs<DateTime?>> SelectedTimeChanged
     static TimePicker()
     {
         EventManager.RegisterClassHandler(typeof(TimePicker), GotFocusEvent, new RoutedEventHandler(OnGotFocus));
-        KeyboardNavigation.TabNavigationProperty.OverrideMetadata(typeof(TimePicker), new FrameworkPropertyMetadata(KeyboardNavigationMode.Once));
-        KeyboardNavigation.IsTabStopProperty.OverrideMetadata(typeof(TimePicker), new FrameworkPropertyMetadata(ValueBoxes.FalseBox));
+        KeyboardNavigation.TabNavigationProperty.OverrideMetadata(typeof(TimePicker),
+            new FrameworkPropertyMetadata(KeyboardNavigationMode.Once));
+        KeyboardNavigation.IsTabStopProperty.OverrideMetadata(typeof(TimePicker),
+            new FrameworkPropertyMetadata(ValueBoxes.FalseBox));
     }
 
     public TimePicker()
@@ -115,7 +117,8 @@ public DateTime DisplayTime
             nameof(DisplayTime),
             typeof(DateTime),
             typeof(TimePicker),
-            new FrameworkPropertyMetadata(DateTime.Now, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, null, CoerceDisplayTime));
+            new FrameworkPropertyMetadata(DateTime.Now, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, null,
+                CoerceDisplayTime));
 
     private static object CoerceDisplayTime(DependencyObject d, object value)
     {
@@ -139,7 +142,8 @@ public bool IsDropDownOpen
             nameof(IsDropDownOpen),
             typeof(bool),
             typeof(TimePicker),
-            new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnIsDropDownOpenChanged, OnCoerceIsDropDownOpen));
+            new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault,
+                OnIsDropDownOpenChanged, OnCoerceIsDropDownOpen));
 
     private static object OnCoerceIsDropDownOpen(DependencyObject d, object baseValue)
     {
@@ -183,7 +187,8 @@ public DateTime? SelectedTime
             nameof(SelectedTime),
             typeof(DateTime?),
             typeof(TimePicker),
-            new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnSelectedTimeChanged, CoerceSelectedTime));
+            new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault,
+                OnSelectedTimeChanged, CoerceSelectedTime));
 
     private static void OnSelectedTimeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
@@ -194,6 +199,10 @@ private static void OnSelectedTimeChanged(DependencyObject d, DependencyProperty
             var time = dp.SelectedTime.Value;
             dp.SetTextInternal(dp.DateTimeToString(time));
         }
+        else
+        {
+            dp.SetTextInternal(string.Empty);
+        }
 
         dp.RaiseEvent(new FunctionEventArgs<DateTime?>(SelectedTimeChangedEvent, dp)
         {
@@ -306,7 +315,9 @@ public Brush CaretBrush
     }
 
     public static readonly DependencyProperty ClockProperty = DependencyProperty.Register(
-        nameof(Clock), typeof(ClockBase), typeof(TimePicker), new FrameworkPropertyMetadata(default(Clock), FrameworkPropertyMetadataOptions.NotDataBindable, OnClockChanged));
+        nameof(Clock), typeof(ClockBase), typeof(TimePicker),
+        new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.NotDataBindable,
+            OnClockChanged));
 
     private static void OnClockChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
@@ -384,7 +395,8 @@ public override void OnApplyTemplate()
         {
             _textBox.SetBinding(SelectionBrushProperty, new Binding(SelectionBrushProperty.Name) { Source = this });
 #if !(NET40 || NET45 || NET451 || NET452 || NET46 || NET461 || NET462 || NET47 || NET471 || NET472)
-            _textBox.SetBinding(SelectionTextBrushProperty, new Binding(SelectionTextBrushProperty.Name) { Source = this });
+            _textBox.SetBinding(SelectionTextBrushProperty,
+                new Binding(SelectionTextBrushProperty.Name) { Source = this });
 #endif
             _textBox.SetBinding(SelectionOpacityProperty, new Binding(SelectionOpacityProperty.Name) { Source = this });
             _textBox.SetBinding(CaretBrushProperty, new Binding(CaretBrushProperty.Name) { Source = this });
@@ -488,29 +500,29 @@ private bool ProcessTimePickerKey(KeyEventArgs e)
         switch (e.Key)
         {
             case Key.System:
+            {
+                switch (e.SystemKey)
                 {
-                    switch (e.SystemKey)
+                    case Key.Down:
                     {
-                        case Key.Down:
-                            {
-                                if ((Keyboard.Modifiers & ModifierKeys.Alt) == ModifierKeys.Alt)
-                                {
-                                    TogglePopup();
-                                    return true;
-                                }
-
-                                break;
-                            }
-                    }
+                        if ((Keyboard.Modifiers & ModifierKeys.Alt) == ModifierKeys.Alt)
+                        {
+                            TogglePopup();
+                            return true;
+                        }
 
-                    break;
+                        break;
+                    }
                 }
 
+                break;
+            }
+
             case Key.Enter:
-                {
-                    SetSelectedTime();
-                    return true;
-                }
+            {
+                SetSelectedTime();
+                return true;
+            }
         }
 
         return false;
@@ -635,10 +647,10 @@ private void SafeSetText(string s)
 
         if (SelectedTime != null)
         {
-            var newtext = DateTimeToString((DateTime) SelectedTime);
-            SafeSetText(newtext);
+            SafeSetText(DateTimeToString((DateTime) SelectedTime));
             return SelectedTime;
         }
+
         SafeSetText(DateTimeToString(DisplayTime));
         return DisplayTime;
     }
@@ -662,7 +674,7 @@ private void SetSelectedTime()
                 }
 
                 var d = SetTextBoxValue(s);
-                if (!SelectedTime.Equals(d))
+                if (!Equals(SelectedTime, d))
                 {
                     SetCurrentValue(SelectedTimeProperty, d);
                     SetCurrentValue(DisplayTimeProperty, d);
@@ -674,12 +686,16 @@ private void SetSelectedTime()
                 {
                     SetCurrentValue(SelectedTimeProperty, null);
                 }
+                else
+                {
+                    SetTextInternal(string.Empty);
+                }
             }
         }
         else
         {
             var d = SetTextBoxValue(_defaultText);
-            if (!SelectedTime.Equals(d))
+            if (!Equals(SelectedTime, d))
             {
                 SetCurrentValue(SelectedTimeProperty, d);
             }

Original file line number	Diff line number	Diff line change
`@@ -75,8 +75,10 @@ public event EventHandler<FunctionEventArgs<DateTime?>> SelectedDateTimeChanged`
`75`	`75`	`static DateTimePicker()`
`76`	`76`	`{`
`77`	`77`	`EventManager.RegisterClassHandler(typeof(DateTimePicker), GotFocusEvent, new RoutedEventHandler(OnGotFocus));`
`78`		`- KeyboardNavigation.TabNavigationProperty.OverrideMetadata(typeof(DateTimePicker), new FrameworkPropertyMetadata(KeyboardNavigationMode.Once));`
`79`		`- KeyboardNavigation.IsTabStopProperty.OverrideMetadata(typeof(DateTimePicker), new FrameworkPropertyMetadata(ValueBoxes.FalseBox));`
	`78`	`+ KeyboardNavigation.TabNavigationProperty.OverrideMetadata(typeof(DateTimePicker),`
	`79`	`+ new FrameworkPropertyMetadata(KeyboardNavigationMode.Once));`
	`80`	`+ KeyboardNavigation.IsTabStopProperty.OverrideMetadata(typeof(DateTimePicker),`
	`81`	`+ new FrameworkPropertyMetadata(ValueBoxes.FalseBox));`
`80`	`82`	`}`
`81`	`83`
`82`	`84`	`public DateTimePicker()`
`@@ -111,7 +113,9 @@ public Style CalendarStyle`
`111`	`113`	`}`
`112`	`114`
`113`	`115`	`public static readonly DependencyProperty DisplayDateTimeProperty = DependencyProperty.Register(`
`114`		`- nameof(DisplayDateTime), typeof(DateTime), typeof(DateTimePicker), new FrameworkPropertyMetadata(DateTime.Now, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, null, CoerceDisplayDateTime));`
	`116`	`+ nameof(DisplayDateTime), typeof(DateTime), typeof(DateTimePicker),`
	`117`	`+ new FrameworkPropertyMetadata(DateTime.Now, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, null,`
	`118`	`+ CoerceDisplayDateTime));`
`115`	`119`
`116`	`120`	`private static object CoerceDisplayDateTime(DependencyObject d, object value)`
`117`	`121`	`{`
`@@ -128,7 +132,9 @@ public DateTime DisplayDateTime`
`128`	`132`	`}`
`129`	`133`
`130`	`134`	`public static readonly DependencyProperty IsDropDownOpenProperty = DependencyProperty.Register(`
`131`		`- nameof(IsDropDownOpen), typeof(bool), typeof(DateTimePicker), new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnIsDropDownOpenChanged, OnCoerceIsDropDownOpen));`
	`135`	`+ nameof(IsDropDownOpen), typeof(bool), typeof(DateTimePicker),`
	`136`	`+ new FrameworkPropertyMetadata(ValueBoxes.FalseBox, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault,`
	`137`	`+ OnIsDropDownOpenChanged, OnCoerceIsDropDownOpen));`
`132`	`138`
`133`	`139`	`private static object OnCoerceIsDropDownOpen(DependencyObject d, object baseValue) =>`
`134`	`140`	`d is DateTimePicker`
`@@ -165,7 +171,9 @@ public bool IsDropDownOpen`
`165`	`171`	`}`
`166`	`172`
`167`	`173`	`public static readonly DependencyProperty SelectedDateTimeProperty = DependencyProperty.Register(`
`168`		`- nameof(SelectedDateTime), typeof(DateTime?), typeof(DateTimePicker), new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnSelectedDateTimeChanged, CoerceSelectedDateTime));`
	`174`	`+ nameof(SelectedDateTime), typeof(DateTime?), typeof(DateTimePicker),`
	`175`	`+ new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault,`
	`176`	`+ OnSelectedDateTimeChanged, CoerceSelectedDateTime));`
`169`	`177`
`170`	`178`	`private static object CoerceSelectedDateTime(DependencyObject d, object value)`
`171`	`179`	`{`
`@@ -185,7 +193,6 @@ private static void OnSelectedDateTimeChanged(DependencyObject d, DependencyProp`
`185`	`193`	`}`
`186`	`194`	`else`
`187`	`195`	`{`
`188`		`- // 修复：当 SelectedDateTime 为 null 时，清空文本框`
`189`	`196`	`dp.SetTextInternal(string.Empty);`
`190`	`197`	`}`
`191`	`198`
`@@ -202,7 +209,8 @@ public DateTime? SelectedDateTime`
`202`	`209`	`}`
`203`	`210`
`204`	`211`	`public static readonly DependencyProperty TextProperty = DependencyProperty.Register(`
`205`		`- nameof(Text), typeof(string), typeof(DateTimePicker), new FrameworkPropertyMetadata(string.Empty, OnTextChanged));`
	`212`	`+ nameof(Text), typeof(string), typeof(DateTimePicker),`
	`213`	`+ new FrameworkPropertyMetadata(string.Empty, OnTextChanged));`
`206`	`214`
`207`	`215`	`private static void OnTextChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)`
`208`	`216`	`{`
`@@ -333,7 +341,8 @@ public override void OnApplyTemplate()`
`333`	`341`	`{`
`334`	`342`	`_textBox.SetBinding(SelectionBrushProperty, new Binding(SelectionBrushProperty.Name) { Source = this });`
`335`	`343`	`#if !(NET40 \|\| NET45 \|\| NET451 \|\| NET452 \|\| NET46 \|\| NET461 \|\| NET462 \|\| NET47 \|\| NET471 \|\| NET472)`
`336`		`- _textBox.SetBinding(SelectionTextBrushProperty, new Binding(SelectionTextBrushProperty.Name) { Source = this });`
	`344`	`+ _textBox.SetBinding(SelectionTextBrushProperty,`
	`345`	`+ new Binding(SelectionTextBrushProperty.Name) { Source = this });`
`337`	`346`	`#endif`
`338`	`347`	`_textBox.SetBinding(SelectionOpacityProperty, new Binding(SelectionOpacityProperty.Name) { Source = this });`
`339`	`348`	`_textBox.SetBinding(CaretBrushProperty, new Binding(CaretBrushProperty.Name) { Source = this });`
`@@ -407,7 +416,8 @@ private void InitCalendarWithClock()`
`407`	`416`
`408`	`417`	`private void CalendarWithClock_Confirmed() => TogglePopup();`
`409`	`418`
`410`		`- private void CalendarWithClock_SelectedDateTimeChanged(object sender, FunctionEventArgs<DateTime?> e) => SelectedDateTime = e.Info;`
	`419`	`+ private void CalendarWithClock_SelectedDateTimeChanged(object sender, FunctionEventArgs<DateTime?> e) =>`
	`420`	`+ SelectedDateTime = e.Info;`
`411`	`421`
`412`	`422`	`private void TextBox_LostFocus(object sender, RoutedEventArgs e)`
`413`	`423`	`{`
`@@ -450,29 +460,29 @@ private bool ProcessDateTimePickerKey(KeyEventArgs e)`
`450`	`460`	`switch (e.Key)`
`451`	`461`	`{`
`452`	`462`	`case Key.System:`
	`463`	`+ {`
	`464`	`+ switch (e.SystemKey)`
`453`	`465`	`{`
`454`		`- switch (e.SystemKey)`
	`466`	`+ case Key.Down:`
`455`	`467`	`{`
`456`		`- case Key.Down:`
`457`		`- {`
`458`		`- if ((Keyboard.Modifiers & ModifierKeys.Alt) == ModifierKeys.Alt)`
`459`		`- {`
`460`		`- TogglePopup();`
`461`		`- return true;`
`462`		`- }`
`463`		`-`
`464`		`- break;`
`465`		`- }`
`466`		`- }`
	`468`	`+ if ((Keyboard.Modifiers & ModifierKeys.Alt) == ModifierKeys.Alt)`
	`469`	`+ {`
	`470`	`+ TogglePopup();`
	`471`	`+ return true;`
	`472`	`+ }`
`467`	`473`
`468`		`- break;`
	`474`	`+ break;`
	`475`	`+ }`
`469`	`476`	`}`
`470`	`477`
	`478`	`+ break;`
	`479`	`+ }`
	`480`	`+`
`471`	`481`	`case Key.Enter:`
`472`		`- {`
`473`		`- SetSelectedDateTime();`
`474`		`- return true;`
`475`		`- }`
	`482`	`+ {`
	`483`	`+ SetSelectedDateTime();`
	`484`	`+ return true;`
	`485`	`+ }`
`476`	`486`	`}`
`477`	`487`
`478`	`488`	`return false;`
`@@ -593,10 +603,10 @@ private void SafeSetText(string s)`
`593`	`603`
`594`	`604`	`if (SelectedDateTime != null)`
`595`	`605`	`{`
`596`		`- var newtext = DateTimeToString(SelectedDateTime.Value);`
`597`		`- SafeSetText(newtext);`
	`606`	`+ SafeSetText(DateTimeToString(SelectedDateTime.Value));`
`598`	`607`	`return SelectedDateTime;`
`599`	`608`	`}`
	`609`	`+`
`600`	`610`	`SafeSetText(DateTimeToString(DisplayDateTime));`
`601`	`611`	`return DisplayDateTime;`
`602`	`612`	`}`
`@@ -625,7 +635,6 @@ private void SetSelectedDateTime()`
`625`	`635`	`}`
`626`	`636`
`627`	`637`	`var d = SetTextBoxValue(s);`
`628`		`- // 修复：使用静态的 Equals 方法进行安全的 null 比较`
`629`	`638`	`if (!Equals(SelectedDateTime, d))`
`630`	`639`	`{`
`631`	`640`	`SetCurrentValue(SelectedDateTimeProperty, d);`
`@@ -640,15 +649,13 @@ private void SetSelectedDateTime()`
`640`	`649`	`}`
`641`	`650`	`else`
`642`	`651`	`{`
`643`		`- // 修复：确保文本框同步清空`
`644`	`652`	`SetTextInternal(string.Empty);`
`645`	`653`	`}`
`646`	`654`	`}`
`647`	`655`	`}`
`648`	`656`	`else`
`649`	`657`	`{`
`650`	`658`	`var d = SetTextBoxValue(_defaultText);`
`651`		`- // 修复：使用静态的 Equals 方法进行安全的 null 比较`
`652`	`659`	`if (!Equals(SelectedDateTime, d))`
`653`	`660`	`{`
`654`	`661`	`SetCurrentValue(SelectedDateTimeProperty, d);`