From 2434b9c2a43f685211f77f5fd4a864570ee1a372 Mon Sep 17 00:00:00 2001
From: Argo-Tianyi <argo@163.com>
Date: Fri, 22 Oct 2021 09:52:44 +0800
Subject: [PATCH 1/3] =?UTF-8?q?doc:=20=E6=9B=B4=E6=96=B0=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/Samples/Table/TablesColumn.razor                     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/BootstrapBlazor.Shared/Pages/Samples/Table/TablesColumn.razor b/src/BootstrapBlazor.Shared/Pages/Samples/Table/TablesColumn.razor
index 22fb4f947..0282b7d91 100644
--- a/src/BootstrapBlazor.Shared/Pages/Samples/Table/TablesColumn.razor
+++ b/src/BootstrapBlazor.Shared/Pages/Samples/Table/TablesColumn.razor
@@ -219,6 +219,7 @@
 </Block>
 
 <Block Title="允许列调整" Introduction="通过指定 <code>AllowResizing</code> 设置表格列允许调整宽度">
+    <p>屏幕过小出现滚动条时才可以进行列调整</p>
     <Table TItem="Foo"
            IsPagination="true" PageItemsSource="@PageItemsSource" AllowResizing="true"
            IsStriped="true" IsBordered="true"
@@ -233,7 +234,7 @@
     </Table>
 </Block>
 
-<Block Title="自定义列模板" Introduction="通过指定 <code>AllowResizing</code> 设置表格列允许调整宽度">
+<Block Title="自定义列模板" Introduction="通过指定 <code>Template</code> 设置最后一列内显示为自定义按钮">
     <Table TItem="Foo"
            IsPagination="true" PageItemsSource="@PageItemsSource"
            IsStriped="true" IsBordered="true"
-- 
Gitee


From 7023e6950d5b8648eaa10ac611615e806b5e26fa Mon Sep 17 00:00:00 2001
From: Argo-Tianyi <argo@163.com>
Date: Fri, 22 Oct 2021 10:01:10 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20ReadonlyWhenAdd?=
 =?UTF-8?q?=20=E6=9C=AA=E7=94=9F=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BootstrapBlazor/Components/Table/InternalTableColumn.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/BootstrapBlazor/Components/Table/InternalTableColumn.cs b/src/BootstrapBlazor/Components/Table/InternalTableColumn.cs
index 235fc2e83..8a83bfc5e 100644
--- a/src/BootstrapBlazor/Components/Table/InternalTableColumn.cs
+++ b/src/BootstrapBlazor/Components/Table/InternalTableColumn.cs
@@ -256,8 +256,8 @@ namespace BootstrapBlazor.Components
             if (source.HeaderTemplate != null) dest.HeaderTemplate = source.HeaderTemplate;
             if (source.Items != null) dest.Items = source.Items;
             if (source.Lookup != null) dest.Lookup = source.Lookup;
-            if (!source.IsReadonlyWhenAdd) dest.IsReadonlyWhenAdd = source.IsReadonlyWhenAdd;
-            if (!source.IsReadonlyWhenEdit) dest.IsReadonlyWhenEdit = source.IsReadonlyWhenEdit;
+            if (source.IsReadonlyWhenAdd) dest.IsReadonlyWhenAdd = source.IsReadonlyWhenAdd;
+            if (source.IsReadonlyWhenEdit) dest.IsReadonlyWhenEdit = source.IsReadonlyWhenEdit;
             if (source.OnCellRender != null) dest.OnCellRender = source.OnCellRender;
             if (source.Readonly) dest.Readonly = source.Readonly;
             if (source.Rows > 0) dest.Rows = source.Rows;
-- 
Gitee


From a4e6e8ad10012ab89460c307b297071d35c7f1c7 Mon Sep 17 00:00:00 2001
From: Argo-Tianyi <argo@163.com>
Date: Fri, 22 Oct 2021 10:35:27 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20bool=20?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B=E8=AE=BE=E7=BD=AE=20Lookup?=
 =?UTF-8?q?=20=E6=97=A0=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BootstrapBlazor/Components/Table/Table.razor.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.cs b/src/BootstrapBlazor/Components/Table/Table.razor.cs
index ce3bbb6fd..98f05fea8 100644
--- a/src/BootstrapBlazor/Components/Table/Table.razor.cs
+++ b/src/BootstrapBlazor/Components/Table/Table.razor.cs
@@ -870,7 +870,7 @@ namespace BootstrapBlazor.Components
                     ? dynamicObject.GetValue(col.GetFieldName())
                     : Table<TItem>.GetItemValue(col.GetFieldName(), item);
 
-                if (val is bool v1)
+                if (col.Lookup == null && val is bool v1)
                 {
                     // 自动化处理 bool 值
                     builder.OpenComponent(0, typeof(Switch));
-- 
Gitee