From 8ce2f2c0c16e7a1a74699bd9ceef86f593569ad3 Mon Sep 17 00:00:00 2001
From: Argo-Cloud <argo@163.com>
Date: Sun, 28 Mar 2021 01:58:34 +0800
Subject: [PATCH 1/3] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=94=B9=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E7=B1=BB=E5=9E=8B=E4=B8=BA=20KeyValuePair<string,=20o?=
 =?UTF-8?q?bject=3F>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/Samples/Dialogs.razor.cs            | 18 +++++-----
 .../Pages/Samples/Menus.razor.cs              |  8 ++---
 .../Pages/Samples/Timelines.razor.cs          |  4 +--
 .../Shared/NavMenu.razor.cs                   |  8 ++---
 .../BootstrapDynamicComponent.cs              |  8 ++---
 .../Components/Dialog/Dialog.razor.cs         | 10 +++---
 .../Components/Dialog/DialogOption.cs         | 21 +++++-------
 .../Components/Dialog/DialogService.cs        | 34 +++++++++----------
 .../Components/Dialog/ResultDialogOption.cs   |  2 +-
 .../Components/EditorForm/EditorForm.razor.cs | 16 ++++-----
 .../Components/SweetAlert/SwalOption.cs       | 16 ++++-----
 .../Components/SweetAlert/SweetAlert.razor.cs | 10 ++++--
 .../SweetAlert/SweetAlertBody.razor.cs        | 34 +++++++++++--------
 13 files changed, 97 insertions(+), 92 deletions(-)

diff --git a/src/BootstrapBlazor.Shared/Pages/Samples/Dialogs.razor.cs b/src/BootstrapBlazor.Shared/Pages/Samples/Dialogs.razor.cs
index d911de51d..119ea4329 100644
--- a/src/BootstrapBlazor.Shared/Pages/Samples/Dialogs.razor.cs
+++ b/src/BootstrapBlazor.Shared/Pages/Samples/Dialogs.razor.cs
@@ -36,9 +36,9 @@ namespace BootstrapBlazor.Shared.Pages
         private Task OnClick() => DialogService.Show(new DialogOption()
         {
             Title = "我是服务创建的弹出框",
-            BodyTemplate = BootstrapDynamicComponent.CreateComponent<Button>(new KeyValuePair<string, object>[]
+            BodyTemplate = BootstrapDynamicComponent.CreateComponent<Button>(new[]
             {
-                new KeyValuePair<string, object>(nameof(Button.ChildContent), new RenderFragment(builder => builder.AddContent(0, "我是服务创建的按钮")))
+                new KeyValuePair<string, object?>(nameof(Button.ChildContent), new RenderFragment(builder => builder.AddContent(0, "我是服务创建的按钮")))
             })
             .Render()
         });
@@ -49,10 +49,10 @@ namespace BootstrapBlazor.Shared.Pages
             {
                 Title = "利用代码关闭弹出框",
             };
-            option.BodyTemplate = BootstrapDynamicComponent.CreateComponent<Button>(new KeyValuePair<string, object>[]
+            option.BodyTemplate = BootstrapDynamicComponent.CreateComponent<Button>(new[]
             {
-                new KeyValuePair<string, object>(nameof(Button.Text), "点击关闭弹窗"),
-                new KeyValuePair<string, object>(nameof(Button.OnClick), EventCallback.Factory.Create<MouseEventArgs>(this, async () => await option.Dialog.Close()))
+                new KeyValuePair<string, object?>(nameof(Button.Text), "点击关闭弹窗"),
+                new KeyValuePair<string, object?>(nameof(Button.OnClick), EventCallback.Factory.Create<MouseEventArgs>(this, async () => await option.Dialog.Close()))
             }).Render();
             await DialogService.Show(option);
         }
@@ -93,9 +93,9 @@ namespace BootstrapBlazor.Shared.Pages
                 ShowFooter = false,
                 BodyContext = DataPrimaryId
             };
