diff --git a/src/BootstrapBlazor.Shared/Pages/Samples/Modals.razor b/src/BootstrapBlazor.Shared/Pages/Samples/Modals.razor
index 095068143b398dd6a16ba390925cdfd553720f64..efa652a0e73b83f78891fc70134f2f4eb1571f16 100644
--- a/src/BootstrapBlazor.Shared/Pages/Samples/Modals.razor
+++ b/src/BootstrapBlazor.Shared/Pages/Samples/Modals.razor
@@ -25,8 +25,10 @@
                 </div>
             </div>
             <div class="form-group col-12">
-                <p>通过设置 <code>Modal</code> 组件的 <code>IsKeyboard</code> 参数，开启弹窗是否支持 <kbd>ESC</kbd>，请点击后面按钮设置后再点击 <b>弹窗</b> 按钮测试效果</p>
-                <Button OnClick="@(async e => await Modal.Toggle())">弹窗</Button> <Button OnClick="@OnClickKeyboard" Text="@($"Keyboard: {IsKeyboard}")" class="ml-3" />
+                <div>
+                    <p>通过设置 <code>Modal</code> 组件的 <code>IsKeyboard</code> 参数，开启弹窗是否支持 <kbd>ESC</kbd>，请点击后面按钮设置后再点击 <b>弹窗</b> 按钮测试效果</p>
+                    <Button OnClick="@(async e => await Modal.Toggle())">弹窗</Button> <Button OnClick="@OnClickKeyboard" Text="@($"Keyboard: {IsKeyboard}")" class="ml-3" />
+                </div>
                 <Modal @ref="Modal" IsKeyboard="@IsKeyboard">
                     <ModalDialog Title="默认弹窗">
                         <BodyTemplate>
diff --git a/src/BootstrapBlazor/Components/Modal/Modal.razor.cs b/src/BootstrapBlazor/Components/Modal/Modal.razor.cs
index 3b0a578e50cd8e0a5fa18cedbe60c17056d5ee3d..5e7897d401b12ef13453cbc8da4e90b510123bfd 100644
--- a/src/BootstrapBlazor/Components/Modal/Modal.razor.cs
+++ b/src/BootstrapBlazor/Components/Modal/Modal.razor.cs
@@ -63,7 +63,7 @@ namespace BootstrapBlazor.Components
 
         private bool IsRendered { get; set; }
 
-        private string? KeyboardString => IsKeyboard ? null : "false";
+        private string? KeyboardString => IsKeyboard ? "true" : "false";
 
         /// <summary>
         /// OnAfterRender 方法
