From 2bc5d8442c24824f45289bcb24b5fbe97296a444 Mon Sep 17 00:00:00 2001
From: Argo-Cloud <argo@163.com>
Date: Wed, 24 Mar 2021 01:12:21 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat:=20IEditorItem=20=E5=A2=9E=E5=8A=A0=20?=
 =?UTF-8?q?ComponentType=20=E5=B1=9E=E6=80=A7=E5=8F=AF=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E5=91=88=E7=8E=B0=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Attributes/AutoGenerateColumnAttribute.cs             | 5 +++++
 src/BootstrapBlazor/Components/EditorForm/EditorItem.cs   | 6 ++++++
 src/BootstrapBlazor/Components/EditorForm/IEditorItem.cs  | 7 ++++++-
 .../Components/Table/InternalTableColumn.cs               | 5 +++++
 src/BootstrapBlazor/Components/Table/TableColumn.cs       | 8 +++++++-
 5 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/BootstrapBlazor/Attributes/AutoGenerateColumnAttribute.cs b/src/BootstrapBlazor/Attributes/AutoGenerateColumnAttribute.cs
index c632fd6e0..c5145e5c9 100644
--- a/src/BootstrapBlazor/Attributes/AutoGenerateColumnAttribute.cs
+++ b/src/BootstrapBlazor/Attributes/AutoGenerateColumnAttribute.cs
@@ -90,6 +90,11 @@ namespace BootstrapBlazor.Components
         /// </summary>
         public RenderFragment<object>? EditTemplate { get; set; }
 
+        /// <summary>
+        /// 获得/设置 组件类型 默认为 null
+        /// </summary>
+        public Type? ComponentType { get; set; }
+
         /// <summary>
         /// 获得/设置 显示模板
         /// </summary>
diff --git a/src/BootstrapBlazor/Components/EditorForm/EditorItem.cs b/src/BootstrapBlazor/Components/EditorForm/EditorItem.cs
index 35ea379f0..b5e75eb9c 100644
--- a/src/BootstrapBlazor/Components/EditorForm/EditorItem.cs
+++ b/src/BootstrapBlazor/Components/EditorForm/EditorItem.cs
@@ -77,6 +77,12 @@ namespace BootstrapBlazor.Components
         [Parameter]
         public RenderFragment<object>? EditTemplate { get; set; }
 
+        /// <summary>
+        /// 获得/设置 组件类型 默认为 null
+        /// </summary>
+        [Parameter]
+        public Type? ComponentType { get; set; }
+
         /// <summary>
         /// 获得/设置 显示顺序
         /// </summary>
diff --git a/src/BootstrapBlazor/Components/EditorForm/IEditorItem.cs b/src/BootstrapBlazor/Components/EditorForm/IEditorItem.cs
index 5f536df63..3eab07172 100644
--- a/src/BootstrapBlazor/Components/EditorForm/IEditorItem.cs
+++ b/src/BootstrapBlazor/Components/EditorForm/IEditorItem.cs
@@ -43,7 +43,7 @@ namespace BootstrapBlazor.Components
         /// </summary>
         object? Step { get; set; }
 
-         /// <summary>
+        /// <summary>
         /// 获得/设置 Textarea 行数 默认为 0
         /// </summary>
         int Rows { get; set; }
@@ -53,6 +53,11 @@ namespace BootstrapBlazor.Components
         /// </summary>
         RenderFragment<object>? EditTemplate { get; set; }
 
+        /// <summary>
+        /// 获得/设置 组件类型 默认为 null
+        /// </summary>
+        Type? ComponentType { get; set; }
+
         /// <summary>
         /// 获取绑定字段显示名称方法
         /// </summary>
diff --git a/src/BootstrapBlazor/Components/Table/InternalTableColumn.cs b/src/BootstrapBlazor/Components/Table/InternalTableColumn.cs
index e71e67b26..742c22a94 100644
--- a/src/BootstrapBlazor/Components/Table/InternalTableColumn.cs
+++ b/src/BootstrapBlazor/Components/Table/InternalTableColumn.cs
@@ -71,6 +71,11 @@ namespace BootstrapBlazor.Components
 
         public RenderFragment<object>? EditTemplate { get; set; }
 
