From e6766ce55019f44e4606371dd8994ea252d61987 Mon Sep 17 00:00:00 2001
From: Argo <argo@163.com>
Date: Sat, 31 Jul 2021 16:35:54 +0000
Subject: [PATCH] =?UTF-8?q?!1661=20feat(#I43BWW):=20SearchDialog=20add=20i?=
 =?UTF-8?q?nline=20layout=20*=20doc:=20SearchDialog=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=A1=8C=E5=B8=83=E5=B1=80=E7=A4=BA=E4=BE=8B=20*=20feat:=20Sea?=
 =?UTF-8?q?rchDialog=20=E6=94=AF=E6=8C=81=E8=A1=8C=E5=B8=83=E5=B1=80?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=20*=20feat:=20DialogBase=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=A1=8C=E5=B8=83=E5=B1=80=E5=8F=82=E6=95=B0=20*=20fe?=
 =?UTF-8?q?at:=20EditForm=20=E6=94=AF=E6=8C=81=20inline=20=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=20*=20doc:=20=E6=9B=B4=E6=96=B0=20Row=20inline=20?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E7=A4=BA=E4=BE=8B=20*=20chore:=20=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E6=89=93=E5=8C=85=E8=84=9A=E6=9C=AC=E4=B8=8E=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=20*=20doc:=20=E6=9B=B4=E6=96=B0=E6=B3=A8=E9=87=8A=20*?=
 =?UTF-8?q?=20style:=20=E9=80=82=E9=85=8D=20CheckboxList=20=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=20inline=20=E5=B8=83=E5=B1=80=20*=20style:=20?=
 =?UTF-8?q?=E9=80=82=E9=85=8D=20inline=20=E6=A8=A1=E5=BC=8F=E4=B8=8B=20swi?=
 =?UTF-8?q?tch=20=E7=BB=84=E4=BB=B6=20*=20style:=20=E4=BF=AE=E5=A4=8D=20in?=
 =?UTF-8?q?line=20=E6=A8=A1=E5=BC=8F=E4=B8=8B=E5=9E=82=E7=9B=B4=E5=AF=B9?=
 =?UTF-8?q?=E9=BD=90=E9=97=AE=E9=A2=98=20*=20feat:=20=E5=A2=9E=E5=8A=A0=20?=
 =?UTF-8?q?inline=20=E6=A8=A1=E5=BC=8F=20*=20feat:=20=E5=A2=9E=E5=8A=A0=20?=
 =?UTF-8?q?inline=20=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/Samples/SearchDialogs.razor         |  4 +++
 .../Pages/Samples/SearchDialogs.razor.cs      | 27 +++++++++++++++++++
 .../Pages/Samples/Table/TablesSearch.razor    |  2 +-
 .../Components/Dialog/DialogBase.cs           | 12 +++++++++
 .../Components/Dialog/DialogService.cs        |  9 ++++++-
 .../Components/Dialog/SearchDialog.razor      |  2 +-
 .../Components/Dialog/SearchDialogOption.cs   | 10 +++++++
 7 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/src/BootstrapBlazor.Shared/Pages/Samples/SearchDialogs.razor b/src/BootstrapBlazor.Shared/Pages/Samples/SearchDialogs.razor
index f44927a07..48816071b 100644
--- a/src/BootstrapBlazor.Shared/Pages/Samples/SearchDialogs.razor
+++ b/src/BootstrapBlazor.Shared/Pages/Samples/SearchDialogs.razor
@@ -19,4 +19,8 @@
     <Button Text="点击弹出搜索弹窗" OnClickWithoutRender="@ShowColumnsDialog" />
 </Block>
 
+<Block Title="设置搜索弹窗内布局方式" Introduction="通过设定 <code>RowType</code> 参数显式设置弹窗内组件布局方式，默认为上下布局，可设置值 <code>inline</code> 水平布局">
+    <Button Text="点击弹出搜索弹窗" OnClickWithoutRender="@ShowInlineDialog" />
+</Block>
+
 <AttributeTable Items="@GetAttributes()" Title="SearchDialogOption 属性" />
diff --git a/src/BootstrapBlazor.Shared/Pages/Samples/SearchDialogs.razor.cs b/src/BootstrapBlazor.Shared/Pages/Samples/SearchDialogs.razor.cs
index df11d07f7..66235f77e 100644
--- a/src/BootstrapBlazor.Shared/Pages/Samples/SearchDialogs.razor.cs
+++ b/src/BootstrapBlazor.Shared/Pages/Samples/SearchDialogs.razor.cs
@@ -62,6 +62,19 @@ namespace BootstrapBlazor.Shared.Pages
             await DialogService.ShowSearchDialog(option);
         }
 
+        private async Task ShowInlineDialog()
+        {
+            var model = new Foo();
+            var option = new SearchDialogOption<Foo>()
+            {
+                Title = "搜索弹出框",
+                RowType = RowType.Inline,
+                Model = model,
+                Items = Utility.GenerateColumns<Foo>(p => p.GetFieldName() == nameof(Foo.Name) || p.GetFieldName() == nameof(Foo.Address))
+            };
+            await DialogService.ShowSearchDialog(option);
+        }
+
         /// <summary>
         /// 获得属性方法
         /// </summary>
