Merge pull request #5 from DigitalPlatform/master

同步源

DigitalPlatform.CommonControl/DateRangeControl.cs

@@ -33,6 +33,11 @@ public partial class DateRangeControl : UserControl
         public DateRangeControl()
         {
             InitializeComponent();
+
+            this.dateTimePicker_start.Value = this.dateTimePicker_start.MinDate;
+            this.dateTimePicker_end.Value = this.dateTimePicker_end.MinDate;
+            RefreshDisplay(this.dateTimePicker_start);
+            RefreshDisplay(this.dateTimePicker_end);
         }
 
         public override Size MaximumSize
@@ -156,6 +161,8 @@ public static DateTime Long8ToDateTime(string strDate8)
 
         private void dateTimePicker_start_ValueChanged(object sender, EventArgs e)
         {
+            RefreshDisplay(this.dateTimePicker_start);
+
             if (IngoreTextChange > 0)
                 return;
 
@@ -165,8 +172,18 @@ private void dateTimePicker_start_ValueChanged(object sender, EventArgs e)
             }
         }
 
+        void RefreshDisplay(DateTimePicker picker)
+        {
+            if (picker.Value == picker.MinDate)
+                picker.CustomFormat = " ";
+            else
+                picker.CustomFormat = "yyyy-MM-dd";
+        }
+
         private void dateTimePicker_end_ValueChanged(object sender, EventArgs e)
         {
+            RefreshDisplay(this.dateTimePicker_end);
+
             if (IngoreTextChange > 0)
                 return;
 
@@ -241,10 +258,19 @@ private void label_start_MouseUp(object sender, MouseEventArgs e)
                 menuItem.MenuItems.Add(subMenuItem);
             }
 
+            menuItem = new MenuItem("清空");
+            menuItem.Click += menu_clear_Click;
+            contextMenu.MenuItems.Add(menuItem);
 
             contextMenu.Show(this.label_start, new Point(e.X, e.Y));
         }
 
+        void menu_clear_Click(object sender, EventArgs e)
+        {
+            this.dateTimePicker_start.Value = this.dateTimePicker_start.MinDate;
+            this.dateTimePicker_end.Value = this.dateTimePicker_end.MinDate;
+        }
+
         void menu_quickSet_Click(object sender, EventArgs e)
         {
             MenuItem menu = (MenuItem)sender;