+        /// <summary>
+        /// 获得/设置 组件类型 默认为 null
+        /// </summary>
+        public Type? ComponentType { get; set; }
+
         /// <summary>
         /// 获得/设置 额外数据源一般用于下拉框或者 CheckboxList 这种需要额外配置数据源组件使用
         /// </summary>
diff --git a/src/BootstrapBlazor/Components/Table/TableColumn.cs b/src/BootstrapBlazor/Components/Table/TableColumn.cs
index c84eb1139..a0e57b91b 100644
--- a/src/BootstrapBlazor/Components/Table/TableColumn.cs
+++ b/src/BootstrapBlazor/Components/Table/TableColumn.cs
@@ -25,6 +25,12 @@ namespace BootstrapBlazor.Components
         /// </summary>
         public IFilter? Filter { get; set; }
 
+        /// <summary>
+        /// 获得/设置 组件类型 默认为 null
+        /// </summary>
+        [Parameter]
+        public Type? ComponentType { get; set; }
+
         /// <summary>
         /// 获得/设置 绑定列类型
         /// </summary>
@@ -254,6 +260,6 @@ namespace BootstrapBlazor.Components
         /// </summary>
         public string GetFieldName() => _fieldIdentifier?.FieldName ?? "";
 
-        private static readonly ConcurrentDictionary<(Type ModelType, string FieldName), Func<object, TType>> GetPropertyCache = new ConcurrentDictionary<(Type, string), Func<object, TType>>();
+        private static readonly ConcurrentDictionary<(Type ModelType, string FieldName), Func<object, TType>> GetPropertyCache = new();
     }
 }
-- 
Gitee


From d6f1564c9d541956840e964f8af7fc5c0eca6c20 Mon Sep 17 00:00:00 2001
From: Argo-Cloud <argo@163.com>
Date: Wed, 24 Mar 2021 01:13:25 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E7=BB=84=E4=BB=B6=E5=86=85?=
 =?UTF-8?q?=E9=83=A8=E5=A4=84=E7=90=86=20bool=20=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=91=88=E7=8E=B0=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/EditorForm/EditorForm.razor.cs          |  2 +-
 src/BootstrapBlazor/Components/Table/Table.razor.cs    | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/BootstrapBlazor/Components/EditorForm/EditorForm.razor.cs b/src/BootstrapBlazor/Components/EditorForm/EditorForm.razor.cs
index f039e5067..16574c2d1 100644
--- a/src/BootstrapBlazor/Components/EditorForm/EditorForm.razor.cs
+++ b/src/BootstrapBlazor/Components/EditorForm/EditorForm.razor.cs
@@ -212,7 +212,7 @@ namespace BootstrapBlazor.Components
                 var tDelegate = typeof(Func<>).MakeGenericType(fieldType);
                 var valueExpression = Expression.Lambda(tDelegate, body);
 
-                var componentType = EditorForm<TModel>.GenerateComponent(fieldType, item.Rows != 0);
+                var componentType = item.ComponentType ?? EditorForm<TModel>.GenerateComponent(fieldType, item.Rows != 0);
                 builder.OpenComponent(0, componentType);
                 builder.AddAttribute(1, "DisplayText", displayName);
                 builder.AddAttribute(2, "Value", fieldValue);
diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.cs b/src/BootstrapBlazor/Components/Table/Table.razor.cs
index 7e5038226..39cf4426c 100644
--- a/src/BootstrapBlazor/Components/Table/Table.razor.cs
+++ b/src/BootstrapBlazor/Components/Table/Table.razor.cs
@@ -610,6 +610,16 @@ namespace BootstrapBlazor.Components
             {
                 var content = "";
                 var val = Table<TItem>.GetItemValue(col.GetFieldName(), item);
+
+                // 自动化处理 bool 值
+                if (val is bool && col.ComponentType != null)
+                {
+                    builder.OpenComponent(0, col.ComponentType);
+                    builder.AddAttribute(1, "Value", val);
+                    builder.AddAttribute(2, "IsDisabled", true);
+                    builder.CloseComponent();
+                    return;
+                }
                 if (col.Formatter != null)
                 {
                     // 格式化回调委托
-- 
Gitee


From d7aa19fb970477a0b02cdd7e51878e3e59bafc5b Mon Sep 17 00:00:00 2001
From: Argo-Cloud <argo@163.com>
Date: Wed, 24 Mar 2021 01:14:44 +0800
Subject: [PATCH 3/3] =?UTF-8?q?docs:=20=E7=A7=BB=E9=99=A4=E5=B8=83?=
 =?UTF-8?q?=E5=B0=94=E7=B1=BB=E5=9E=8B=E6=95=B0=E6=8D=AE=E6=B8=B2=E6=9F=93?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/DataDialogComponent.razor      |  7 ---
 .../Pages/Components/Foo.cs                   |  2 +-
 .../Pages/Samples/EditorForms.razor           |  7 ---
 .../Samples/Table/TablesAutoRefresh.razor     |  6 +-
 .../Pages/Samples/Table/TablesColumn.razor    | 13 +---
 .../Pages/Samples/Table/TablesDetailRow.razor | 18 +-----
 .../Samples/Table/TablesDetailRow.razor.cs    | 11 ++--
 .../Pages/Samples/Table/TablesEdit.razor      | 61 +++----------------
 .../Samples/Table/TablesFixedColumn.razor     | 24 ++------
 .../Pages/Samples/Table/TablesWrap.razor      |  6 +-
 10 files changed, 24 insertions(+), 131 deletions(-)

diff --git a/src/BootstrapBlazor.Shared/Pages/Components/DataDialogComponent.razor b/src/BootstrapBlazor.Shared/Pages/Components/DataDialogComponent.razor
index 8d412a422..e48331bf9 100644
--- a/src/BootstrapBlazor.Shared/Pages/Components/DataDialogComponent.razor
+++ b/src/BootstrapBlazor.Shared/Pages/Components/DataDialogComponent.razor
@@ -12,13 +12,6 @@
         <EditorForm TModel="Foo">
             <FieldItems>
                 <EditorItem @bind-Field="@context.Id" Editable="false" />
-                <EditorItem @bind-Field="@context.Complete">
-                    <EditTemplate Context="value">
-                        <div class="form-group col-12 col-sm-6">
-                            <Switch @bind-Value="@(((Foo)value).Complete)" ShowInnerText="true" OnInnerText="是" OffInnerText="否" />
-                        </div>
-                    </EditTemplate>
-                </EditorItem>
                 <EditorItem @bind-Field="@context.Hobby" Data="@Hobbys" />
             </FieldItems>
         </EditorForm>
diff --git a/src/BootstrapBlazor.Shared/Pages/Components/Foo.cs b/src/BootstrapBlazor.Shared/Pages/Components/Foo.cs
index b2a8d0988..8f2de63f8 100644
--- a/src/BootstrapBlazor.Shared/Pages/Components/Foo.cs
+++ b/src/BootstrapBlazor.Shared/Pages/Components/Foo.cs
@@ -61,7 +61,7 @@ namespace BootstrapBlazor.Shared.Pages.Components
         ///
         /// </summary>
         [Display(Name = "是/否")]
-        [AutoGenerateColumn(Order = 50)]
+        [AutoGenerateColumn(Order = 50, ComponentType = typeof(Switch))]
         public bool Complete { get; set; }
 
         /// <summary>
diff --git a/src/BootstrapBlazor.Shared/Pages/Samples/EditorForms.razor b/src/BootstrapBlazor.Shared/Pages/Samples/EditorForms.razor
index a14e41a88..bb953574f 100644
--- a/src/BootstrapBlazor.Shared/Pages/Samples/EditorForms.razor
+++ b/src/BootstrapBlazor.Shared/Pages/Samples/EditorForms.razor
@@ -56,13 +56,6 @@
                             </div>
                         </EditTemplate>
                     </EditorItem>
-                    <EditorItem @bind-Field="@Model.Complete">
-                        <EditTemplate Context="value">
-                            <div class="form-group col-6">
-                                <Switch @bind-Value="((Foo)value).Complete" />
-                            </div>
-                        </EditTemplate>
-                    </EditorItem>
                 </FieldItems>
                 <Buttons>
                     <Button ButtonType="ButtonType.Submit" Icon="fa fa-save" Text="提交" />
diff --git a/src/BootstrapBlazor.Shared/Pages/Samples/Table/TablesAutoRefresh.razor b/src/BootstrapBlazor.Shared/Pages/Samples/Table/TablesAutoRefresh.razor
index 91eb458c7..43da9a5b8 100644
--- a/src/BootstrapBlazor.Shared/Pages/Samples/Table/TablesAutoRefresh.razor
+++ b/src/BootstrapBlazor.Shared/Pages/Samples/Table/TablesAutoRefresh.razor
@@ -18,11 +18,7 @@
             <TableColumn @bind-Field="@context.Name" Width="100" />
             <TableColumn @bind-Field="@context.Address" />
             <TableColumn @bind-Field="@context.Count" />
-            <TableColumn @bind-Field="@context.Complete">
-                <Template Context="v">
-                    <Switch IsDisabled="true" Value="v.Value" ShowInnerText="true" OnInnerText="是" OffInnerText="否" />
-                </Template>
-            </TableColumn>
+            <TableColumn @bind-Field="@context.Complete" ComponentType="typeof(Switch)" />
         </TableColumns>
     </Table>
 </Block>
diff --git a/src/BootstrapBlazor.Shared/Pages/Samples/Table/TablesColumn.razor b/src/BootstrapBlazor.Shared/Pages/Samples/Table/TablesColumn.razor
index 108b03d9f..7819c8ef8 100644
--- a/src/BootstrapBlazor.Shared/Pages/Samples/Table/TablesColumn.razor
+++ b/src/BootstrapBlazor.Shared/Pages/Samples/Table/TablesColumn.razor
@@ -210,11 +210,7 @@
             <TableColumn @bind-Field="@context.Address" Text="地址" Width="290" />
             <TableColumn @bind-Field="@context.Education" />
             <TableColumn @bind-Field="@context.Count" Visible="false" />
-            <TableColumn @bind-Field="@context.Complete">
-                <Template Context="v">
-                    <Switch IsDisabled="true" Value="v.Value" ShowInnerText="true" OnInnerText="是" OffInnerText="否" />
-                </Template>
-            </TableColumn>
+            <TableColumn @bind-Field="@context.Complete" ComponentType="@typeof(Switch)" />
         </TableColumns>
     </Table>
 </Block>
@@ -249,12 +245,5 @@
            IsStriped="true" IsBordered="true" AutoGenerateColumns="true"
            ShowToolbar="false" IsMultipleSelect="true" ShowExtendButtons="false"
            OnQueryAsync="@OnQueryAsync">
-        <TableColumns>
-            <TableColumn @bind-Field="@context.Complete">
-                <Template Context="v">
-                    <Switch IsDisabled="true" Value="v.Value" ShowInnerText="true" OnInnerText="是" OffInnerText="否" />
-                </Template>
-            </TableColumn>
-        </TableColumns>
     </Table>
 </Block>
diff --git a/src/BootstrapBlazor.Shared/Pages/Samples/Table/TablesDetailRow.razor b/src/BootstrapBlazor.Shared/Pages/Samples/Table/TablesDetailRow.razor
index 0451d9267..f25f3f4a2 100644
--- a/src/BootstrapBlazor.Shared/Pages/Samples/Table/TablesDetailRow.razor
+++ b/src/BootstrapBlazor.Shared/Pages/Samples/Table/TablesDetailRow.razor
@@ -56,11 +56,7 @@
                 <TableColumns Context="Detail">
                     <TableColumn @bind-Field="@Detail.Name" />
                     <TableColumn @bind-Field="@Detail.DateTime" Width="180" />
-                    <TableColumn @bind-Field="@context.Complete" Width="70">
-                        <Template Context="v">
-                            <Switch IsDisabled="true" Value="v.Value" ShowInnerText="true" OnInnerText="是" OffInnerText="否" />
-                        </Template>
-                    </TableColumn>
+                    <TableColumn @bind-Field="@context.Complete" Width="70" ComponentType="@typeof(Switch)" />
                 </TableColumns>
             </Table>
         </DetailRowTemplate>
@@ -114,17 +110,7 @@
                             Cache.Add(cacheKey, DetailDataSource);
                         }
                     }
