diff --git a/src/BootstrapBlazor.Shared/App.razor.cs b/src/BootstrapBlazor.Shared/App.razor.cs
index d51cf4a48a86e4bc5d2a080f64b1b572fbbf3407..71cb0dd1064f9bb7b874a6c4b990a447c884a1eb 100644
--- a/src/BootstrapBlazor.Shared/App.razor.cs
+++ b/src/BootstrapBlazor.Shared/App.razor.cs
@@ -73,9 +73,9 @@ namespace BootstrapBlazor.Shared
 #if DEBUG
                     IsAutoHide = false,
 #endif
-                    ChildContent = BootstrapDynamicComponent.CreateComponent<CommitItem>(new Dictionary<string, object>
+                    ChildContent = BootstrapDynamicComponent.CreateComponent<CommitItem>(new Dictionary<string, object?>
                     {
-                        [nameof(CommitItem.Item)] = payload.Entry!
+                        [nameof(CommitItem.Item)] = payload.Entry
                     }).Render()
                 };
                 await Toast.Show(option);
diff --git a/src/BootstrapBlazor.Shared/Data/Menus.cs b/src/BootstrapBlazor.Shared/Data/Menus.cs
index 0a9228576edaee796bbf77b6c01b58fad51ef915..213b94a8be8a46792bd75ad8bee75ebc9e4c9eb3 100644
--- a/src/BootstrapBlazor.Shared/Data/Menus.cs
+++ b/src/BootstrapBlazor.Shared/Data/Menus.cs
@@ -185,7 +185,7 @@ namespace BootstrapBlazor.Shared
             };
         }
 
