diff --git a/framework/ThingsGateway.Admin.Blazor/Components/AppDataTable.razor b/framework/ThingsGateway.Admin.Blazor/Components/AppDataTable.razor index 9a44d8b53..f6bbf4095 100644 --- a/framework/ThingsGateway.Admin.Blazor/Components/AppDataTable.razor +++ b/framework/ThingsGateway.Admin.Blazor/Components/AppDataTable.razor @@ -189,7 +189,7 @@ } else { - if (ItemColWithDTTemplate!=null) + if (ItemColWithDTTemplate != null) { @ItemColWithDTTemplate(context) } @@ -220,7 +220,7 @@ } } - + } @@ -302,7 +302,12 @@ - @if (DetailShow) + + @if (Detailemplate != null && DetailShow) + { + @Detailemplate(DetailModel) + } + else if (DetailShow) { @foreach (var item in Headers) { diff --git a/framework/ThingsGateway.Admin.Blazor/Components/AppDataTable.razor.cs b/framework/ThingsGateway.Admin.Blazor/Components/AppDataTable.razor.cs index c037cdc39..f85d4917b 100644 --- a/framework/ThingsGateway.Admin.Blazor/Components/AppDataTable.razor.cs +++ b/framework/ThingsGateway.Admin.Blazor/Components/AppDataTable.razor.cs @@ -89,6 +89,11 @@ public partial class AppDataTable : IAppDa /// [Parameter] public RenderFragment EditTemplate { get; set; } + /// + /// 获得/设置 详情模板 + /// + [Parameter] + public RenderFragment Detailemplate { get; set; } /// /// 表头过滤,返回DataTableHeader列表,传输参数已包含全部初始表头与表头标题 diff --git a/framework/ThingsGateway.Admin.Blazor/ThingsGateway.Admin.Blazor.xml b/framework/ThingsGateway.Admin.Blazor/ThingsGateway.Admin.Blazor.xml index 292b44adf..e92fdce68 100644 --- a/framework/ThingsGateway.Admin.Blazor/ThingsGateway.Admin.Blazor.xml +++ b/framework/ThingsGateway.Admin.Blazor/ThingsGateway.Admin.Blazor.xml @@ -58,6 +58,11 @@ 获得/设置 编辑模板 + + + 获得/设置 详情模板 + + 表头过滤,返回DataTableHeader列表,传输参数已包含全部初始表头与表头标题 diff --git a/framework/ThingsGateway.Application/ThingsGateway.Application.xml b/framework/ThingsGateway.Application/ThingsGateway.Application.xml index 20d4b57c3..5b591bbdf 100644 --- a/framework/ThingsGateway.Application/ThingsGateway.Application.xml +++ b/framework/ThingsGateway.Application/ThingsGateway.Application.xml @@ -1791,6 +1791,9 @@ + + + @@ -1816,7 +1819,7 @@ - + diff --git a/framework/ThingsGateway.Foundation/ThingsGateway.Foundation.xml b/framework/ThingsGateway.Foundation/ThingsGateway.Foundation.xml index de28e95f6..f007ed5eb 100644 --- a/framework/ThingsGateway.Foundation/ThingsGateway.Foundation.xml +++ b/framework/ThingsGateway.Foundation/ThingsGateway.Foundation.xml @@ -2288,6 +2288,9 @@ 停止位 + + + SocketExtension