-                    <Table TItem="DetailRow" IsBordered="true" ShowToolbar="false" Items="@DetailDataSource">
-                        <TableColumns Context="Detail">
-                            <TableColumn @bind-Field="@Detail.Name" />
-                            <TableColumn @bind-Field="@Detail.DateTime" Width="180" />
-                            <TableColumn @bind-Field="@context.Complete" Width="70">
-                                <Template Context="v">
-                                    <Switch IsDisabled="true" Value="v.Value" ShowInnerText="true" OnInnerText="是" OffInnerText="否" />
-                                </Template>
-                            </TableColumn>
-                        </TableColumns>
-                    </Table>
+                    <Table TItem="DetailRow" IsBordered="true" ShowToolbar="false" Items="@DetailDataSource" AutoGenerateColumns="true" />
                 </TabItem>
                 <TabItem Text="关联数据">
                     <div>学历: @typeof(EnumEducation).ToDescriptionString(context.Education.ToString())</div>
diff --git a/src/BootstrapBlazor.Shared/Pages/Samples/Table/TablesDetailRow.razor.cs b/src/BootstrapBlazor.Shared/Pages/Samples/Table/TablesDetailRow.razor.cs
index f46c035a0..25e340e43 100644
--- a/src/BootstrapBlazor.Shared/Pages/Samples/Table/TablesDetailRow.razor.cs
+++ b/src/BootstrapBlazor.Shared/Pages/Samples/Table/TablesDetailRow.razor.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 // Website: https://www.blazor.zone or https://argozhang.github.io/
 