-            op.BodyTemplate = BootstrapDynamicComponent.CreateComponent<DataDialogComponent>(new List<KeyValuePair<string, object>>
+            op.BodyTemplate = BootstrapDynamicComponent.CreateComponent<DataDialogComponent>(new KeyValuePair<string, object?>[]
             {
-                new KeyValuePair<string, object>(nameof(DataDialogComponent.OnClose), new Action(async () => await op.Dialog.Close()))
+                new(nameof(DataDialogComponent.OnClose), new Action(async () => await op.Dialog.Close()))
             }).Render();
 
             await DialogService.Show(op);
@@ -107,7 +107,7 @@ namespace BootstrapBlazor.Shared.Pages
             var result = await DialogService.ShowModal<ResultDialogDemo>(new ResultDialogOption()
             {
                 Title = "带返回值模态弹出框",
-                ComponentParamters = new KeyValuePair<string, object>[]
+                ComponentParamters = new KeyValuePair<string, object?>[]
                 {
                     new(nameof(ResultDialogDemo.Value), DemoValue1),
                     new(nameof(ResultDialogDemo.ValueChanged), EventCallback.Factory.Create<int>(this, v => DemoValue1 = v))
@@ -128,7 +128,7 @@ namespace BootstrapBlazor.Shared.Pages
                 BodyContext = 10,
                 ButtonYesText = "选择",
                 ButtonYesIcon = "fa fa-search",
-                ComponentParamters = new KeyValuePair<string, object>[]
+                ComponentParamters = new KeyValuePair<string, object?>[]
                 {
                     // 用于初始化已选择的用户邮件
                     new(nameof(ResultDialogDemo2.Emails), Emails),
diff --git a/src/BootstrapBlazor.Shared/Pages/Samples/Menus.razor.cs b/src/BootstrapBlazor.Shared/Pages/Samples/Menus.razor.cs
index f191eae61..8c8ec112b 100644
--- a/src/BootstrapBlazor.Shared/Pages/Samples/Menus.razor.cs
+++ b/src/BootstrapBlazor.Shared/Pages/Samples/Menus.razor.cs
@@ -159,11 +159,11 @@ namespace BootstrapBlazor.Shared.Pages
             return ret;
         }
 
-        private static BootstrapDynamicComponent BuildDynamicComponent() => BootstrapDynamicComponent.CreateComponent<Badge>(new KeyValuePair<string, object>[]
+        private static BootstrapDynamicComponent BuildDynamicComponent() => BootstrapDynamicComponent.CreateComponent<Badge>(new[]
         {
-            new KeyValuePair<string, object>(nameof(Badge.Color), Color.Danger),
-            new KeyValuePair<string, object>(nameof(Badge.IsPill), true),
-            new KeyValuePair<string, object>(nameof(Badge.ChildContent), new RenderFragment(builder =>
+            new KeyValuePair<string, object?>(nameof(Badge.Color), Color.Danger),
+            new KeyValuePair<string, object?>(nameof(Badge.IsPill), true),
+            new KeyValuePair<string, object?>(nameof(Badge.ChildContent), new RenderFragment(builder =>
             {
                 var index = 0;
                 builder.AddContent(index++, "10");
diff --git a/src/BootstrapBlazor.Shared/Pages/Samples/Timelines.razor.cs b/src/BootstrapBlazor.Shared/Pages/Samples/Timelines.razor.cs
index e91c908a1..f4c6a5bb9 100644
--- a/src/BootstrapBlazor.Shared/Pages/Samples/Timelines.razor.cs
+++ b/src/BootstrapBlazor.Shared/Pages/Samples/Timelines.razor.cs
@@ -141,9 +141,9 @@ namespace BootstrapBlazor.Shared.Pages
             new TimelineItem
             {
                 Color = Color.Success,
-                Component = BootstrapDynamicComponent.CreateComponent<BootstrapBlazor.Components.Console>(new KeyValuePair<string, object>[]
+                Component = BootstrapDynamicComponent.CreateComponent<BootstrapBlazor.Components.Console>(new KeyValuePair<string, object?>[]
                 {
-                    new KeyValuePair<string, object>(nameof(BootstrapBlazor.Components.Console.Items), Messages)
+                    new(nameof(BootstrapBlazor.Components.Console.Items), Messages)
                 }),
                 Description = "实时输出"
             },
diff --git a/src/BootstrapBlazor.Shared/Shared/NavMenu.razor.cs b/src/BootstrapBlazor.Shared/Shared/NavMenu.razor.cs
index 2b310da4d..b22ec750b 100644
--- a/src/BootstrapBlazor.Shared/Shared/NavMenu.razor.cs
+++ b/src/BootstrapBlazor.Shared/Shared/NavMenu.razor.cs
@@ -711,11 +711,11 @@ namespace BootstrapBlazor.Shared.Shared
             }
         }
 
-        private static BootstrapDynamicComponent CreateBadge(int count, bool isNew = false, bool isUpdate = false) => BootstrapDynamicComponent.CreateComponent<State>(new KeyValuePair<string, object>[]
+        private static BootstrapDynamicComponent CreateBadge(int count, bool isNew = false, bool isUpdate = false) => BootstrapDynamicComponent.CreateComponent<State>(new KeyValuePair<string, object?>[]
         {
-            new KeyValuePair<string, object>(nameof(State.Count), count),
-            new KeyValuePair<string, object>(nameof(State.IsNew), isNew),
-            new KeyValuePair<string, object>(nameof(State.IsUpdate), isUpdate)
+            new(nameof(State.Count), count),
+            new(nameof(State.IsNew), isNew),
+            new(nameof(State.IsUpdate), isUpdate)
         });
 
         private class DemoMenuItem : MenuItem
diff --git a/src/BootstrapBlazor/Components/BaseComponents/BootstrapDynamicComponent.cs b/src/BootstrapBlazor/Components/BaseComponents/BootstrapDynamicComponent.cs
index edd07cbc3..e12270b47 100644
--- a/src/BootstrapBlazor/Components/BaseComponents/BootstrapDynamicComponent.cs
+++ b/src/BootstrapBlazor/Components/BaseComponents/BootstrapDynamicComponent.cs
@@ -17,7 +17,7 @@ namespace BootstrapBlazor.Components
         /// <summary>
         /// 获得/设置 组件参数集合
         /// </summary>
-        private IEnumerable<KeyValuePair<string, object>> Parameters { get; set; }
+        private IEnumerable<KeyValuePair<string, object?>> Parameters { get; set; }
 
         /// <summary>
         /// 获得/设置 组件类型
@@ -29,7 +29,7 @@ namespace BootstrapBlazor.Components
         /// </summary>
         /// <param name="componentType"></param>
         /// <param name="parameters">TCom 组件所需要的参数集合</param>
-        public BootstrapDynamicComponent(Type componentType, IEnumerable<KeyValuePair<string, object>> parameters)
+        public BootstrapDynamicComponent(Type componentType, IEnumerable<KeyValuePair<string, object?>> parameters)
         {
             ComponentType = componentType;
             Parameters = parameters;
@@ -41,14 +41,14 @@ namespace BootstrapBlazor.Components
         /// <typeparam name="TCom"></typeparam>
         /// <param name="parameters">TCom 组件所需要的参数集合</param>
         /// <returns></returns>
-        public static BootstrapDynamicComponent CreateComponent<TCom>(IEnumerable<KeyValuePair<string, object>> parameters) where TCom : IComponent => new(typeof(TCom), parameters);
+        public static BootstrapDynamicComponent CreateComponent<TCom>(IEnumerable<KeyValuePair<string, object?>> parameters) where TCom : IComponent => new(typeof(TCom), parameters);
 
         /// <summary>
         /// 创建自定义组件方法
         /// </summary>
         /// <typeparam name="TCom"></typeparam>
         /// <returns></returns>
-        public static BootstrapDynamicComponent CreateComponent<TCom>() where TCom : IComponent => CreateComponent<TCom>(Enumerable.Empty<KeyValuePair<string, object>>());
+        public static BootstrapDynamicComponent CreateComponent<TCom>() where TCom : IComponent => CreateComponent<TCom>(Enumerable.Empty<KeyValuePair<string, object?>>());
 
         /// <summary>
         /// 创建组件实例并渲染
diff --git a/src/BootstrapBlazor/Components/Dialog/Dialog.razor.cs b/src/BootstrapBlazor/Components/Dialog/Dialog.razor.cs
index 89ebd0330..6e0e40361 100644
--- a/src/BootstrapBlazor/Components/Dialog/Dialog.razor.cs
+++ b/src/BootstrapBlazor/Components/Dialog/Dialog.razor.cs
@@ -25,7 +25,7 @@ namespace BootstrapBlazor.Components
         /// <summary>
         /// 获得/设置 弹出对话框实例集合
         /// </summary>
-        private List<List<KeyValuePair<string, object>>> DialogParameters { get; set; } = new();
+        private List<List<KeyValuePair<string, object?>>> DialogParameters { get; set; } = new();
 
         /// <summary>
         /// DialogServices 服务实例
@@ -71,15 +71,15 @@ namespace BootstrapBlazor.Components
             var content = option.BodyTemplate ?? option.Component?.Render();
             if (content != null)
             {
-                parameters.Add(new KeyValuePair<string, object>(nameof(ModalDialog.BodyTemplate), content));
+                parameters.Add(new KeyValuePair<string, object?>(nameof(ModalDialog.BodyTemplate), content));
             }
 
             if (option.FooterTemplate != null)
             {
-                parameters.Add(new KeyValuePair<string, object>(nameof(ModalDialog.FooterTemplate), option.FooterTemplate));
+                parameters.Add(new KeyValuePair<string, object?>(nameof(ModalDialog.FooterTemplate), option.FooterTemplate));
             }
 
-            parameters.Add(new KeyValuePair<string, object>(nameof(ModalDialog.OnClose), new Func<Task>(async () =>
+            parameters.Add(new KeyValuePair<string, object?>(nameof(ModalDialog.OnClose), new Func<Task>(async () =>
             {
                 // 回调 OnClose 方法
                 // 移除当前对话框
@@ -103,7 +103,7 @@ namespace BootstrapBlazor.Components
             return Task.CompletedTask;
         }
 
-        private RenderFragment RenderDialog(IEnumerable<KeyValuePair<string, object>> parameter) => builder =>
+        private RenderFragment RenderDialog(IEnumerable<KeyValuePair<string, object?>> parameter) => builder =>
         {
             builder.OpenComponent<ModalDialog>(0);
             builder.AddMultipleAttributes(1, parameter);
diff --git a/src/BootstrapBlazor/Components/Dialog/DialogOption.cs b/src/BootstrapBlazor/Components/Dialog/DialogOption.cs
index 9bf5c2aeb..fde9c7d25 100644
--- a/src/BootstrapBlazor/Components/Dialog/DialogOption.cs
+++ b/src/BootstrapBlazor/Components/Dialog/DialogOption.cs
@@ -80,18 +80,15 @@ namespace BootstrapBlazor.Components
         /// 将参数转换为组件属性方法
         /// </summary>
         /// <returns></returns>
-        public IEnumerable<KeyValuePair<string, object>> ToAttributes()
+        public IEnumerable<KeyValuePair<string, object?>> ToAttributes() => new KeyValuePair<string, object?>[]
         {
-            return new KeyValuePair<string, object>[]
-            {
-                new KeyValuePair<string, object>(nameof(Title), Title!),
-                new KeyValuePair<string, object>(nameof(Size), Size),
-                new KeyValuePair<string, object>(nameof(IsCentered), IsCentered),
-                new KeyValuePair<string, object>(nameof(IsScrolling), IsScrolling),
-                new KeyValuePair<string, object>(nameof(ShowCloseButton), ShowCloseButton),
-                new KeyValuePair<string, object>(nameof(ShowFooter), ShowFooter),
-                new KeyValuePair<string, object>(nameof(BodyContext), BodyContext!),
-            };
-        }
+            new(nameof(Title), Title!),
+            new(nameof(Size), Size),
+            new(nameof(IsCentered), IsCentered),
+            new(nameof(IsScrolling), IsScrolling),
+            new(nameof(ShowCloseButton), ShowCloseButton),
+            new(nameof(ShowFooter), ShowFooter),
+            new(nameof(BodyContext), BodyContext!),
+        };
     }
 }
diff --git a/src/BootstrapBlazor/Components/Dialog/DialogService.cs b/src/BootstrapBlazor/Components/Dialog/DialogService.cs
index 9f99a50ef..daecb7e33 100644
--- a/src/BootstrapBlazor/Components/Dialog/DialogService.cs
+++ b/src/BootstrapBlazor/Components/Dialog/DialogService.cs
@@ -49,13 +49,13 @@ namespace BootstrapBlazor.Components
 
             option.Component = BootstrapDynamicComponent.CreateComponent<SearchDialog<TModel>>(new[]
             {
-                new KeyValuePair<string, object>(nameof(SearchDialogOption<TModel>.Model), option.Model),
-                new KeyValuePair<string, object>(nameof(SearchDialogOption<TModel>.ShowLabel), option.ShowLabel),
-                new KeyValuePair<string, object>(nameof(SearchDialogOption<TModel>.ResetButtonText), option.ResetButtonText!),
-                new KeyValuePair<string, object>(nameof(SearchDialogOption<TModel>.QueryButtonText), option.QueryButtonText!),
-                new KeyValuePair<string, object>(nameof(SearchDialogOption<TModel>.Items), option.Items ?? Utility.GenerateColumns<TModel>(item => item.Searchable)),
-                new KeyValuePair<string, object>(nameof(SearchDialogOption<TModel>.BodyTemplate), option.DialogBodyTemplate!),
-                new KeyValuePair<string, object>(nameof(SearchDialogOption<TModel>.OnResetSearchClick), new Func<Task>(async () =>
+                new KeyValuePair<string, object?>(nameof(SearchDialogOption<TModel>.Model), option.Model),
+                new KeyValuePair<string, object?>(nameof(SearchDialogOption<TModel>.ShowLabel), option.ShowLabel),
+                new KeyValuePair<string, object?>(nameof(SearchDialogOption<TModel>.ResetButtonText), option.ResetButtonText!),
+                new KeyValuePair<string, object?>(nameof(SearchDialogOption<TModel>.QueryButtonText), option.QueryButtonText!),
+                new KeyValuePair<string, object?>(nameof(SearchDialogOption<TModel>.Items), option.Items ?? Utility.GenerateColumns<TModel>(item => item.Searchable)),
+                new KeyValuePair<string, object?>(nameof(SearchDialogOption<TModel>.BodyTemplate), option.DialogBodyTemplate!),
+                new KeyValuePair<string, object?>(nameof(SearchDialogOption<TModel>.OnResetSearchClick), new Func<Task>(async () =>
                 {
                     if(option.OnResetSearchClick != null)
                     {
@@ -64,7 +64,7 @@ namespace BootstrapBlazor.Components
                     option.OnCloseAsync = null;
                     option.Dialog.RemoveDialog();
                 })),
-                new KeyValuePair<string, object>(nameof(SearchDialogOption<TModel>.OnSearchClick), new Func<Task>(async () =>
+                new KeyValuePair<string, object?>(nameof(SearchDialogOption<TModel>.OnSearchClick), new Func<Task>(async () =>
                 {
                     if(option.OnSearchClick != null)
                     {
@@ -89,18 +89,18 @@ namespace BootstrapBlazor.Components
 
             option.Component = BootstrapDynamicComponent.CreateComponent<EditDialog<TModel>>(new[]
             {
-                new KeyValuePair<string, object>(nameof(EditDialog<TModel>.Model), option.Model!),
-                new KeyValuePair<string, object>(nameof(EditDialog<TModel>.ShowLabel), option.ShowLabel),
-                new KeyValuePair<string, object>(nameof(EditDialog<TModel>.CloseButtonText), option.CloseButtonText!),
-                new KeyValuePair<string, object>(nameof(EditDialog<TModel>.SaveButtonText), option.SaveButtonText!),
-                new KeyValuePair<string, object>(nameof(EditDialog<TModel>.Items), option.Items!),
-                new KeyValuePair<string, object>(nameof(EditDialog<TModel>.BodyTemplate), option.DialogBodyTemplate!),
-                new KeyValuePair<string, object>(nameof(EditDialog<TModel>.OnCloseAsync), new Func<Task>(async () =>
+                new KeyValuePair<string, object?>(nameof(EditDialog<TModel>.Model), option.Model),
+                new KeyValuePair<string, object?>(nameof(EditDialog<TModel>.ShowLabel), option.ShowLabel),
+                new KeyValuePair<string, object?>(nameof(EditDialog<TModel>.CloseButtonText), option.CloseButtonText!),
+                new KeyValuePair<string, object?>(nameof(EditDialog<TModel>.SaveButtonText), option.SaveButtonText!),
+                new KeyValuePair<string, object?>(nameof(EditDialog<TModel>.Items), option.Items),
+                new KeyValuePair<string, object?>(nameof(EditDialog<TModel>.BodyTemplate), option.DialogBodyTemplate!),
+                new KeyValuePair<string, object?>(nameof(EditDialog<TModel>.OnCloseAsync), new Func<Task>(async () =>
                 {
                     option.Dialog.RemoveDialog();
                     await option.Dialog.CloseOrPopDialog();
                 })),
-                new KeyValuePair<string, object>(nameof(EditDialog<TModel>.OnSaveAsync), new Func<EditContext, Task>(async context =>
+                new KeyValuePair<string, object?>(nameof(EditDialog<TModel>.OnSaveAsync), new Func<EditContext, Task>(async context =>
                 {
                     if(option.OnSaveAsync != null)
                     {
@@ -137,7 +137,7 @@ namespace BootstrapBlazor.Components
                 builder.CloseComponent();
             };
 
-            option.FooterTemplate = BootstrapDynamicComponent.CreateComponent<ResultDialogFooter>(new KeyValuePair<string, object>[]
+            option.FooterTemplate = BootstrapDynamicComponent.CreateComponent<ResultDialogFooter>(new KeyValuePair<string, object?>[]
             {
                 new(nameof(ResultDialogFooter.ShowCloseButton), option.ShowCloseButton),
                 new(nameof(ResultDialogFooter.ButtonCloseColor), option.ButtonCloseColor),
diff --git a/src/BootstrapBlazor/Components/Dialog/ResultDialogOption.cs b/src/BootstrapBlazor/Components/Dialog/ResultDialogOption.cs
index 9cc9ed4ee..a25c36fd7 100644
--- a/src/BootstrapBlazor/Components/Dialog/ResultDialogOption.cs
+++ b/src/BootstrapBlazor/Components/Dialog/ResultDialogOption.cs
@@ -88,7 +88,7 @@ namespace BootstrapBlazor.Components
         /// <summary>
         /// 
         /// </summary>
-        public IEnumerable<KeyValuePair<string, object>>? ComponentParamters { get; set; }
+        public IEnumerable<KeyValuePair<string, object?>>? ComponentParamters { get; set; }
 
         /// <summary>
         /// 获得/设置 模态弹窗返回值任务实例
diff --git a/src/BootstrapBlazor/Components/EditorForm/EditorForm.razor.cs b/src/BootstrapBlazor/Components/EditorForm/EditorForm.razor.cs
index 16574c2d1..d322d978d 100644
--- a/src/BootstrapBlazor/Components/EditorForm/EditorForm.razor.cs
+++ b/src/BootstrapBlazor/Components/EditorForm/EditorForm.razor.cs
@@ -186,8 +186,6 @@ namespace BootstrapBlazor.Components
             }
         }
 
-        private int GetOrder(string fieldName) => Model.GetType().GetProperty(fieldName)?.GetCustomAttribute<AutoGenerateColumnAttribute>()?.Order ?? 0;
-
         #region AutoEdit
         private RenderFragment AutoGenerateTemplate(IEditorItem item) => builder =>
         {
@@ -228,9 +226,9 @@ namespace BootstrapBlazor.Components
             }
         };
 
-        private IEnumerable<KeyValuePair<string, object>> CreateMultipleAttributes(Type fieldType, string fieldName, IEditorItem item)
+        private IEnumerable<KeyValuePair<string, object?>> CreateMultipleAttributes(Type fieldType, string fieldName, IEditorItem item)
         {
-            var ret = new List<KeyValuePair<string, object>>();
+            var ret = new List<KeyValuePair<string, object?>>();
             var type = Nullable.GetUnderlyingType(fieldType) ?? fieldType;
             if (type.IsEnum)
             {
@@ -239,7 +237,7 @@ namespace BootstrapBlazor.Components
                 var items = type.ToSelectList();
                 if (items != null)
                 {
-                    ret.Add(new KeyValuePair<string, object>("Items", items));
+                    ret.Add(new KeyValuePair<string, object?>("Items", items));
                 }
             }
             else
@@ -247,10 +245,10 @@ namespace BootstrapBlazor.Components
                 switch (type.Name)
                 {
                     case nameof(String):
-                        ret.Add(new KeyValuePair<string, object>("placeholder", Utility.GetPlaceHolder(Model, fieldName) ?? PlaceHolderText));
+                        ret.Add(new KeyValuePair<string, object?>("placeholder", Utility.GetPlaceHolder(Model, fieldName) ?? PlaceHolderText));
                         if (item.Rows != 0)
                         {
-                            ret.Add(new KeyValuePair<string, object>("rows", item.Rows));
+                            ret.Add(new KeyValuePair<string, object?>("rows", item.Rows));
                         }
                         break;
                     case nameof(Int16):
@@ -259,7 +257,7 @@ namespace BootstrapBlazor.Components
                     case nameof(Single):
                     case nameof(Double):
                     case nameof(Decimal):
-                        ret.Add(new KeyValuePair<string, object>("Step", item.Step!));
+                        ret.Add(new KeyValuePair<string, object?>("Step", item.Step!));
                         break;
                     default:
                         break;
@@ -268,7 +266,7 @@ namespace BootstrapBlazor.Components
 
             if (ShowLabel)
             {
-                ret.Add(new KeyValuePair<string, object>("ShowLabel", true));
+                ret.Add(new KeyValuePair<string, object?>("ShowLabel", true));
             }
             return ret;
         }
diff --git a/src/BootstrapBlazor/Components/SweetAlert/SwalOption.cs b/src/BootstrapBlazor/Components/SweetAlert/SwalOption.cs
index 35c60f720..cf6e42f4d 100644
--- a/src/BootstrapBlazor/Components/SweetAlert/SwalOption.cs
+++ b/src/BootstrapBlazor/Components/SweetAlert/SwalOption.cs
@@ -91,15 +91,15 @@ namespace BootstrapBlazor.Components
         /// 将参数转换为组件属性方法
         /// </summary>
         /// <returns></returns>
-        public IEnumerable<KeyValuePair<string, object>> ToAttributes() => new List<KeyValuePair<string, object>>
+        public IEnumerable<KeyValuePair<string, object?>> ToAttributes() => new List<KeyValuePair<string, object?>>
         {
-            new KeyValuePair<string, object>(nameof(ModalDialog.Title), Title),
-            new KeyValuePair<string, object>(nameof(ModalDialog.Size), Size.Medium),
-            new KeyValuePair<string, object>(nameof(ModalDialog.IsCentered), true),
-            new KeyValuePair<string, object>(nameof(ModalDialog.IsScrolling), false),
-            new KeyValuePair<string, object>(nameof(ModalDialog.ShowCloseButton), false),
-            new KeyValuePair<string, object>(nameof(ModalDialog.ShowFooter), false),
-            new KeyValuePair<string, object>(nameof(BodyContext), BodyContext!)
+            new(nameof(ModalDialog.Title), Title),
+            new(nameof(ModalDialog.Size), Size.Medium),
+            new(nameof(ModalDialog.IsCentered), true),
+            new(nameof(ModalDialog.IsScrolling), false),
+            new(nameof(ModalDialog.ShowCloseButton), false),
+            new(nameof(ModalDialog.ShowFooter), false),
+            new(nameof(BodyContext), BodyContext)
         };
 
         /// <summary>
diff --git a/src/BootstrapBlazor/Components/SweetAlert/SweetAlert.razor.cs b/src/BootstrapBlazor/Components/SweetAlert/SweetAlert.razor.cs
index af81a79c7..ec5a725a3 100644
--- a/src/BootstrapBlazor/Components/SweetAlert/SweetAlert.razor.cs
+++ b/src/BootstrapBlazor/Components/SweetAlert/SweetAlert.razor.cs
@@ -39,7 +39,7 @@ namespace BootstrapBlazor.Components
         private CancellationTokenSource? DelayToken { get; set; }
 
         [NotNull]
-        private List<KeyValuePair<string, object>>? DialogParameter { get; set; }
+        private List<KeyValuePair<string, object?>>? DialogParameter { get; set; }
 
         /// <summary>
         /// OnInitialized 方法
@@ -68,7 +68,11 @@ namespace BootstrapBlazor.Components
 
                 if (IsAutoHide && Delay > 0)
                 {
-                    if (DelayToken == null) DelayToken = new CancellationTokenSource();
+                    if (DelayToken == null)
+                    {
+                        DelayToken = new CancellationTokenSource();
+                    }
+
                     await Task.Delay(Delay, DelayToken.Token);
 
                     if (!DelayToken.IsCancellationRequested)
@@ -88,7 +92,7 @@ namespace BootstrapBlazor.Components
             option.Dialog = ModalContainer;
             var parameters = option.ToAttributes().ToList();
 
-            parameters.Add(new KeyValuePair<string, object>(nameof(ModalDialog.OnClose), new Func<Task>(async () =>
+            parameters.Add(new KeyValuePair<string, object?>(nameof(ModalDialog.OnClose), new Func<Task>(async () =>
             {
                 if (IsAutoHide && DelayToken != null)
                 {
diff --git a/src/BootstrapBlazor/Components/SweetAlert/SweetAlertBody.razor.cs b/src/BootstrapBlazor/Components/SweetAlert/SweetAlertBody.razor.cs
index 46a65c65b..ea640a479 100644
--- a/src/BootstrapBlazor/Components/SweetAlert/SweetAlertBody.razor.cs
+++ b/src/BootstrapBlazor/Components/SweetAlert/SweetAlertBody.razor.cs
@@ -119,19 +119,19 @@ namespace BootstrapBlazor.Components
         /// </summary>
         /// <param name="option"></param>
         /// <returns></returns>
-        internal static IEnumerable<KeyValuePair<string, object>> Parse(SwalOption option) => new List<KeyValuePair<string, object>>()
+        internal static IEnumerable<KeyValuePair<string, object?>> Parse(SwalOption option) => new List<KeyValuePair<string, object?>>()
         {
-            new KeyValuePair<string, object>(nameof(SweetAlertBody.Category) , option.Category),
-            new KeyValuePair<string, object>(nameof(SweetAlertBody.Title) , option.Title),
-            new KeyValuePair<string, object>(nameof(SweetAlertBody.Content), option.Content ?? ""),
-            new KeyValuePair<string, object>(nameof(SweetAlertBody.ShowClose), option.ShowClose),
-            new KeyValuePair<string, object>(nameof(SweetAlertBody.IsConfirm), option.IsConfirm),
-            new KeyValuePair<string, object>(nameof(SweetAlertBody.BodyTemplate), option.BodyTemplate!),
-            new KeyValuePair<string, object>(nameof(SweetAlertBody.FooterTemplate), option.FooterTemplate!),
-            new KeyValuePair<string, object>(nameof(SweetAlertBody.ShowFooter), option.ShowFooter!),
-            new KeyValuePair<string, object>(nameof(SweetAlertBody.ButtonTemplate), option.ButtonTemplate!),
-            new KeyValuePair<string, object>(nameof(SweetAlertBody.OnClose), new Action(async () => await option.Close(false))),
-            new KeyValuePair<string, object>(nameof(SweetAlertBody.OnConfirm), new Action(async () => await option.Close(true)))
+            new(nameof(SweetAlertBody.Category) , option.Category),
+            new(nameof(SweetAlertBody.Title) , option.Title),
+            new(nameof(SweetAlertBody.Content), option.Content ?? ""),
+            new(nameof(SweetAlertBody.ShowClose), option.ShowClose),
+            new(nameof(SweetAlertBody.IsConfirm), option.IsConfirm),
+            new(nameof(SweetAlertBody.BodyTemplate), option.BodyTemplate!),
+            new(nameof(SweetAlertBody.FooterTemplate), option.FooterTemplate!),
+            new(nameof(SweetAlertBody.ShowFooter), option.ShowFooter!),
+            new(nameof(SweetAlertBody.ButtonTemplate), option.ButtonTemplate!),
+            new(nameof(SweetAlertBody.OnClose), new Action(async () => await option.Close(false))),
+            new(nameof(SweetAlertBody.OnConfirm), new Action(async () => await option.Close(true)))
         };
 
         /// <summary>
@@ -148,14 +148,20 @@ namespace BootstrapBlazor.Components
 
         private Task OnClickClose()
         {
-            if (OnClose != null) OnClose.Invoke();
+            if (OnClose != null)
+            {
+                OnClose.Invoke();
+            }
 
             return Task.CompletedTask;
         }
 
         private Task OnClickConfirm()
         {
-            if (OnConfirm != null) OnConfirm.Invoke();
+            if (OnConfirm != null)
+            {
+                OnConfirm.Invoke();
+            }
 
             return Task.CompletedTask;
         }
-- 
Gitee


From c23deadb147f2e7185ff8ce272b0fd92ae95358d Mon Sep 17 00:00:00 2001
From: Argo-Cloud <argo@163.com>
Date: Sun, 28 Mar 2021 02:05:30 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20EditDialog=20=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=20Editable=20=E6=9D=A1=E4=BB=B6=E7=9A=84?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/Dialog/DialogService.cs         | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/BootstrapBlazor/Components/Dialog/DialogService.cs b/src/BootstrapBlazor/Components/Dialog/DialogService.cs
index daecb7e33..8f931062e 100644
--- a/src/BootstrapBlazor/Components/Dialog/DialogService.cs
+++ b/src/BootstrapBlazor/Components/Dialog/DialogService.cs
@@ -87,20 +87,20 @@ namespace BootstrapBlazor.Components
             option.CloseButtonText ??= EditDialogLocalizer[nameof(option.CloseButtonText)];
             option.SaveButtonText ??= EditDialogLocalizer[nameof(option.SaveButtonText)];
 
-            option.Component = BootstrapDynamicComponent.CreateComponent<EditDialog<TModel>>(new[]
+            option.Component = BootstrapDynamicComponent.CreateComponent<EditDialog<TModel>>(new KeyValuePair<string, object?>[]
             {
-                new KeyValuePair<string, object?>(nameof(EditDialog<TModel>.Model), option.Model),
-                new KeyValuePair<string, object?>(nameof(EditDialog<TModel>.ShowLabel), option.ShowLabel),
-                new KeyValuePair<string, object?>(nameof(EditDialog<TModel>.CloseButtonText), option.CloseButtonText!),
-                new KeyValuePair<string, object?>(nameof(EditDialog<TModel>.SaveButtonText), option.SaveButtonText!),
-                new KeyValuePair<string, object?>(nameof(EditDialog<TModel>.Items), option.Items),
-                new KeyValuePair<string, object?>(nameof(EditDialog<TModel>.BodyTemplate), option.DialogBodyTemplate!),
-                new KeyValuePair<string, object?>(nameof(EditDialog<TModel>.OnCloseAsync), new Func<Task>(async () =>
+                new(nameof(EditDialog<TModel>.Model), option.Model),
+                new(nameof(EditDialog<TModel>.ShowLabel), option.ShowLabel),
+                new(nameof(EditDialog<TModel>.CloseButtonText), option.CloseButtonText),
+                new(nameof(EditDialog<TModel>.SaveButtonText), option.SaveButtonText),
+                new(nameof(EditDialog<TModel>.Items), option.Items ?? Utility.GenerateColumns<TModel>(item => item.Editable)),
+                new(nameof(EditDialog<TModel>.BodyTemplate), option.DialogBodyTemplate),
+                new(nameof(EditDialog<TModel>.OnCloseAsync), new Func<Task>(async () =>
                 {
                     option.Dialog.RemoveDialog();
                     await option.Dialog.CloseOrPopDialog();
                 })),
-                new KeyValuePair<string, object?>(nameof(EditDialog<TModel>.OnSaveAsync), new Func<EditContext, Task>(async context =>
+                new(nameof(EditDialog<TModel>.OnSaveAsync), new Func<EditContext, Task>(async context =>
                 {
                     if(option.OnSaveAsync != null)
                     {
-- 
Gitee


From a605a8fbbeecf980b3299a745b29919ad7698bef Mon Sep 17 00:00:00 2001
From: Argo-Cloud <argo@163.com>
Date: Sun, 28 Mar 2021 02:06:09 +0800
Subject: [PATCH 3/3] release: publish 5.0.23-beta07

---
 src/BootstrapBlazor/BootstrapBlazor.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
index 1c24c2ad8..7bd91521f 100644
--- a/src/BootstrapBlazor/BootstrapBlazor.csproj
+++ b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <IsPackable>true</IsPackable>
     <PackageIcon>logo.png</PackageIcon>
-    <Version>5.0.23-beta06</Version>
+    <Version>5.0.23-beta07</Version>
     <PackageReleaseNotes>https://gitee.com/LongbowEnterprise/BootstrapBlazor/wikis</PackageReleaseNotes>
   </PropertyGroup>
 
-- 
Gitee