賮賴乇爻鬲 賲賳亘毓

淇DatePicker缁戝畾 - DateTime鏀逛负DateTime?鍙┖绫诲瀷

纾 鏇 1 賴賮鬲賴 倬蹖卮
賵丕賱丿
讴丕賲蹖鬲
bbac2c877b
2賮丕蹖賱賴丕蹖 鬲睾蹖蹖乇 蹖丕賮鬲賴 亘賴 賴賲乇丕賴10 丕賮夭賵丿賴 卮丿賴6 丨匕賮 卮丿賴
  1. 5 3
      src/YZWater.Core/ViewModels/ViewCViewModel.cs
  2. 5 3
      src/YZWater.Core/ViewModels/ViewDViewModel.cs

+ 5 - 3
src/YZWater.Core/ViewModels/ViewCViewModel.cs

@@ -29,10 +29,10 @@ public partial class ViewCViewModel : ObservableObject
     private Axis[] _yAxes;
 
     [ObservableProperty]
-    private DateTime _startDate = DateTime.Now.AddDays(-7);
+    private DateTime? _startDate = DateTime.Now.AddDays(-7);
 
     [ObservableProperty]
-    private DateTime _endDate = DateTime.Now;
+    private DateTime? _endDate = DateTime.Now;
 
     [ObservableProperty]
     private List<FlowRecord> _flowRecords = new();
@@ -98,8 +98,10 @@ public partial class ViewCViewModel : ObservableObject
     {
         try
         {
+            var start = StartDate ?? DateTime.Now.AddDays(-7);
+            var end = EndDate ?? DateTime.Now;
             var records = await DatabaseService.Db.Select<FlowRecord>()
-                .Where(r => r.RecordTime >= StartDate && r.RecordTime <= EndDate)
+                .Where(r => r.RecordTime >= start && r.RecordTime <= end)
                 .OrderByDescending(r => r.RecordTime)
                 .ToListAsync();
 

+ 5 - 3
src/YZWater.Core/ViewModels/ViewDViewModel.cs

@@ -21,10 +21,10 @@ public partial class ViewDViewModel : ObservableObject
     private int _unconfirmedCount;
 
     [ObservableProperty]
-    private DateTime _startDate = DateTime.Now.AddDays(-7);
+    private DateTime? _startDate = DateTime.Now.AddDays(-7);
 
     [ObservableProperty]
-    private DateTime _endDate = DateTime.Now;
+    private DateTime? _endDate = DateTime.Now;
 
     [ObservableProperty]
     private string _filterType = "鍏ㄩ儴";
@@ -42,8 +42,10 @@ public partial class ViewDViewModel : ObservableObject
     {
         try
         {
+            var start = StartDate ?? DateTime.Now.AddDays(-7);
+            var end = EndDate ?? DateTime.Now;
             var query = DatabaseService.Db.Select<AlarmRecord>()
-                .Where(r => r.AlarmTime >= StartDate && r.AlarmTime <= EndDate);
+                .Where(r => r.AlarmTime >= start && r.AlarmTime <= end);
 
             if (FilterType != "鍏ㄩ儴")
             {