@@ -124,6 +137,20 @@ namespace BootstrapBlazor.Shared.Pages
                 Type = "Func<Task>",
                 ValueList = " — ",
                 DefaultValue = " — "
+            },
+            new AttributeItem() {
+                Name = "ItemsPerRow",
+                Description = "每行显示组件数量",
+                Type = "int?",
+                ValueList = " — ",
+                DefaultValue = " — "
+            },
+            new AttributeItem() {
+                Name = "RowType",
+                Description = "设置组件布局方式",
+                Type = "int?",
+                ValueList = "Row|Inline",
+                DefaultValue = "Row"
             }
         };
     }
diff --git a/src/BootstrapBlazor.Shared/Pages/Samples/Table/TablesSearch.razor b/src/BootstrapBlazor.Shared/Pages/Samples/Table/TablesSearch.razor
index 1bb4aa251..2e8e3c4fa 100644
--- a/src/BootstrapBlazor.Shared/Pages/Samples/Table/TablesSearch.razor
+++ b/src/BootstrapBlazor.Shared/Pages/Samples/Table/TablesSearch.razor
@@ -20,7 +20,7 @@
             <TableColumn @bind-Field="@context.Education" />
         </TableColumns>
         <SearchTemplate>
-            <div class="row g-3">
+            <div class="row g-3 form-inline">
                 <div class="col-12 col-sm-6">
                     <BootstrapInput @bind-Value="@context.Name" placeholder="不可为空，50字以内" maxlength="50" ShowLabel="true" DisplayText="@Localizer[nameof(context.Name)]" />
                 </div>
diff --git a/src/BootstrapBlazor/Components/Dialog/DialogBase.cs b/src/BootstrapBlazor/Components/Dialog/DialogBase.cs
index f3c7f29c6..30f509099 100644
--- a/src/BootstrapBlazor/Components/Dialog/DialogBase.cs
+++ b/src/BootstrapBlazor/Components/Dialog/DialogBase.cs
@@ -39,6 +39,18 @@ namespace BootstrapBlazor.Components
         [Parameter]
         public bool ShowLabel { get; set; }
 
+        /// <summary>
+        /// 获得/设置 每行显示组件数量 默认为 null
+        /// </summary>
+        [Parameter]
+        public int? ItemsPerRow { get; set; }
+
+        /// <summary>
+        /// 获得/设置 设置行格式 默认 Row 布局
+        /// </summary>
+        [Parameter]
+        public RowType RowType { get; set; }
+
         /// <summary>
         /// OnInitialized 方法
         /// </summary>
diff --git a/src/BootstrapBlazor/Components/Dialog/DialogService.cs b/src/BootstrapBlazor/Components/Dialog/DialogService.cs
index f05e59927..471e1800f 100644
--- a/src/BootstrapBlazor/Components/Dialog/DialogService.cs
+++ b/src/BootstrapBlazor/Components/Dialog/DialogService.cs
@@ -68,8 +68,15 @@ namespace BootstrapBlazor.Components
                     {
                         await option.OnSearchClick();
                     }
-                }))
+                })),
+                new(nameof(RowType), option.RowType)
             };
+
+            if (option.ItemsPerRow.HasValue)
+            {
+                parameters.Add(new(nameof(ItemsPerRow), option.ItemsPerRow));
+            }
+
             if (!string.IsNullOrEmpty(option.ResetButtonText))
             {
                 parameters.Add(new(nameof(SearchDialogOption<TModel>.ResetButtonText), option.ResetButtonText));
diff --git a/src/BootstrapBlazor/Components/Dialog/SearchDialog.razor b/src/BootstrapBlazor/Components/Dialog/SearchDialog.razor
index 51383143c..ada3d7e78 100644
--- a/src/BootstrapBlazor/Components/Dialog/SearchDialog.razor
+++ b/src/BootstrapBlazor/Components/Dialog/SearchDialog.razor
@@ -10,7 +10,7 @@
 else
 {
     <CascadingValue Value="Items" IsFixed="true">
-        <EditorForm TModel="TModel" Model="Model">
+        <EditorForm TModel="TModel" Model="Model" RowType="RowType" ItemsPerRow="ItemsPerRow">
             <Buttons>
                 @RenderFooter
             </Buttons>
diff --git a/src/BootstrapBlazor/Components/Dialog/SearchDialogOption.cs b/src/BootstrapBlazor/Components/Dialog/SearchDialogOption.cs
index 7f3d6fe03..cc38ede4e 100644
--- a/src/BootstrapBlazor/Components/Dialog/SearchDialogOption.cs
+++ b/src/BootstrapBlazor/Components/Dialog/SearchDialogOption.cs
@@ -31,6 +31,16 @@ namespace BootstrapBlazor.Components
         /// </summary>
         public bool ShowLabel { get; set; }
 
+        /// <summary>
+        /// 获得/设置 每行显示组件数量 默认为 null
+        /// </summary>
+        public int? ItemsPerRow { get; set; }
+
+        /// <summary>
+        /// 获得/设置 设置行内组件布局格式 默认 Row 布局
+        /// </summary>
+        public RowType RowType { get; set; }
+
         /// <summary>
         /// 获得/设置 编辑框模型
         /// </summary>