-        private static BootstrapDynamicComponent BuildDynamicComponent() => BootstrapDynamicComponent.CreateComponent<Badge>(new Dictionary<string, object>
+        private static BootstrapDynamicComponent BuildDynamicComponent() => BootstrapDynamicComponent.CreateComponent<Badge>(new Dictionary<string, object?>
         {
             [nameof(Badge.Color)] = Color.Danger,
             [nameof(Badge.IsPill)] = true,
diff --git a/src/BootstrapBlazor.Shared/Pages/Layout.razor.cs b/src/BootstrapBlazor.Shared/Pages/Layout.razor.cs
index 90bcf9e15fca31dab9649a0065198a914704aa57..cddcf9f06e28d84b8f2dcde2d19ec964bec8f752 100644
--- a/src/BootstrapBlazor.Shared/Pages/Layout.razor.cs
+++ b/src/BootstrapBlazor.Shared/Pages/Layout.razor.cs
@@ -4,11 +4,8 @@
 
 using BootstrapBlazor.Components;
 using Microsoft.AspNetCore.Components;
-using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace BootstrapBlazor.Shared.Pages
@@ -41,7 +38,7 @@ namespace BootstrapBlazor.Shared.Pages
                 Title = "测试弹窗",
                 BodyTemplate = builder =>
                 {
-                    builder.AddContent(0, BootstrapDynamicComponent.CreateComponent<Button>(new Dictionary<string, object>
+                    builder.AddContent(0, BootstrapDynamicComponent.CreateComponent<Button>(new Dictionary<string, object?>
                     {
                         [nameof(Button.Text)] = "Toast",
                         [nameof(Button.OnClickWithoutRender)] = async () =>
@@ -54,7 +51,7 @@ namespace BootstrapBlazor.Shared.Pages
                             });
                         }
                     }).Render());
-                    builder.AddContent(0, BootstrapDynamicComponent.CreateComponent<Button>(new Dictionary<string, object>
+                    builder.AddContent(0, BootstrapDynamicComponent.CreateComponent<Button>(new Dictionary<string, object?>
                     {
                         ["class"] = "ms-3",
                         [nameof(Button.Text)] = "Message",
@@ -66,7 +63,7 @@ namespace BootstrapBlazor.Shared.Pages
                             });
                         }
                     }).Render());
-                    builder.AddContent(0, BootstrapDynamicComponent.CreateComponent<Button>(new Dictionary<string, object>
+                    builder.AddContent(0, BootstrapDynamicComponent.CreateComponent<Button>(new Dictionary<string, object?>
                     {
                         ["class"] = "ms-3",
                         [nameof(Button.Text)] = "Swal",
diff --git a/src/BootstrapBlazor.Shared/Samples/Dialogs.razor.cs b/src/BootstrapBlazor.Shared/Samples/Dialogs.razor.cs
index 900953d21ee3bc0b09a4ad90d5775af23c4b6786..822868a7f4da6f05879034fa612653d4823d8402 100644
--- a/src/BootstrapBlazor.Shared/Samples/Dialogs.razor.cs
+++ b/src/BootstrapBlazor.Shared/Samples/Dialogs.razor.cs
@@ -48,7 +48,7 @@ namespace BootstrapBlazor.Shared.Samples
 
         private Task OnCustomerHeaderClick() => DialogService.Show(new DialogOption()
         {
-            HeaderTemplate = BootstrapDynamicComponent.CreateComponent<DialogHeaderFoo>(new Dictionary<string, object>
+            HeaderTemplate = BootstrapDynamicComponent.CreateComponent<DialogHeaderFoo>(new Dictionary<string, object?>
             {
                 [nameof(DialogHeaderFoo.OnValueChanged)] = new Func<string, Task>(val => TriggerUpdateBodyAsync(val))
             }).Render(),
@@ -68,7 +68,7 @@ namespace BootstrapBlazor.Shared.Samples
         {
             IsKeyboard = IsKeyboard,
             Title = "我是服务创建的弹出框",
-            BodyTemplate = BootstrapDynamicComponent.CreateComponent<Button>(new Dictionary<string, object>
+            BodyTemplate = BootstrapDynamicComponent.CreateComponent<Button>(new Dictionary<string, object?>
             {
                 [nameof(Button.ChildContent)] = new RenderFragment(builder => builder.AddContent(0, "我是服务创建的按钮"))
             })
@@ -81,7 +81,7 @@ namespace BootstrapBlazor.Shared.Samples
             {
                 Title = "利用代码关闭弹出框",
             };
-            option.BodyTemplate = BootstrapDynamicComponent.CreateComponent<Button>(new Dictionary<string, object>
+            option.BodyTemplate = BootstrapDynamicComponent.CreateComponent<Button>(new Dictionary<string, object?>
             {
                 [nameof(Button.Text)] = "点击关闭弹窗",
                 [nameof(Button.OnClick)] = EventCallback.Factory.Create<MouseEventArgs>(this, async () => await option.Dialog.Close())
@@ -96,7 +96,7 @@ namespace BootstrapBlazor.Shared.Samples
                 Title = "Header 中无关闭按钮",
                 ShowHeaderCloseButton = false
             };
-            option.BodyTemplate = BootstrapDynamicComponent.CreateComponent<Button>(new Dictionary<string, object>
+            option.BodyTemplate = BootstrapDynamicComponent.CreateComponent<Button>(new Dictionary<string, object?>
             {
                 [nameof(Button.Text)] = "点击关闭弹窗",
                 [nameof(Button.OnClick)] = EventCallback.Factory.Create<MouseEventArgs>(this, async () => await option.Dialog.Close())
@@ -140,7 +140,7 @@ namespace BootstrapBlazor.Shared.Samples
                 ShowFooter = false,
                 BodyContext = DataPrimaryId
             };
-            op.BodyTemplate = BootstrapDynamicComponent.CreateComponent<DataDialogComponent>(new Dictionary<string, object>
+            op.BodyTemplate = BootstrapDynamicComponent.CreateComponent<DataDialogComponent>(new Dictionary<string, object?>
             {
                 [nameof(DataDialogComponent.OnClose)] = new Action(async () => await op.Dialog.Close())
             }).Render();
@@ -174,7 +174,7 @@ namespace BootstrapBlazor.Shared.Samples
                 ShowFooter = false,
                 BodyContext = DataPrimaryId
             };
-            op.BodyTemplate = BootstrapDynamicComponent.CreateComponent<DataDialogComponent>(new Dictionary<string, object>
+            op.BodyTemplate = BootstrapDynamicComponent.CreateComponent<DataDialogComponent>(new Dictionary<string, object?>
             {
                 [nameof(DataDialogComponent.OnClose)] = new Action(async () => await op.Dialog.Close())
             }).Render();
diff --git a/src/BootstrapBlazor.Shared/Samples/Prints.razor.cs b/src/BootstrapBlazor.Shared/Samples/Prints.razor.cs
index c10e3e1d6b08795c2598ecf711ca8a2d99bb6bc8..4cc28fdb657d677b1e9eee44a3fb27fc0b8de123 100644
--- a/src/BootstrapBlazor.Shared/Samples/Prints.razor.cs
+++ b/src/BootstrapBlazor.Shared/Samples/Prints.razor.cs
@@ -41,7 +41,7 @@ namespace BootstrapBlazor.Shared.Samples
                 ShowFooter = false,
                 BodyContext = 1
             };
-            op.BodyTemplate = BootstrapDynamicComponent.CreateComponent<DataDialogComponent>(new Dictionary<string, object>
+            op.BodyTemplate = BootstrapDynamicComponent.CreateComponent<DataDialogComponent>(new Dictionary<string, object?>
             {
                 [nameof(DataDialogComponent.OnClose)] = new Action(async () => await op.Dialog.Close())
             }).Render();
@@ -59,7 +59,7 @@ namespace BootstrapBlazor.Shared.Samples
             op.BodyContext = 2;
 
             // 弹窗组件所需参数
-            return new Dictionary<string, object>
+            return new Dictionary<string, object?>
             {
                 [nameof(DataDialogComponent.OnClose)] = new Action(async () => await op.Dialog.Close())
             };
diff --git a/src/BootstrapBlazor.Shared/Samples/Timelines.razor.cs b/src/BootstrapBlazor.Shared/Samples/Timelines.razor.cs
index 22020e35b17f7c6d445eea96014460c5a6ad5ff2..6c41a6195831f9b98db9adbf3cc95a305524845f 100644
--- a/src/BootstrapBlazor.Shared/Samples/Timelines.razor.cs
+++ b/src/BootstrapBlazor.Shared/Samples/Timelines.razor.cs
@@ -141,7 +141,7 @@ namespace BootstrapBlazor.Shared.Samples
             new TimelineItem
             {
                 Color = Color.Success,
-                Component = BootstrapDynamicComponent.CreateComponent<BootstrapBlazor.Components.Console>(new Dictionary<string, object>
+                Component = BootstrapDynamicComponent.CreateComponent<BootstrapBlazor.Components.Console>(new Dictionary<string, object?>
                 {
                     [nameof(BootstrapBlazor.Components.Console.Items)] = Messages
                 }),
diff --git a/src/BootstrapBlazor.Shared/Shared/MainLayout.razor.cs b/src/BootstrapBlazor.Shared/Shared/MainLayout.razor.cs
index 311e7fe64131ec47e6458b9cfdbf7ccac63bea23..db1864dca3190c0111cd15276a1a2e482f113087 100644
--- a/src/BootstrapBlazor.Shared/Shared/MainLayout.razor.cs
+++ b/src/BootstrapBlazor.Shared/Shared/MainLayout.razor.cs
@@ -10,6 +10,9 @@ using System.Threading.Tasks;
 
 namespace BootstrapBlazor.Shared.Shared
 {
+    /// <summary>
+    /// 
+    /// </summary>
     public partial class MainLayout : IDisposable
     {
         [Inject]
diff --git a/src/BootstrapBlazor.Shared/Shared/NavMenu.razor.cs b/src/BootstrapBlazor.Shared/Shared/NavMenu.razor.cs
index c3e770bca75d8cfa4c7363f8bf565849f5210d7a..15357c555658cbc6ad2c0fa1ce538e3a936ba56e 100644
--- a/src/BootstrapBlazor.Shared/Shared/NavMenu.razor.cs
+++ b/src/BootstrapBlazor.Shared/Shared/NavMenu.razor.cs
@@ -943,7 +943,7 @@ namespace BootstrapBlazor.Shared.Shared
             static bool ShouldBadge(DemoMenuItem? item) => item != null && (item.IsNew || item.IsUpdate);
         }
 
-        private static BootstrapDynamicComponent CreateBadge(int count, bool isNew = false, bool isUpdate = false) => BootstrapDynamicComponent.CreateComponent<State>(new Dictionary<string, object>
+        private static BootstrapDynamicComponent CreateBadge(int count, bool isNew = false, bool isUpdate = false) => BootstrapDynamicComponent.CreateComponent<State>(new Dictionary<string, object?>
         {
             [nameof(State.Count)] = count,
             [nameof(State.IsNew)] = isNew,
diff --git a/src/BootstrapBlazor/Components/Dialog/DialogService.cs b/src/BootstrapBlazor/Components/Dialog/DialogService.cs
index 6a911def4e70cba2f19e6d25c504fc518396bab9..3ae57b2154d5a22ca5382309d340f8011f077302 100644
--- a/src/BootstrapBlazor/Components/Dialog/DialogService.cs
+++ b/src/BootstrapBlazor/Components/Dialog/DialogService.cs
@@ -4,7 +4,6 @@
 
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Forms;
-using Microsoft.Extensions.Localization;
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
@@ -31,7 +30,7 @@ namespace BootstrapBlazor.Components
         /// <param name="dialog">指定弹窗组件 默认为 null 使用 <see cref="BootstrapBlazorRoot"/> 组件内置弹窗组件</param>
         public async Task ShowSearchDialog<TModel>(SearchDialogOption<TModel> option, Dialog? dialog = null)
         {
-            var parameters = new Dictionary<string, object>
+            var parameters = new Dictionary<string, object?>
             {
                 [nameof(SearchDialog<TModel>.ShowLabel)] = option.ShowLabel,
                 [nameof(SearchDialog<TModel>.Items)] = option.Items ?? Utility.GenerateColumns<TModel>(item => item.Searchable),
@@ -54,36 +53,14 @@ namespace BootstrapBlazor.Components
                     }
                 }),
                 [nameof(SearchDialog<TModel>.RowType)] = option.RowType,
-                [nameof(SearchDialog<TModel>.LabelAlign)] = option.LabelAlign
+                [nameof(SearchDialog<TModel>.LabelAlign)] = option.LabelAlign,
+                [nameof(ItemsPerRow)] = option.ItemsPerRow,
+                [nameof(SearchDialog<TModel>.ResetButtonText)] = option.ResetButtonText,
+                [nameof(SearchDialog<TModel>.QueryButtonText)] = option.QueryButtonText,
+                [nameof(SearchDialog<TModel>.Model)] = option.Model,
+                [nameof(SearchDialog<TModel>.BodyTemplate)] = option.DialogBodyTemplate
             };
-
-            if (option.ItemsPerRow.HasValue)
-            {
-                parameters.Add(nameof(ItemsPerRow), option.ItemsPerRow);
-            }
-
-            if (!string.IsNullOrEmpty(option.ResetButtonText))
-            {
-                parameters.Add(nameof(SearchDialog<TModel>.ResetButtonText), option.ResetButtonText);
-            }
-
-            if (!string.IsNullOrEmpty(option.QueryButtonText))
-            {
-                parameters.Add(nameof(SearchDialog<TModel>.QueryButtonText), option.QueryButtonText);
-            }
-
-            if (option.Model != null)
-            {
-                parameters.Add(nameof(SearchDialog<TModel>.Model), option.Model);
-            }
-
-            if (option.DialogBodyTemplate != null)
-            {
-                parameters.Add(nameof(SearchDialog<TModel>.BodyTemplate), option.DialogBodyTemplate);
-            }
-
             option.Component = BootstrapDynamicComponent.CreateComponent<SearchDialog<TModel>>(parameters);
-
             await Invoke(option, dialog);
         }
 
@@ -94,7 +71,7 @@ namespace BootstrapBlazor.Components
         /// <param name="dialog"></param>
         public async Task ShowEditDialog<TModel>(EditDialogOption<TModel> option, Dialog? dialog = null)
         {
-            var parameters = new Dictionary<string, object>
+            var parameters = new Dictionary<string, object?>
             {
                 [nameof(EditDialog<TModel>.ShowLoading)] = option.ShowLoading,
                 [nameof(EditDialog<TModel>.ShowLabel)] = option.ShowLabel,
@@ -119,36 +96,15 @@ namespace BootstrapBlazor.Components
                 [nameof(EditDialog<TModel>.RowType)] = option.RowType,
                 [nameof(EditDialog<TModel>.LabelAlign)] = option.LabelAlign,
                 [nameof(EditDialog<TModel>.IsTracking)] = option.IsTracking,
-                [nameof(EditDialog<TModel>.ItemChangedType)] = option.ItemChangedType
+                [nameof(EditDialog<TModel>.ItemChangedType)] = option.ItemChangedType,
+                [nameof(ItemsPerRow)] = option.ItemsPerRow,
+                [nameof(EditDialog<TModel>.CloseButtonText)] = option.CloseButtonText,
+                [nameof(EditDialog<TModel>.SaveButtonText)] = option.SaveButtonText,
+                [nameof(EditDialog<TModel>.Model)] = option.Model,
+                [nameof(EditDialog<TModel>.BodyTemplate)] = option.DialogBodyTemplate
             };
 
-            if (option.ItemsPerRow.HasValue)
-            {
-                parameters.Add(nameof(ItemsPerRow), option.ItemsPerRow);
-            }
-
-            if (!string.IsNullOrEmpty(option.CloseButtonText))
-            {
-                parameters.Add(nameof(EditDialog<TModel>.CloseButtonText), option.CloseButtonText);
-            }
-
-            if (!string.IsNullOrEmpty(option.SaveButtonText))
-            {
-                parameters.Add(nameof(EditDialog<TModel>.SaveButtonText), option.SaveButtonText);
-            }
-
-            if (option.Model != null)
-            {
-                parameters.Add(nameof(EditDialog<TModel>.Model), option.Model);
-            }
-
-            if (option.DialogBodyTemplate != null)
-            {
-                parameters.Add(nameof(EditDialog<TModel>.BodyTemplate), option.DialogBodyTemplate);
-            }
-
             option.Component = BootstrapDynamicComponent.CreateComponent<EditDialog<TModel>>(parameters);
-
             await Invoke(option, dialog);
         }
 
@@ -166,17 +122,24 @@ namespace BootstrapBlazor.Components
 
             option.BodyTemplate = builder =>
             {
-                builder.OpenComponent(0, typeof(TDialog));
-                builder.AddMultipleAttributes(1, option.ComponentParamters);
-                builder.AddComponentReferenceCapture(2, com => resultDialog = (IResultDialog)com);
+                var index = 0;
+                builder.OpenComponent(index++, typeof(TDialog));
+                if (option.ComponentParamters != null)
+                {
+                    foreach (var p in option.ComponentParamters)
+                    {
+                        builder.AddAttribute(index++, p.Key, p.Value);
+                    }
+                }
+                builder.AddComponentReferenceCapture(index++, com => resultDialog = (IResultDialog)com);
                 builder.CloseComponent();
             };
 
-            option.FooterTemplate = BootstrapDynamicComponent.CreateComponent<ResultDialogFooter>(new Dictionary<string, object>
+            option.FooterTemplate = BootstrapDynamicComponent.CreateComponent<ResultDialogFooter>(new Dictionary<string, object?>
             {
-                [nameof(ResultDialogFooter.ButtonCloseText)] = option.ButtonCloseText!,
-                [nameof(ResultDialogFooter.ButtonNoText)] = option.ButtonNoText!,
-                [nameof(ResultDialogFooter.ButtonYesText)] = option.ButtonYesText!,
+                [nameof(ResultDialogFooter.ButtonCloseText)] = option.ButtonCloseText,
+                [nameof(ResultDialogFooter.ButtonNoText)] = option.ButtonNoText,
+                [nameof(ResultDialogFooter.ButtonYesText)] = option.ButtonYesText,
                 [nameof(ResultDialogFooter.ShowCloseButton)] = option.ShowCloseButton,
                 [nameof(ResultDialogFooter.ButtonCloseColor)] = option.ButtonCloseColor,
                 [nameof(ResultDialogFooter.ButtonCloseIcon)] = option.ButtonCloseIcon,
diff --git a/src/BootstrapBlazor/Components/Dialog/EditDialog.razor b/src/BootstrapBlazor/Components/Dialog/EditDialog.razor
index 68765bf614fbab8e1f417678e31cf8013c33a265..0af614166238e9773497a1e212b75c90881ef902 100644
--- a/src/BootstrapBlazor/Components/Dialog/EditDialog.razor
+++ b/src/BootstrapBlazor/Components/Dialog/EditDialog.razor
@@ -5,7 +5,7 @@
 <ValidateForm Model="@Model" OnValidSubmit="@OnValidSubmitAsync">
 	@if (BodyTemplate != null)
 	{
-		@BodyTemplate?.Invoke(Model)
+		@BodyTemplate.Invoke(Model)
 		@if (!IsTracking)
 		{
 			<div class="row mt-3">
diff --git a/src/BootstrapBlazor/Components/Print/PrintService.cs b/src/BootstrapBlazor/Components/Print/PrintService.cs
index 39a0ddc1d43cf7b88115be30435b8a3f457b9690..b5d6aa59a81305bde0695ae3dd10bc56f2afd535 100644
--- a/src/BootstrapBlazor/Components/Print/PrintService.cs
+++ b/src/BootstrapBlazor/Components/Print/PrintService.cs
@@ -27,7 +27,7 @@ namespace BootstrapBlazor.Components
         /// <typeparam name="TComponent"></typeparam>
         /// <param name="parametersFactory"></param>
         /// <returns></returns>
-        public async Task PrintAsync<TComponent>(Func<DialogOption, IDictionary<string, object>> parametersFactory) where TComponent : ComponentBase
+        public async Task PrintAsync<TComponent>(Func<DialogOption, IDictionary<string, object?>> parametersFactory) where TComponent : ComponentBase
         {
             var option = new DialogOption();
             var parameters = parametersFactory(option);
diff --git a/src/BootstrapBlazor/Components/SweetAlert/SwalOption.cs b/src/BootstrapBlazor/Components/SweetAlert/SwalOption.cs
index 7c8d95fe99a49e8010d4b879bd987da97b35ac83..26eade5f728cb1f90d20b1172bdab44be7dcea59 100644
--- a/src/BootstrapBlazor/Components/SweetAlert/SwalOption.cs
+++ b/src/BootstrapBlazor/Components/SweetAlert/SwalOption.cs
@@ -86,24 +86,18 @@ namespace BootstrapBlazor.Components
         /// 将参数转换为组件属性方法
         /// </summary>
         /// <returns></returns>
-        public List<KeyValuePair<string, object>> ToAttributes()
+        public Dictionary<string, object?> ToAttributes()
         {
-            var parameters = new List<KeyValuePair<string, object>>
+            var parameters = new Dictionary<string, object?>
             {
-                new(nameof(Size), Size.Medium),
-                new(nameof(ModalDialog.IsCentered), true),
-                new(nameof(ModalDialog.IsScrolling), false),
-                new(nameof(ModalDialog.ShowCloseButton), false),
-                new(nameof(ShowFooter), false)
+                [nameof(Size)] = Size.Medium,
+                [nameof(ModalDialog.IsCentered)] = true,
+                [nameof(ModalDialog.IsScrolling)] = false,
+                [nameof(ModalDialog.ShowCloseButton)] = false,
+                [nameof(ShowFooter)] = false,
+                [nameof(ModalDialog.Title)] = Title,
+                [nameof(BodyContext)] = BodyContext
             };
-            if (!string.IsNullOrEmpty(Title))
-            {
-                parameters.Add(new(nameof(ModalDialog.Title), Title));
-            }
-            if (BodyContext != null)
-            {
-                parameters.Add(new(nameof(BodyContext), BodyContext));
-            }
             return parameters;
         }
 
diff --git a/src/BootstrapBlazor/Components/SweetAlert/SweetAlert.razor.cs b/src/BootstrapBlazor/Components/SweetAlert/SweetAlert.razor.cs
index 4f5ffe82f902594e5088a974bea689782c443b03..172413a1f5851c33ab1e19278d5c97d529ba1fbb 100644
--- a/src/BootstrapBlazor/Components/SweetAlert/SweetAlert.razor.cs
+++ b/src/BootstrapBlazor/Components/SweetAlert/SweetAlert.razor.cs
@@ -38,7 +38,7 @@ namespace BootstrapBlazor.Components
         private CancellationTokenSource? DelayToken { get; set; }
 
         [NotNull]
-        private List<KeyValuePair<string, object>>? DialogParameter { get; set; }
+        private Dictionary<string, object?>? DialogParameter { get; set; }
 
         /// <summary>
         /// OnInitialized 方法
@@ -91,7 +91,7 @@ namespace BootstrapBlazor.Components
             option.Dialog = ModalContainer;
             var parameters = option.ToAttributes();
 
-            parameters.Add(new KeyValuePair<string, object>(nameof(ModalDialog.OnClose), new Func<Task>(async () =>
+            parameters.Add(nameof(ModalDialog.OnClose), new Func<Task>(async () =>
             {
                 if (IsAutoHide && DelayToken != null)
                 {
@@ -101,9 +101,9 @@ namespace BootstrapBlazor.Components
                 DialogParameter = null;
                 await ModalContainer.CloseOrPopDialog();
                 StateHasChanged();
-            })));
+            }));
 
-            parameters.Add(new(nameof(ModalDialog.BodyTemplate), BootstrapDynamicComponent.CreateComponent<SweetAlertBody>(SweetAlertBody.Parse(option)).Render()));
+            parameters.Add(nameof(ModalDialog.BodyTemplate), BootstrapDynamicComponent.CreateComponent<SweetAlertBody>(SweetAlertBody.Parse(option)).Render());
 
             DialogParameter = parameters;
             IsShowDialog = true;
@@ -115,9 +115,13 @@ namespace BootstrapBlazor.Components
         {
             if (DialogParameter != null)
             {
-                builder.OpenComponent<ModalDialog>(0);
-                builder.AddMultipleAttributes(1, DialogParameter);
-                builder.AddComponentReferenceCapture(2, dialog =>
+                var index = 0;
+                builder.OpenComponent<ModalDialog>(index++);
+                foreach (var p in DialogParameter)
+                {
+                    builder.AddAttribute(index++, p.Key, p.Value);
+                }
+                builder.AddComponentReferenceCapture(index++, dialog =>
                 {
                     var modal = (ModalDialog)dialog;
                     ModalContainer.ShowDialog(modal);
diff --git a/src/BootstrapBlazor/Components/SweetAlert/SweetAlertBody.razor.cs b/src/BootstrapBlazor/Components/SweetAlert/SweetAlertBody.razor.cs
index 772c3c50e46f87b9a743f60821895ced1c4b10ed..cd7dad1bf593c7a5874e3e1a41926b9108a0627d 100644
--- a/src/BootstrapBlazor/Components/SweetAlert/SweetAlertBody.razor.cs
+++ b/src/BootstrapBlazor/Components/SweetAlert/SweetAlertBody.razor.cs
@@ -119,39 +119,20 @@ namespace BootstrapBlazor.Components
         /// </summary>
         /// <param name="option"></param>
         /// <returns></returns>
-        internal static IDictionary<string, object> Parse(SwalOption option)
+        internal static IDictionary<string, object?> Parse(SwalOption option) => new Dictionary<string, object?>()
         {
-            var parameters = new Dictionary<string, object>()
-            {
-                [nameof(SweetAlertBody.Category)] = option.Category,
-                [nameof(SweetAlertBody.ShowClose)] = option.ShowClose,
-                [nameof(SweetAlertBody.IsConfirm)] = option.IsConfirm,
-                [nameof(SweetAlertBody.ShowFooter)] = option.ShowFooter,
-                [nameof(SweetAlertBody.OnClose)] = new Action(async () => await option.Close(false)),
-                [nameof(SweetAlertBody.OnConfirm)] = new Action(async () => await option.Close(true))
-            };
-            if (!string.IsNullOrEmpty(option.Title))
-            {
-                parameters.Add(nameof(SweetAlertBody.Title), option.Title);
-            }
-            if (!string.IsNullOrEmpty(option.Content))
-            {
-                parameters.Add(nameof(SweetAlertBody.Content), option.Content);
-            }
-            if (option.BodyTemplate != null)
-            {
-                parameters.Add(nameof(SweetAlertBody.BodyTemplate), option.BodyTemplate);
-            }
-            if (option.FooterTemplate != null)
-            {
-                parameters.Add(nameof(SweetAlertBody.FooterTemplate), option.FooterTemplate);
-            }
-            if (option.ButtonTemplate != null)
-            {
-                parameters.Add(nameof(SweetAlertBody.ButtonTemplate), option.ButtonTemplate);
-            }
-            return parameters;
-        }
+            [nameof(SweetAlertBody.Category)] = option.Category,
+            [nameof(SweetAlertBody.ShowClose)] = option.ShowClose,
+            [nameof(SweetAlertBody.IsConfirm)] = option.IsConfirm,
+            [nameof(SweetAlertBody.ShowFooter)] = option.ShowFooter,
+            [nameof(SweetAlertBody.OnClose)] = new Action(async () => await option.Close(false)),
+            [nameof(SweetAlertBody.OnConfirm)] = new Action(async () => await option.Close(true)),
+            [nameof(SweetAlertBody.Title)] = option.Title,
+            [nameof(SweetAlertBody.Content)] = option.Content,
+            [nameof(SweetAlertBody.BodyTemplate)] = option.BodyTemplate,
+            [nameof(SweetAlertBody.FooterTemplate)] = option.FooterTemplate,
+            [nameof(SweetAlertBody.ButtonTemplate)] = option.ButtonTemplate
+        };
 
         /// <summary>
         /// OnInitialized 方法
diff --git a/src/BootstrapBlazor/Utils/BootstrapDynamicComponent.cs b/src/BootstrapBlazor/Utils/BootstrapDynamicComponent.cs
index aeb2517f94a41cd18668ee7e011afe9fd855feb7..af46fb494f157fad4bdb319046a06d601de59243 100644
--- a/src/BootstrapBlazor/Utils/BootstrapDynamicComponent.cs
+++ b/src/BootstrapBlazor/Utils/BootstrapDynamicComponent.cs
@@ -5,7 +5,6 @@
 using Microsoft.AspNetCore.Components;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 
 namespace BootstrapBlazor.Components
 {
@@ -17,7 +16,7 @@ namespace BootstrapBlazor.Components
         /// <summary>
         /// 获得/设置 组件参数集合
         /// </summary>
-        private IDictionary<string, object> Parameters { get; set; }
+        private IDictionary<string, object?> Parameters { get; set; }
 
         /// <summary>
         /// 获得/设置 组件类型
@@ -29,7 +28,7 @@ namespace BootstrapBlazor.Components
         /// </summary>
         /// <param name="componentType"></param>
         /// <param name="parameters">TCom 组件所需要的参数集合</param>
-        public BootstrapDynamicComponent(Type componentType, IDictionary<string, object> parameters)
+        public BootstrapDynamicComponent(Type componentType, IDictionary<string, object?> parameters)
         {
             ComponentType = componentType;
             Parameters = parameters;
@@ -41,14 +40,14 @@ namespace BootstrapBlazor.Components
         /// <typeparam name="TCom"></typeparam>
         /// <param name="parameters">TCom 组件所需要的参数集合</param>
         /// <returns></returns>
-        public static BootstrapDynamicComponent CreateComponent<TCom>(IDictionary<string, object> parameters) where TCom : IComponent => new(typeof(TCom), parameters);
+        public static BootstrapDynamicComponent CreateComponent<TCom>(IDictionary<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>(new Dictionary<string, object>());
+        public static BootstrapDynamicComponent CreateComponent<TCom>() where TCom : IComponent => CreateComponent<TCom>(new Dictionary<string, object?>());
 
         /// <summary>
         /// 创建组件实例并渲染
@@ -58,9 +57,9 @@ namespace BootstrapBlazor.Components
         {
             var index = 0;
             builder.OpenComponent(index++, ComponentType);
-            if (Parameters.Any())
+            foreach (var p in Parameters)
             {
-                builder.AddMultipleAttributes(index++, Parameters);
+                builder.AddAttribute(index++, p.Key, p.Value);
             }
             builder.CloseComponent();
         };