add property type

src/LoreSoft.Blazor.Controls/Data/DataColumn.cs

@@ -1,5 +1,6 @@
 using System.Globalization;
 using System.Linq.Expressions;
+using System.Reflection;
 
 using LoreSoft.Blazor.Controls.Extensions;
 
@@ -10,7 +11,6 @@ namespace LoreSoft.Blazor.Controls;
 public class DataColumn<TItem> : ComponentBase
 {
     private Func<TItem, object> _propertyAccessor;
-    private string _propertyName;
 
     [CascadingParameter(Name = "Grid")]
     protected DataGrid<TItem> Grid { get; set; }
@@ -63,9 +63,6 @@ public class DataColumn<TItem> : ComponentBase
     [Parameter]
     public bool Visible { get; set; } = true;
 
-    public string Name => PropertyName();
-
-
     [Parameter]
     public RenderFragment HeaderTemplate { get; set; }
 
@@ -78,6 +75,9 @@ public class DataColumn<TItem> : ComponentBase
     [Parameter]
     public RenderFragment<QueryFilter> FilterTemplate { get; set; }
 
+    public string Name { get; set; }
+
+    public Type Type { get; set; }
 
     internal int CurrentSortIndex { get; set; } = -1;
 
@@ -99,13 +99,19 @@ protected override void OnInitialized()
         Grid.AddColumn(this);
     }
 
+    protected override void OnParametersSet()
+    {
+        base.OnParametersSet();
+
+        UpdateProperty();
+    }
+
     internal string HeaderTitle()
     {
         if (!string.IsNullOrEmpty(Title))
             return Title;
 
-        var name = PropertyName();
-        return name.ToTitle();
+        return Name.ToTitle();
     }
 
     internal string CellValue(TItem data)
@@ -140,25 +146,32 @@ internal void UpdateSort(int index, bool descending)
         CurrentSortDescending = descending;
     }
 
-    private string PropertyName()
+    private void UpdateProperty()
     {
-        if (Property == null)
-            return string.Empty;
+        MemberInfo memberInfo = null;
 
-        if (!string.IsNullOrEmpty(_propertyName))
-            return _propertyName;
+        if (Property?.Body is MemberExpression memberExpression)
+            memberInfo = memberExpression.Member;
+        else if (Property?.Body is UnaryExpression { Operand: MemberExpression memberOperand })
+            memberInfo = memberOperand.Member;
 
-        _propertyName = Property?.Body switch
+        if (memberInfo is PropertyInfo propertyInfo)
         {
-            MemberExpression memberExpression => memberExpression.Member.Name,
-            UnaryExpression { Operand: MemberExpression memberOperand } => memberOperand.Member.Name,
-            _ => string.Empty
-        };
-
-        return _propertyName;
+            Name = propertyInfo.Name;
+            Type = propertyInfo.PropertyType;
+        }
+        else if (memberInfo is FieldInfo fieldInfo)
+        {
+            Name = fieldInfo.Name;
+            Type = fieldInfo.FieldType;
+        }
+        else
+        {
+            Name = memberInfo.Name;
+            Type = typeof(object);
+        }
     }
 
-
     internal Dictionary<string, object> ComputeAttributes(TItem data)
     {
         var attributes = new Dictionary<string, object>();

src/LoreSoft.Blazor.Controls/Extensions/TypeExtensions.cs

@@ -18,7 +18,10 @@ public static Type GetUnderlyingType(this Type type)
             throw new ArgumentNullException(nameof(type));
 
         var isNullable = type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>);
-        return isNullable ? Nullable.GetUnderlyingType(type) : type;
+        if (isNullable)
+            return Nullable.GetUnderlyingType(type) ?? type;
+
+        return type;
     }
 
     /// <summary>
@@ -44,7 +47,7 @@ public static bool IsNullable(this Type type)
     /// </summary>
     /// <param name="type">The type to get a default value for.</param>
     /// <returns>A default value the specified <paramref name="type"/>.</returns>
-    public static object Default(this Type type)
+    public static object? Default(this Type type)
     {
         if (type == null)
             throw new ArgumentNullException(nameof(type));

src/LoreSoft.Blazor.Controls/Query/QueryBuilderField.cs

@@ -142,6 +142,7 @@ private void UpdateProperty()
         else
         {
             Name = memberInfo.Name;
+            Type = typeof(object);
         }
     }