From 257c79db922f21fafaa5843c113659f22c832125 Mon Sep 17 00:00:00 2001
From: Kimdiego2098 <2248356998@qq.com>
Date: Thu, 10 Aug 2023 10:35:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/AppDataTable.razor                     | 11 ++++++++---
 .../Components/AppDataTable.razor.cs                  |  5 +++++
 .../ThingsGateway.Admin.Blazor.xml                    |  5 +++++
 .../ThingsGateway.Application.xml                     |  5 ++++-
 .../ThingsGateway.Foundation.xml                      |  3 +++
 5 files changed, 25 insertions(+), 4 deletions(-)

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 @@
 
                         }
                     }
-                    
+
 
                 }
             </ItemColContent>
@@ -302,7 +302,12 @@
     <MContainer>
         <MSimpleTable Dense FixedHeader>
             <tbody>
-                @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<TItem, SearchItem, AddItem, EditItem> : IAppDa
     /// </summary>
     [Parameter]
     public RenderFragment<EditItem> EditTemplate { get; set; }
+    /// <summary>
+    /// 获得/设置 详情模板
+    /// </summary>
+    [Parameter]
+    public RenderFragment<TItem> Detailemplate { get; set; }
 
     /// <summary>
     /// 表头过滤，返回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 @@
             获得/设置 编辑模板
             </summary>
         </member>
+        <member name="P:ThingsGateway.Admin.Blazor.Core.AppDataTable`4.Detailemplate">
+            <summary>
+            获得/设置 详情模板
+            </summary>
+        </member>
         <member name="P:ThingsGateway.Admin.Blazor.Core.AppDataTable`4.FilterHeaders">
             <summary>
             表头过滤，返回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 @@
         <member name="P:ThingsGateway.Application.VariableData.Name">
             <inheritdoc cref="P:ThingsGateway.Application.MemoryVariable.Name"/>
         </member>
+        <member name="P:ThingsGateway.Application.VariableData.Unit">
+            <inheritdoc cref="P:ThingsGateway.Application.DeviceVariable.Unit"/>
+        </member>
         <member name="P:ThingsGateway.Application.VariableData.Description">
             <inheritdoc cref="P:ThingsGateway.Application.MemoryVariable.Description"/>
         </member>
@@ -1816,7 +1819,7 @@
             <inheritdoc cref="P:ThingsGateway.Application.MemoryVariable.ReadExpressions"/>
         </member>
         <member name="P:ThingsGateway.Application.VariableData.WriteExpressions">
-            <inheritdoc cref="!:DeviceVariable.WriteExpressions"/>
+            <inheritdoc cref="P:ThingsGateway.Application.MemoryVariable.WriteExpressions"/>
         </member>
         <member name="P:ThingsGateway.Application.VariableData.IntervalTime">
             <inheritdoc cref="P:ThingsGateway.Application.DeviceVariable.IntervalTime"/>
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 @@
             停止位
             </summary>
         </member>
+        <member name="M:ThingsGateway.Foundation.Serial.SerialProperty.ToString">
+            <inheritdoc/>
+        </member>
         <member name="T:ThingsGateway.Foundation.SerialPortExtensions">
             <summary>
             SocketExtension