1

DW5S.App/EditForms/FixedStationEditor.cs

@@ -48,7 +48,7 @@ namespace DW5S.App.EditForms
             infos.AddRange(res);
             var repsSig = unitOfWork.Of<SigInfo>();
            var sigs = await repsSig.GetAllAsync();
-            this.txtFreqUp.UseDefault().SetData(sigs, nameof(SigInfo.FreqUpDis)).UseDoubleClickToSelectAll();
+            this.txtFreqUp.UseDefault().SetData(sigs.To<List<SigViewModel>>(), displayField: nameof(SigViewModel.FreqUpDis)).UseDoubleClickToSelectAll();
             if (this.Text == "固定站编辑" && info != null)
             {
                 this.txtName.Text = info.StationName;

DW5S.App/EditForms/TaskEditor.cs

@@ -71,9 +71,9 @@ namespace DW5S.App.EditForms
             var unitOfWork = IocContainer.UnitOfWork;
             var repsSat = unitOfWork.Of<SatInfo>();
             var sats = await repsSat.GetAllAsync();
-            this.txtMainSat.UseDefault().SetData(sats, displayField: nameof(SatInfo.Sat)).UseDoubleClickToSelectAll();
-            this.txtAdja1Sat.UseDefault().SetData(sats, displayField: nameof(SatInfo.Sat)).UseDoubleClickToSelectAll();
-            this.txtAdja2Sat.UseDefault().SetData(sats, displayField: nameof(SatInfo.Sat)).UseDoubleClickToSelectAll();
+            this.txtMainSat.UseDefault().SetData(sats.ToList(), displayField: nameof(SatInfo.Sat)).UseDoubleClickToSelectAll();
+            this.txtAdja1Sat.UseDefault().SetData(sats.ToList(), displayField: nameof(SatInfo.Sat)).UseDoubleClickToSelectAll();
+            this.txtAdja2Sat.UseDefault().SetData(sats.ToList(), displayField: nameof(SatInfo.Sat)).UseDoubleClickToSelectAll();
             if (this.Text.StartsWith("编辑任务") && info != null)
             {
                 var satMain = sats.FirstOrDefault(w => w.SatCode == info.MainSat);

DW5S.App/ExtensionsDev/SearchLookUpEditExtension.cs

@@ -71,13 +71,13 @@ namespace ExtensionsDev
             return ctrl;
         }
 
-        public static SearchLookUpEdit SetData<T>(this SearchLookUpEdit ctrl, IEnumerable<T> data, string valueField = "Id", string displayField = "")
+        public static SearchLookUpEdit SetData<T>(this SearchLookUpEdit ctrl, List<T> data, string valueField = "Id", string displayField = "")
         {
             ctrl.Properties.ValueMember = valueField;
             ctrl.Properties.KeyMember = valueField;
             ctrl.Properties.DisplayMember = displayField;
             ctrl.QueryPopUp += Ctrl_QueryPopUp;
-            ctrl.Properties.DataSource = data;
+            ctrl.Properties.DataSource = data ;
             GridView view = ctrl.Properties.View;
             view.Tag = ctrl;
             view.OptionsView.ShowColumnHeaders = true;

DW5S.ViewModel/BaseViewModel.cs

@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 
 namespace DW5S.ViewModel
 {
-    public class BaseViewModel
+    public  class BaseViewModel
     {
         [Display(Name = "编号")]
         public long Id { get; set; }
@@ -20,24 +20,16 @@ namespace DW5S.ViewModel
         public DateTime UpdateTime { get; set; }
     }
 
-    /// <summary>
-    /// int类型主键的Entity基类
-    /// </summary>
-    public abstract class BaseViewModelInt : BaseViewModel
+    public  class BaseViewModelInt
     {
-        /// <summary>
-        /// 
-        /// </summary>
-        public BaseViewModelInt()
-        {
-            this.CreateTime = DateTime.Now;
-            this.UpdateTime = DateTime.Now;
-        }
-
-        /// <summary>
-        /// 编号
-        /// </summary>
         [Display(Name = "编号")]
-        public new int Id { get; set; }
+        public int Id { get; set; }
+
+        [Display(Name = "创建时间")]
+        public DateTime CreateTime { get; set; }
+
+        [Display(Name = "更新时间")]
+        public DateTime UpdateTime { get; set; }
     }
+
 }

DW5S.ViewModel/SatViewModel.cs

@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 
 namespace XdCxRhDW5S.Entity
 {
-    public class SatViewModel : BaseViewModelInt
+    public class SatViewModel : BaseViewModel
     {
         [Display(Name = "卫星编号")]
         public int SatCode { get; set; }