11

DW5S.App/ExtensionsDev/SearchLookUpEditExtension.cs

@@ -71,36 +71,20 @@ namespace ExtensionsDev
             return ctrl;
         }
 
-        public static SearchLookUpEdit SetData<T>(this SearchLookUpEdit ctrl, List<T> data, string valueField = "Id", string displayField = "")
+        public static SearchLookUpEdit SetData<T>(this SearchLookUpEdit ctrl, List<T> data, string displayField, string valueField = "This")
         {
             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;
             view.GridControl.UseDefault<T>(null);
-            ctrl.CustomDisplayText += (sender, e) =>
-            {
-                if (e.Value == null) return;
-                if (typeof(T) != e.Value.GetType())
-                {
-                    e.DisplayText = e.Value.ToString();
-                }
-                else if (string.IsNullOrWhiteSpace(displayField))
-                {
-                    e.DisplayText = e.Value.ToString();
-                }
-                else
-                {
-                    e.DisplayText = typeof(T).GetProperty(displayField).GetValue(e.Value).ToString();
-                }
-            };
             return ctrl;
         }
-        public static SearchLookUpEdit SetData<T>(this SearchLookUpEdit ctrl, Func<Task<List<T>>> onGetDataAsync, string valueField = "Id", string displayField = "")
+        public static SearchLookUpEdit SetData<T>(this SearchLookUpEdit ctrl, Func<Task<IEnumerable<T>>> onGetDataAsync, string displayField, string valueField = "This")
         {
             ctrl.Properties.ValueMember = valueField;
             ctrl.Properties.KeyMember = valueField;
@@ -167,7 +151,7 @@ namespace ExtensionsDev
             view.GridControl.HideColumn("CreateTime", "UpdateTime", "Enable", "Enabled", "IsEnable", "Remark");
             view.GridControl.HideColumn(p => p.FieldName.ToUpper().EndsWith("ID"));
             view.GridControl.HideColumn(p => p.ColumnType == typeof(List<>));
-            view.GridControl.HideColumn(p => p.ColumnType.BaseType != null && p.ColumnType.BaseType.Name.Contains("BaseEntity"));
+            //view.GridControl.HideColumn(p => p.ColumnType.BaseType != null && p.ColumnType.BaseType.Name.Contains("BaseEntity"));
             if (ctrl.Tag is RepositoryItemSearchLookUpEdit edit)
             {
                 var onGetData = (Func<dynamic>)edit.Tag;

DW5S.ViewModel/BaseViewModel.cs

@@ -8,22 +8,10 @@ using System.Threading.Tasks;
 
 namespace DW5S.ViewModel
 {
-    public  class BaseViewModel
+    public  class BaseViewModel<T>
     {
         [Display(Name = "编号")]
-        public long Id { get; set; }
-
-        [Display(Name = "创建时间")]
-        public DateTime CreateTime { get; set; }
-
-        [Display(Name = "更新时间")]
-        public DateTime UpdateTime { get; set; }
-    }
-
-    public  class BaseViewModelInt
-    {
-        [Display(Name = "编号")]
-        public int Id { get; set; }
+        public T Id { get; set; }
 
         [Display(Name = "创建时间")]
         public DateTime CreateTime { get; set; }

DW5S.ViewModel/CdbTxViewModel.cs

@@ -10,7 +10,7 @@ using System.Threading.Tasks;
 
 namespace DW5S.Entity
 {
-    public class CdbTxViewModel : BaseViewModel
+    public class CdbTxViewModel : BaseViewModel<int>
     {
 
         [Display(Name = "超短波站名称")]

DW5S.ViewModel/CxTxViewModel.cs

@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 
 namespace DW5S.Entity
 {
-    public class CxTxViewModel : BaseViewModel
+    public class CxTxViewModel :  BaseViewModel<int>
     {
 
         [Display(Name = "测向站名称")]

DW5S.ViewModel/RecTxViewModel.cs

@@ -12,7 +12,7 @@ namespace DW5S.Entity
     /// <summary>
     /// 天线信息
     /// </summary>
-    public class RecTxViewModel : BaseViewModel
+    public class RecTxViewModel : BaseViewModel<int>
     {
         [Display(Name = "接收站名称")]
         public string Name { get; set; }

DW5S.ViewModel/RefTxViewModel.cs

@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 
 namespace DW5S.Entity
 {
-    public class RefTxViewModel : BaseViewModelInt
+    public class RefTxViewModel  : BaseViewModel<int>
     {
 
         [Display(Name = "参考站名称")]

DW5S.ViewModel/SampleViewModel.cs

@@ -5,7 +5,7 @@ using System.ComponentModel.DataAnnotations;
 
 namespace DW5S.ViewModel
 {
-    public class SampleViewModel : BaseViewModelInt
+    public class SampleViewModel : BaseViewModel<int>
     {
 
         [Display(Name = "样本名称")]

DW5S.ViewModel/SatViewModel.cs

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

DW5S.ViewModel/SigDelayViewModel.cs

@@ -13,7 +13,7 @@ namespace DW5S.ViewModel
     /// <summary>
     /// 信号转发延迟信息
     /// </summary>
-    public class SigDelayViewModel : BaseViewModelInt
+    public class SigDelayViewModel : BaseViewModel<int>
     {
 
         /// <summary>

DW5S.ViewModel/SigViewModel.cs

@@ -5,7 +5,7 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 namespace DW5S.ViewModel
 {
-    public class SigViewModel : BaseViewModelInt
+    public class SigViewModel : BaseViewModel<int>
     {
         [Display(Name = "上行频点(Hz)", AutoGenerateField = false)]
         public long FreqUp { get; set; }

DW5S.ViewModel/XlViewModel.cs

@@ -2,7 +2,7 @@
 
 namespace DW5S.ViewModel
 {
-    public class XlViewModel : BaseViewModel
+    public class XlViewModel : BaseViewModel<int>
     {
         [Display(Name = "卫星编号")]
         public int SatCode { get; set; }