diff --git a/src/BootstrapBlazor/Components/Modal/Modal.razor.cs.js b/src/BootstrapBlazor/Components/Modal/Modal.razor.cs.js
index 8e1a296b33cfa88afa8d1d9ef0aa06aac3eab271..f9d56d31a9d7468c5362d08e63219698a5ee6926 100644
--- a/src/BootstrapBlazor/Components/Modal/Modal.razor.cs.js
+++ b/src/BootstrapBlazor/Components/Modal/Modal.razor.cs.js
@@ -71,7 +71,7 @@
                     );
                 }
                 $el.on('shown.bs.modal', function () {
-                    var keyboard = $el.data('keyboard');
+                    var keyboard = $el.attr('data-keyboard') === "true";
                     if (keyboard === true) {
                         $(document).one('keyup', function (e) {
                             if (e.key === 'Escape') {
@@ -87,11 +87,10 @@
             }
             else {
                 if (method !== 'hide' && method !== 'dispose') {
-                    var keyboard = $el.attr('data-keyboard') === "false";
+                    var keyboard = $el.attr('data-keyboard') === "true";
                     var config = $el.data('bs.modal');
                     if (config != null) {
-                        config._config.keyboard = !keyboard;
-                        console.log(!keyboard);
+                        config._config.keyboard = keyboard;
                     }
                 }
                 $el.modal(method);
diff --git a/src/BootstrapBlazor/Components/Modal/Modal.razor.cs.min.js b/src/BootstrapBlazor/Components/Modal/Modal.razor.cs.min.js
index 43a7848ade5297dd53e869a9ecaf63b43a3cb53d..73f5d7092fb4a8f332d9da79b78eb20043aa30d3 100644
--- a/src/BootstrapBlazor/Components/Modal/Modal.razor.cs.min.js
+++ b/src/BootstrapBlazor/Components/Modal/Modal.razor.cs.min.js
@@ -1 +1 @@
-(function(n){n.extend({bb_modal_dialog:function(t,i,r){var u=n(t);u.data("bb_dotnet_invoker",{obj:i,method:r})},bb_modal:function(t,i){var u=n(t),o,s;if(i==="dispose")u.remove();else if(i==="init"){if(u.closest(".swal").length===0){n("body").append(u);var h=0,c=0,e=0,l=0,f={top:0,left:0},r=null;u.find(".is-draggable .modal-header").drag(function(n){h=n.clientX||n.touches[0].clientX;c=n.clientY||n.touches[0].clientY;r=this.closest(".modal-dialog");e=r.width();l=r.height();f.top=parseInt(r.css("marginTop").replace("px",""));f.left=parseInt(r.css("marginLeft").replace("px",""));r.css({marginLeft:f.left,marginTop:f.top});r.removeClass("modal-dialog-centered");r.css("width",e);this.addClass("is-drag")},function(t){var i=t.clientX||t.changedTouches[0].clientX,u=t.clientY||t.changedTouches[0].clientY;newValX=f.left+Math.ceil(i-h);newValY=f.top+Math.ceil(u-c);newValX<=0&&(newValX=0);newValY<=0&&(newValY=0);newValX+e<n(window).width()&&r!=null&&r.css({marginLeft:newValX});newValY+l<n(window).height()&&r!=null&&r.css({marginTop:newValY})},function(){this.removeClass("is-drag")})}u.on("shown.bs.modal",function(){var t=u.data("keyboard");if(t===!0)n(document).one("keyup",function(n){if(n.key==="Escape"){var i=u.find(".modal-dialog"),t=i.data("bb_dotnet_invoker");t!=null&&t.obj.invokeMethodAsync(t.method)}})})}else i!=="hide"&&i!=="dispose"&&(o=u.attr("data-keyboard")==="false",s=u.data("bs.modal"),s!=null&&(s._config.keyboard=!o,console.log(!o))),u.modal(i)}})})(jQuery);
\ No newline at end of file
+(function(n){n.extend({bb_modal_dialog:function(t,i,r){var u=n(t);u.data("bb_dotnet_invoker",{obj:i,method:r})},bb_modal:function(t,i){var u=n(t),l,o;if(i==="dispose")u.remove();else if(i==="init"){if(u.closest(".swal").length===0){n("body").append(u);var s=0,h=0,e=0,c=0,f={top:0,left:0},r=null;u.find(".is-draggable .modal-header").drag(function(n){s=n.clientX||n.touches[0].clientX;h=n.clientY||n.touches[0].clientY;r=this.closest(".modal-dialog");e=r.width();c=r.height();f.top=parseInt(r.css("marginTop").replace("px",""));f.left=parseInt(r.css("marginLeft").replace("px",""));r.css({marginLeft:f.left,marginTop:f.top});r.removeClass("modal-dialog-centered");r.css("width",e);this.addClass("is-drag")},function(t){var i=t.clientX||t.changedTouches[0].clientX,u=t.clientY||t.changedTouches[0].clientY;newValX=f.left+Math.ceil(i-s);newValY=f.top+Math.ceil(u-h);newValX<=0&&(newValX=0);newValY<=0&&(newValY=0);newValX+e<n(window).width()&&r!=null&&r.css({marginLeft:newValX});newValY+c<n(window).height()&&r!=null&&r.css({marginTop:newValY})},function(){this.removeClass("is-drag")})}u.on("shown.bs.modal",function(){var t=u.attr("data-keyboard")==="true";if(t===!0)n(document).one("keyup",function(n){if(n.key==="Escape"){var i=u.find(".modal-dialog"),t=i.data("bb_dotnet_invoker");t!=null&&t.obj.invokeMethodAsync(t.method)}})})}else i!=="hide"&&i!=="dispose"&&(l=u.attr("data-keyboard")==="true",o=u.data("bs.modal"),o!=null&&(o._config.keyboard=l)),u.modal(i)}})})(jQuery);
\ No newline at end of file
diff --git a/src/BootstrapBlazor/wwwroot/js/bootstrap.blazor.bundle.min.js b/src/BootstrapBlazor/wwwroot/js/bootstrap.blazor.bundle.min.js
index 2099ce526561c86f30560058a2bad5101ea151f7..0d319dbb9d17ca544570f7368fc02d8125836703 100644
--- a/src/BootstrapBlazor/wwwroot/js/bootstrap.blazor.bundle.min.js
+++ b/src/BootstrapBlazor/wwwroot/js/bootstrap.blazor.bundle.min.js
@@ -62,7 +62,7 @@ x();"bottom"===a.start?(c.css({top:b.outerHeight()-c.outerHeight()}),n(0,!0)):"t
 (function(n){n.extend({bb_layout:function(t,i){if(i==="dispose"){n(window).off("resize");return}var r=function(){var r=n(window).width();t.invokeMethodAsync(i,r)};n(".layout-header").find('[data-toggle="tooltip"]').tooltip();r();n(window).on("resize",function(){r()})}})})(jQuery);
 (function(n){n.extend({bb_message:function(t,i,r){window.Messages||(window.Messages=[]);Messages.push(t);var u=n(t),e=u.attr("data-autohide")!=="false",o=parseInt(u.attr("data-delay")),f=null,s=window.setTimeout(function(){window.clearTimeout(s);e&&(f=window.setTimeout(function(){window.clearTimeout(f);u.close()},o));u.addClass("show")},50);u.close=function(){f!=null&&window.clearTimeout(f);u.removeClass("show");var n=window.setTimeout(function(){window.clearTimeout(n);Messages.remove(t);Messages.length===0&&i.invokeMethodAsync(r)},500)};u.on("click",".close",function(n){n.preventDefault();n.stopPropagation();u.close()})}})})(jQuery);
 (function(n){n.extend({bb_side_menu_expand:function(t,i){if(i)n(t).find(".collapse").collapse("show");else{n(t).find(".collapse").collapse("hide");var r=window.setTimeout(function(){window.clearTimeout(r);n.bb_auto_expand(n(t))},400)}},bb_auto_expand:function(t){var u=t.find(".nav-link.expand").map(function(t,i){return n(i).removeClass("expand")}).toArray(),i=t.find(".active"),r;do r=i.parentsUntil(".submenu.collapse").parent(),r.length===1&&r.not(".show")?(i=r.prev(),i.length!==0&&u.push(i)):i=null;while(i!=null&&i.length>0);while(u.length>0)i=u.shift(),i.trigger("click")},bb_init_side_menu:function(t){var i=t.hasClass("accordion"),r=t.children(".submenu"),u;r.find(".submenu").each(function(){var t=n(this),r,f,e,u;t.addClass("collapse").removeClass("d-none");i?(r=t.parentsUntil(".submenu"),r.prop("nodeName")==="LI"&&(f=r.parent().attr("id"),t.attr("data-parent","#"+f))):t.removeAttr("data-parent");e=t.attr("id");u=t.prev();u.attr("data-toggle","collapse");u.attr("href","#"+e)});u=r.find(".collapse");u.each(function(t,r){var u=n(r),f;u.data("bs.collapse")&&u.collapse("dispose");f="";i&&(f=u.attr("data-parent"));u.collapse({parent:f,toggle:!1})})},bb_side_menu:function(t){var i=n(t);n.bb_init_side_menu(i);n.bb_auto_expand(n(t))}})})(jQuery);
-(function(n){n.extend({bb_modal_dialog:function(t,i,r){var u=n(t);u.data("bb_dotnet_invoker",{obj:i,method:r})},bb_modal:function(t,i){var u=n(t),o,s;if(i==="dispose")u.remove();else if(i==="init"){if(u.closest(".swal").length===0){n("body").append(u);var h=0,c=0,e=0,l=0,f={top:0,left:0},r=null;u.find(".is-draggable .modal-header").drag(function(n){h=n.clientX||n.touches[0].clientX;c=n.clientY||n.touches[0].clientY;r=this.closest(".modal-dialog");e=r.width();l=r.height();f.top=parseInt(r.css("marginTop").replace("px",""));f.left=parseInt(r.css("marginLeft").replace("px",""));r.css({marginLeft:f.left,marginTop:f.top});r.removeClass("modal-dialog-centered");r.css("width",e);this.addClass("is-drag")},function(t){var i=t.clientX||t.changedTouches[0].clientX,u=t.clientY||t.changedTouches[0].clientY;newValX=f.left+Math.ceil(i-h);newValY=f.top+Math.ceil(u-c);newValX<=0&&(newValX=0);newValY<=0&&(newValY=0);newValX+e<n(window).width()&&r!=null&&r.css({marginLeft:newValX});newValY+l<n(window).height()&&r!=null&&r.css({marginTop:newValY})},function(){this.removeClass("is-drag")})}u.on("shown.bs.modal",function(){var t=u.data("keyboard");if(t===!0)n(document).one("keyup",function(n){if(n.key==="Escape"){var i=u.find(".modal-dialog"),t=i.data("bb_dotnet_invoker");t!=null&&t.obj.invokeMethodAsync(t.method)}})})}else i!=="hide"&&i!=="dispose"&&(o=u.attr("data-keyboard")==="false",s=u.data("bs.modal"),s!=null&&(s._config.keyboard=!o,console.log(!o))),u.modal(i)}})})(jQuery);
+(function(n){n.extend({bb_modal_dialog:function(t,i,r){var u=n(t);u.data("bb_dotnet_invoker",{obj:i,method:r})},bb_modal:function(t,i){var u=n(t),l,o;if(i==="dispose")u.remove();else if(i==="init"){if(u.closest(".swal").length===0){n("body").append(u);var s=0,h=0,e=0,c=0,f={top:0,left:0},r=null;u.find(".is-draggable .modal-header").drag(function(n){s=n.clientX||n.touches[0].clientX;h=n.clientY||n.touches[0].clientY;r=this.closest(".modal-dialog");e=r.width();c=r.height();f.top=parseInt(r.css("marginTop").replace("px",""));f.left=parseInt(r.css("marginLeft").replace("px",""));r.css({marginLeft:f.left,marginTop:f.top});r.removeClass("modal-dialog-centered");r.css("width",e);this.addClass("is-drag")},function(t){var i=t.clientX||t.changedTouches[0].clientX,u=t.clientY||t.changedTouches[0].clientY;newValX=f.left+Math.ceil(i-s);newValY=f.top+Math.ceil(u-h);newValX<=0&&(newValX=0);newValY<=0&&(newValY=0);newValX+e<n(window).width()&&r!=null&&r.css({marginLeft:newValX});newValY+c<n(window).height()&&r!=null&&r.css({marginTop:newValY})},function(){this.removeClass("is-drag")})}u.on("shown.bs.modal",function(){var t=u.attr("data-keyboard")==="true";if(t===!0)n(document).one("keyup",function(n){if(n.key==="Escape"){var i=u.find(".modal-dialog"),t=i.data("bb_dotnet_invoker");t!=null&&t.obj.invokeMethodAsync(t.method)}})})}else i!=="hide"&&i!=="dispose"&&(l=u.attr("data-keyboard")==="true",o=u.data("bs.modal"),o!=null&&(o._config.keyboard=l)),u.modal(i)}})})(jQuery);
 (function(n){n.extend({bb_popover:function(t,i,r,u,f,e,o){var s=n("#"+t),h={html:e,sanitize:!1,title:r,content:u,placement:f,trigger:o};i===""?(s.data("bs.popover")&&s.popover("dispose"),s.popover(h)):i==="dispose"?s.data("bs.popover")&&s.popover(i):(s.data("bs.popover")||s.popover(h),s.popover(i))}});n(function(){n.fn.popover.Constructor.prototype.isWithContent=function(){var n=this.config.toggle;return["","confirm","datetime-picker","datetime-range"].indexOf(n)||this.getTitle()||this._getContent()};var t=function(t){var i=null,r=t.parents(".popover"),u;return r.length>0&&(u=r.attr("id"),i=n('[aria-describedby="'+u+'"]')),i};n(document).on("click",function(i){var r=!0,u=n(i.target),f=t(u);f!=null&&(r=!1);r&&n('[data-toggle="confirm"][aria-describedby^="popover"]').popover("hide")});n(document).on("click",".popover-confirm-buttons .btn",function(i){var r,u,f;i.stopPropagation();r=t(n(this));r!=null&&(r.popover("hide"),u=r.attr("id"),$ele=n('[data-target="'+u+'"]'),f=this.getAttribute("data-dismiss")==="confirm"?$ele.find(".popover-confirm-buttons .btn:first"):$ele.find(".popover-confirm-buttons .btn:last"),f.trigger("click"))})})})(jQuery);
 (function(n){n.extend({bb_qrcode:function(t){var u=n(t),f=u.find(".qrcode-img"),i,r,e;f.html("");i="";r=null;arguments.length===2?i=arguments[1]:(i=arguments[2],r=arguments[1]);i==="generate"&&(e=u.find(".qrcode-text").val(),qrcode=new QRCode(f[0],{text:e,width:128,height:128,colorDark:"#000000",colorLight:"#ffffff",correctLevel:QRCode.CorrectLevel.H}),r.invokeMethodAsync("Generated"))}})})(jQuery);
 (function(n){n.extend({bb_rate:function(t,i,r){var u=n(t),f;u.val=parseInt(u.attr("aria-valuenow"));f=function(){var t=u.find(".rate-item");t.each(function(t){t>u.val?n(this).removeClass("is-on"):n(this).addClass("is-on")})};u.on("mouseenter",".rate-item",function(){if(!u.hasClass("disabled")){var t=u.find(".rate-item"),i=t.toArray().indexOf(this);t.each(function(t){t>i?n(this).removeClass("is-on"):n(this).addClass("is-on")})}});u.on("mouseleave",function(){u.hasClass("disabled")||f()});u.on("click",".rate-item",function(){if(!u.hasClass("disabled")){var n=u.find(".rate-item");u.val=n.toArray().indexOf(this);u.attr("aria-valuenow",u.val+1);i.invokeMethodAsync(r,u.val+1)}})}})})(jQuery);