+using BootstrapBlazor.Components;
 using BootstrapBlazor.Shared.Pages.Components;
 using System;
 using System.Collections.Generic;
@@ -15,7 +16,7 @@ namespace BootstrapBlazor.Shared.Pages.Table
     /// </summary>
     public sealed partial class TablesDetailRow
     {
-        private IEnumerable<DetailRow> GetDetailRowsByName(string name) => Enumerable.Range(1, 4).Select(i => new DetailRow()
+        private static IEnumerable<DetailRow> GetDetailRowsByName(string name) => Enumerable.Range(1, 4).Select(i => new DetailRow()
         {
             Id = i,
             Name = name,
@@ -35,24 +36,24 @@ namespace BootstrapBlazor.Shared.Pages.Table
             /// 
             /// </summary>
             [DisplayName("培训课程")]
+            [AutoGenerateColumn(Order = 10)]
             public string Name { get; set; } = "";
 
             /// <summary>
             /// 
             /// </summary>
             [DisplayName("日期")]
+            [AutoGenerateColumn(Order = 20, Width = 180)]
             public DateTime DateTime { get; set; }
 
             /// <summary>
             /// 
             /// </summary>
             [DisplayName("是/否")]
+            [AutoGenerateColumn(Order = 30, Width = 70, ComponentType = typeof(Switch))]
             public bool Complete { get; set; }
         }
 
-        private bool ShowDetailRow(Foo item)
-        {
-            return item.Complete;
-        }
+        private static bool ShowDetailRow(Foo item) => item.Complete;
     }
 }
diff --git a/src/BootstrapBlazor.Shared/Pages/Samples/Table/TablesEdit.razor b/src/BootstrapBlazor.Shared/Pages/Samples/Table/TablesEdit.razor
index 67541305d..5799d8853 100644
--- a/src/BootstrapBlazor.Shared/Pages/Samples/Table/TablesEdit.razor
+++ b/src/BootstrapBlazor.Shared/Pages/Samples/Table/TablesEdit.razor
@@ -16,30 +16,22 @@
             <TableColumn @bind-Field="@context.Address" />
             <TableColumn @bind-Field="@context.Education" />
             <TableColumn @bind-Field="@context.Count" />
-            <TableColumn @bind-Field="@context.Complete">
-                <Template Context="v">
-                    <Switch IsDisabled="true" Value="v.Value" ShowInnerText="true" />
-                </Template>
-            </TableColumn>
+            <TableColumn @bind-Field="@context.Complete" ComponentType="@typeof(Switch)" />
         </TableColumns>
         <EditTemplate>
             <div class="form-inline">
                 <div class="row">
                     <div class="form-group col-12 col-sm-6">
-                        <BootstrapInput @bind-Value="@context.Name" placeholder="不可为空，50字以内" maxlength="50">
-                        </BootstrapInput>
+                        <BootstrapInput @bind-Value="@context.Name" placeholder="不可为空，50字以内" maxlength="50" />
                     </div>
                     <div class="form-group col-12 col-sm-6">
-                        <BootstrapInput @bind-Value="@context.Address" placeholder="不可为空，50字以内" maxlength="50">
-                        </BootstrapInput>
+                        <BootstrapInput @bind-Value="@context.Address" placeholder="不可为空，50字以内" maxlength="50" />
                     </div>
                     <div class="form-group col-12 col-sm-6">
-                        <DateTimePicker @bind-Value="@context.DateTime">
-                        </DateTimePicker>
+                        <DateTimePicker @bind-Value="@context.DateTime" />
                     </div>
                     <div class="form-group col-12 col-sm-6">
-                        <Select Items="@Educations" @bind-Value="@context.Education">
-                        </Select>
+                        <Select Items="@Educations" @bind-Value="@context.Education" />
                     </div>
                     <div class="form-group col-12 col-sm-6">
                         <BootstrapInput @bind-Value="@context.Count" />
@@ -71,16 +63,7 @@
             <TableColumn @bind-Field="@context.Address" Rows="3" />
             <TableColumn @bind-Field="@context.Education" />
             <TableColumn @bind-Field="@context.Count" Editable="false" />
-            <TableColumn @bind-Field="@context.Complete">
-                <Template Context="v">
-                    <Switch IsDisabled="true" Value="v.Value" ShowInnerText="true" OnInnerText="是" OffInnerText="否" />
-                </Template>
-                <EditTemplate Context="v">
-                    <div class="form-group col-12 col-sm-6">
-                        <Switch @bind-Value="(v as Foo)!.Complete" ShowInnerText="true" OnInnerText="是" OffInnerText="否" />
-                    </div>
-                </EditTemplate>
-            </TableColumn>
+            <TableColumn @bind-Field="@context.Complete" ComponentType="@typeof(Switch)" />
         </TableColumns>
     </Table>
 </Block>
@@ -105,16 +88,7 @@
             <TableColumn @bind-Field="@context.Address" />
             <TableColumn @bind-Field="@context.Education" />
             <TableColumn @bind-Field="@context.Count" />
-            <TableColumn @bind-Field="@context.Complete">
-                <Template Context="v">
-                    <Switch IsDisabled="true" Value="v.Value" ShowInnerText="true" OnInnerText="是" OffInnerText="否" />
-                </Template>
-                <EditTemplate Context="v">
-                    <div class="form-group col-12 col-sm-6">
-                        <Switch @bind-Value="(v as Foo)!.Complete" ShowInnerText="true" OnInnerText="是" OffInnerText="否" />
-                    </div>
-                </EditTemplate>
-            </TableColumn>
+            <TableColumn @bind-Field="@context.Complete" ComponentType="@typeof(Switch)" />
         </TableColumns>
     </Table>
 </Block>
@@ -141,16 +115,7 @@
             <TableColumn @bind-Field="@context.Address" />
             <TableColumn @bind-Field="@context.Education" />
             <TableColumn @bind-Field="@context.Count" />
-            <TableColumn @bind-Field="@context.Complete">
-                <Template Context="v">
-                    <Switch IsDisabled="true" Value="v.Value" ShowInnerText="true" OnInnerText="是" OffInnerText="否" />
-                </Template>
-                <EditTemplate Context="v">
-                    <div class="form-group col-12 col-sm-6">
-                        <Switch @bind-Value="(v as Foo)!.Complete" ShowInnerText="true" OnInnerText="是" OffInnerText="否" />
-                    </div>
-                </EditTemplate>
-            </TableColumn>
+            <TableColumn @bind-Field="@context.Complete" ComponentType="@typeof(Switch)" />
         </TableColumns>
     </Table>
 </Block>
@@ -174,16 +139,6 @@
            IsStriped="true" IsBordered="true" IsMultipleSelect="true" AutoGenerateColumns="true"
            ShowToolbar="true" ShowExtendButtons="true" ShowSkeleton="true" UseInjectDataService="true">
         <TableColumns>
-            <TableColumn @bind-Field="@context.Complete">
-                <Template Context="v">
-                    <Switch IsDisabled="true" Value="v.Value" ShowInnerText="true" OnInnerText="是" OffInnerText="否" />
-                </Template>
-                <EditTemplate Context="v">
-                    <div class="form-group col-12 col-sm-6">
-                        <Switch @bind-Value="(v as Foo)!.Complete" ShowInnerText="true" OnInnerText="是" OffInnerText="否" />
-                    </div>
-                </EditTemplate>
-            </TableColumn>
             <TableColumn @bind-Field="@context.Hobby" Data="@Hobbys" />
         </TableColumns>
     </Table>
diff --git a/src/BootstrapBlazor.Shared/Pages/Samples/Table/TablesFixedColumn.razor b/src/BootstrapBlazor.Shared/Pages/Samples/Table/TablesFixedColumn.razor
index 64ee4f66d..1499c53f1 100644
--- a/src/BootstrapBlazor.Shared/Pages/Samples/Table/TablesFixedColumn.razor
+++ b/src/BootstrapBlazor.Shared/Pages/Samples/Table/TablesFixedColumn.razor
@@ -17,11 +17,7 @@
             <TableColumn @bind-Field="@context.Address" Width="900" />
             <TableColumn @bind-Field="@context.Education" Width="100" />
             <TableColumn @bind-Field="@context.Count" Width="100" />
-            <TableColumn @bind-Field="@context.Complete" Width="100" Fixed="true">
-                <Template Context="v">
-                    <Switch IsDisabled="true" Value="v.Value" ShowInnerText="true" OnInnerText="是" OffInnerText="否" />
-                </Template>
-            </TableColumn>
+            <TableColumn @bind-Field="@context.Complete" Width="100" Fixed="true" ComponentType="@typeof(Switch)" />
         </TableColumns>
     </Table>
 </Block>
@@ -34,11 +30,7 @@
             <TableColumn @bind-Field="@context.Address" Width="900" />
             <TableColumn @bind-Field="@context.Education" Width="100" />
             <TableColumn @bind-Field="@context.Count" Width="100" />
-            <TableColumn @bind-Field="@context.Complete" Width="100" Fixed="true">
-                <Template Context="v">
-                    <Switch IsDisabled="true" Value="v.Value" ShowInnerText="true" OnInnerText="是" OffInnerText="否" />
-                </Template>
-            </TableColumn>
+            <TableColumn @bind-Field="@context.Complete" Width="100" Fixed="true" ComponentType="@typeof(Switch)" />
         </TableColumns>
     </Table>
 </Block>
@@ -53,11 +45,7 @@
             <TableColumn @bind-Field="@context.Address" Width="900" />
             <TableColumn @bind-Field="@context.Education" Width="100" />
             <TableColumn @bind-Field="@context.Count" Width="100" />
-            <TableColumn @bind-Field="@context.Complete" Width="100" Fixed="true">
-                <Template Context="v">
-                    <Switch IsDisabled="true" Value="v.Value" ShowInnerText="true" OnInnerText="是" OffInnerText="否" />
-                </Template>
-            </TableColumn>
+            <TableColumn @bind-Field="@context.Complete" Width="100" Fixed="true" ComponentType="@typeof(Switch)" />
         </TableColumns>
     </Table>
 </Block>
@@ -72,11 +60,7 @@
             <TableColumn @bind-Field="@context.Address" Width="900" />
             <TableColumn @bind-Field="@context.Education" Width="100" />
             <TableColumn @bind-Field="@context.Count" Width="100" />
-            <TableColumn @bind-Field="@context.Complete" Width="100" Fixed="true">
-                <Template Context="v">
-                    <Switch IsDisabled="true" Value="v.Value" ShowInnerText="true" OnInnerText="是" OffInnerText="否" />
-                </Template>
-            </TableColumn>
+            <TableColumn @bind-Field="@context.Complete" Width="100" Fixed="true" ComponentType="@typeof(Switch)" />
         </TableColumns>
     </Table>
 </Block>
diff --git a/src/BootstrapBlazor.Shared/Pages/Samples/Table/TablesWrap.razor b/src/BootstrapBlazor.Shared/Pages/Samples/Table/TablesWrap.razor
index 7c276b95a..3b8e1fbc9 100644
--- a/src/BootstrapBlazor.Shared/Pages/Samples/Table/TablesWrap.razor
+++ b/src/BootstrapBlazor.Shared/Pages/Samples/Table/TablesWrap.razor
@@ -52,11 +52,7 @@
             <TableColumn @bind-Field="@context.Address" Text="地址" Width="200" TextEllipsis="true" ShowTips="true" />
             <TableColumn @bind-Field="@context.Education" />
             <TableColumn @bind-Field="@context.Count" />
-            <TableColumn @bind-Field="@context.Complete">
-                <Template Context="v">
-                    <Switch IsDisabled="true" Value="v.Value" ShowInnerText="true" OnInnerText="是" OffInnerText="否" />
-                </Template>
-            </TableColumn>
+            <TableColumn @bind-Field="@context.Complete" ComponentType="@typeof(Switch)" />
         </TableColumns>
     </Table>
 </Block>
-- 
Gitee