From 97fa754aa476762e6b2cf06c3b8f9059c74e0582 Mon Sep 17 00:00:00 2001
From: liangshiwei <deawback@hotmail.com>
Date: Wed, 27 Mar 2024 21:39:50 +0800
Subject: [PATCH] Add Visible parameter to TableColumn

---
 .../Web/Extensibility/TableColumns/TableColumn.cs    |  2 ++
 .../Components/AbpExtensibleDataGrid.razor           | 12 +++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/Extensibility/TableColumns/TableColumn.cs b/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/Extensibility/TableColumns/TableColumn.cs
index efd1d9320b..89cdb33729 100644
--- a/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/Extensibility/TableColumns/TableColumn.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/Extensibility/TableColumns/TableColumn.cs
@@ -24,6 +24,8 @@ public class TableColumn
     public Func<object, string>? ValueConverter { get; set; }
 
     public bool Sortable { get; set; }
+    
+    public bool Visible { get; set; } = true;
 
     public TableColumn()
     {
diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor b/framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor
index b38f4afaa9..ed9c532e49 100644
--- a/framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor
+++ b/framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor
@@ -74,7 +74,7 @@
                     {
                         @if (column.ValueConverter == null)
                         {
-                            <DataGridColumn TItem="TItem" Field="@column.Data" Caption="@column.Title" Sortable="@column.Sortable" DisplayFormat="@column.DisplayFormat" DisplayFormatProvider="@column.DisplayFormatProvider" >
+                            <DataGridColumn TItem="TItem" Field="@column.Data" Caption="@column.Title" Sortable="@column.Sortable" DisplayFormat="@column.DisplayFormat" DisplayFormatProvider="@column.DisplayFormatProvider" Displayable="column.Visible" >
                                 <DisplayTemplate>
                                     @RenderCustomTableColumnComponent(column.Component, context)
                                 </DisplayTemplate>
@@ -82,7 +82,7 @@
                         }
                         else
                         {
-                            <DataGridColumn TItem="TItem" Field="@column.Data" Caption="@column.Title" Sortable="@column.Sortable">
+                            <DataGridColumn TItem="TItem" Field="@column.Data" Caption="@column.Title" Sortable="@column.Sortable" Displayable="column.Visible">
                                 <DisplayTemplate>
                                     @RenderCustomTableColumnComponent(column.Component, context)
                                 </DisplayTemplate>
@@ -100,14 +100,16 @@
                                                 Caption="@column.Title"
                                                 Sortable="@column.Sortable"
                                                 DisplayFormat="@column.DisplayFormat"
-                                                DisplayFormatProvider="@column.DisplayFormatProvider"/>
+                                                DisplayFormatProvider="@column.DisplayFormatProvider"
+                                                Displayable="column.Visible"/>
                             }
                             else
                             {
                                 <DataGridColumn TItem="TItem"
                                                 Field="@column.Data"
                                                 Caption="@column.Title"
-                                                Sortable="@column.Sortable">
+                                                Sortable="@column.Sortable"
+                                                Displayable="column.Visible">
                                     <DisplayTemplate>
                                         @(GetConvertedFieldValue(context, column))
                                     </DisplayTemplate>
@@ -116,7 +118,7 @@
                         }
                         else
                         {
-                            <DataGridColumn TItem="TItem" Field="@nameof(IHasExtraProperties.ExtraProperties)" SortField="@column.PropertyName" Caption="@column.Title">
+                            <DataGridColumn TItem="TItem" Field="@nameof(IHasExtraProperties.ExtraProperties)" SortField="@column.PropertyName" Caption="@column.Title" Displayable="column.Visible">
                                 <DisplayTemplate>
                                     @{
                                         var entity = context as IHasExtraProperties;