From 5f76e92271debfc6c70dfec4550b4affc1a723f0 Mon Sep 17 00:00:00 2001
From: Argo-Tianyi <argo@163.com>
Date: Fri, 13 Aug 2021 00:08:01 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20EditDialog=20?=
 =?UTF-8?q?=E6=9C=AA=E5=88=A4=E6=96=AD=20Enaable=20=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/BootstrapBlazor/Components/EditorForm/EditorForm.razor.cs b/src/BootstrapBlazor/Components/EditorForm/EditorForm.razor.cs
index 5b811fd28..85b103da5 100644
--- a/src/BootstrapBlazor/Components/EditorForm/EditorForm.razor.cs
+++ b/src/BootstrapBlazor/Components/EditorForm/EditorForm.razor.cs
@@ -180,7 +180,7 @@ namespace BootstrapBlazor.Components
                 if (CascadeEditorItems != null)
                 {
                     // 通过级联参数渲染组件
-                    FormItems.AddRange(CascadeEditorItems);
+                    FormItems.AddRange(CascadeEditorItems.Where(i => i.Editable));
                 }
                 else
                 {
-- 
Gitee


From 96570ded521bbab2a4396913ec12d70dde711140 Mon Sep 17 00:00:00 2001
From: Argo-Tianyi <argo@163.com>
Date: Fri, 13 Aug 2021 00:08:23 +0800
Subject: [PATCH 2/3] =?UTF-8?q?doc:=20=E5=A2=9E=E5=8A=A0=20EditDialog=20?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E7=A4=BA=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/Samples/EditDialogs.razor           |  4 +++
 .../Pages/Samples/EditDialogs.razor.cs        | 34 +++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/src/BootstrapBlazor.Shared/Pages/Samples/EditDialogs.razor b/src/BootstrapBlazor.Shared/Pages/Samples/EditDialogs.razor
index b50651db8..8145db462 100644
--- a/src/BootstrapBlazor.Shared/Pages/Samples/EditDialogs.razor
+++ b/src/BootstrapBlazor.Shared/Pages/Samples/EditDialogs.razor
@@ -16,4 +16,8 @@
     <Logger @ref="Trace" class="mt-3" />
 </Block>
 
+<Block Title="设置绑定模型部分属性不显示" Introduction="通过设置 <code>IEditorItem</code> 实例的 <code>Editable=false</code>, 实现编辑弹窗不显示此属性">
+    <Button Text="弹窗" OnClickWithoutRender="@ShowEditDialog" />
+</Block>
+
 <AttributeTable Items="@GetAttributes()" Title="EditDialogOption 属性" />
diff --git a/src/BootstrapBlazor.Shared/Pages/Samples/EditDialogs.razor.cs b/src/BootstrapBlazor.Shared/Pages/Samples/EditDialogs.razor.cs
index 0702e0c0c..4d544084d 100644
--- a/src/BootstrapBlazor.Shared/Pages/Samples/EditDialogs.razor.cs
+++ b/src/BootstrapBlazor.Shared/Pages/Samples/EditDialogs.razor.cs
@@ -93,6 +93,40 @@ namespace BootstrapBlazor.Shared.Pages
             await DialogService.ShowEditDialog(option);
         }
 
+        private async Task ShowEditDialog()
+        {
+            var items = EditorItem<Foo>.GenerateEditorItems();
+            var item = items.First(i => i.GetFieldName() == nameof(Foo.Hobby));
+            item.Data = Foo.GenerateHobbys(Localizer);
+
+            // 设置 地址与数量 不可编辑
+            item = items.First(i => i.GetFieldName() == nameof(Foo.Address));
+            item.Editable = false;
+            item = items.First(i => i.GetFieldName() == nameof(Foo.Count));
+            item.Editable = false;
+
+            var option = new EditDialogOption<Foo>()
+            {
+                Title = "编辑对话框",
+                Model = Model,
+                Items = items,
+                ItemsPerRow = 2,
+                RowType = RowType.Inline,
+                OnCloseAsync = () =>
+                {
+                    Trace.Log("关闭按钮被点击");
+                    return Task.CompletedTask;
+                },
+                OnSaveAsync = context =>
+                {
+                    Trace.Log("保存按钮被点击");
+                    return Task.FromResult(true);
+                }
+            };
+
+            await DialogService.ShowEditDialog(option);
+        }
+
         /// <summary>
         /// 获得属性方法
         /// </summary>
-- 
Gitee


From 4e537c49ce7b2a083cdc008d9a15b2f60d19c0f7 Mon Sep 17 00:00:00 2001
From: Argo-Tianyi <argo@163.com>
Date: Fri, 13 Aug 2021 00:10:51 +0800
Subject: [PATCH 3/3] =?UTF-8?q?doc:=20=E6=A0=BC=E5=BC=8F=E5=8C=96=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/Samples/EditDialogs.razor                    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/BootstrapBlazor.Shared/Pages/Samples/EditDialogs.razor b/src/BootstrapBlazor.Shared/Pages/Samples/EditDialogs.razor
index 8145db462..81ffadab8 100644
--- a/src/BootstrapBlazor.Shared/Pages/Samples/EditDialogs.razor
+++ b/src/BootstrapBlazor.Shared/Pages/Samples/EditDialogs.razor
@@ -7,17 +7,17 @@
 <p><code>EditDialog</code> 组件是 <code>Dialog</code> 组件的扩展，适用于数据弹出窗编辑。</p>
 
 <Tips>
-    <p>通过调用注入服务 <code>DialogService</code> 的 <code>ShowEditDialog</code> 方法直接弹出编辑对话框，大大减少代码量。<code>EditDialogOption</code> 配置类继承 <code>DialogOption</code>，更多参数设置请点击 <a href="dialogs" target="_blank">[传送门]</a></p>
+	<p>通过调用注入服务 <code>DialogService</code> 的 <code>ShowEditDialog</code> 方法直接弹出编辑对话框，大大减少代码量。<code>EditDialogOption</code> 配置类继承 <code>DialogOption</code>，更多参数设置请点击 <a href="dialogs" target="_blank">[传送门]</a></p>
 </Tips>
 
 <Block Title="基础用法" Introduction="通过绑定 <code>TModel</code> 数据模型，自动生成模型各个字段的可编辑表单">
-    <Button Text="编辑弹窗(左对齐)" OnClickWithoutRender="@ShowDialog" />
-    <Button Text="编辑弹窗(右对齐)" OnClickWithoutRender="@ShowAlignDialog" />
-    <Logger @ref="Trace" class="mt-3" />
+	<Button Text="编辑弹窗(左对齐)" OnClickWithoutRender="@ShowDialog" />
+	<Button Text="编辑弹窗(右对齐)" OnClickWithoutRender="@ShowAlignDialog" />
+	<Logger @ref="Trace" class="mt-3" />
 </Block>
 
 <Block Title="设置绑定模型部分属性不显示" Introduction="通过设置 <code>IEditorItem</code> 实例的 <code>Editable=false</code>, 实现编辑弹窗不显示此属性">
-    <Button Text="弹窗" OnClickWithoutRender="@ShowEditDialog" />
+	<Button Text="弹窗" OnClickWithoutRender="@ShowEditDialog" />
 </Block>
 
 <AttributeTable Items="@GetAttributes()" Title="EditDialogOption 属性" />
-- 
Gitee