use column attribute for query builder

loresoft · Oct 27, 2024 · 5d540f9 · 5d540f9
1 parent c3807b8
commit 5d540f9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/src/LoreSoft.Blazor.Controls/Query/QueryBuilderField.cs b/src/LoreSoft.Blazor.Controls/Query/QueryBuilderField.cs
@@ -1,3 +1,4 @@
+using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq.Expressions;
 using System.Reflection;
 
@@ -34,6 +35,8 @@ public class QueryBuilderField<TItem> : ComponentBase
 
     public string Name { get; set; }
 
+    public string Column { get; set; }
+
     public Type Type { get; set; }
 
 
@@ -144,6 +147,9 @@ private void UpdateProperty()
             Name = memberInfo.Name;
             Type = typeof(object);
         }
+
+        var columnAttribute = memberInfo.GetCustomAttribute<ColumnAttribute>(true);
+        Column = columnAttribute != null ? columnAttribute.Name : Name;
     }
 
 

diff --git a/src/LoreSoft.Blazor.Controls/Query/QueryBuilderFilter.razor b/src/LoreSoft.Blazor.Controls/Query/QueryBuilderFilter.razor
@@ -18,7 +18,7 @@
         <option value="">- Field -</option>
         @foreach (var field in Fields)
         {
-            <option @key="field" value="@field.Name">@field.CurrentTitle</option>
+            <option @key="field" value="@field.Column">@field.CurrentTitle</option>
         }
     </select>
 

diff --git a/src/LoreSoft.Blazor.Controls/Query/QueryBuilderFilter.razor.cs b/src/LoreSoft.Blazor.Controls/Query/QueryBuilderFilter.razor.cs
@@ -29,7 +29,7 @@ protected override void OnInitialized()
 
     protected void FieldChanged()
     {
-        Field = Fields.FirstOrDefault(f => f.Name == Filter.Field);
+        Field = Fields.FirstOrDefault(f => f.Column == Filter.Field);
         QueryBuilder.Refresh();
     }