From 72ceb3733114d03e04a79b3804fa70bf9f724132 Mon Sep 17 00:00:00 2001 From: Argo-Asicotech Date: Thu, 24 Nov 2022 22:11:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E9=94=99=E8=AF=AF=E5=AF=BC=E8=87=B4=E5=A4=9A?= =?UTF-8?q?=E7=BA=A7=E5=BC=B9=E7=AA=97=20backdrop=20=E8=AE=BE=E7=BD=AE=20f?= =?UTF-8?q?alse=20=E6=97=A0=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/wwwroot/modules/modal.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/BootstrapBlazor/wwwroot/modules/modal.js b/src/BootstrapBlazor/wwwroot/modules/modal.js index 3db6eacda..78ccdd062 100644 --- a/src/BootstrapBlazor/wwwroot/modules/modal.js +++ b/src/BootstrapBlazor/wwwroot/modules/modal.js @@ -1,6 +1,6 @@ import BlazorComponent from "./base/blazor-component.js" import EventHandler from "./base/event-handler.js" -import {drag, getHeight, getWidth} from "./base/utility.js" +import { drag, getHeight, getWidth } from "./base/utility.js" export class Modal extends BlazorComponent { _init() { @@ -67,8 +67,8 @@ export class Modal extends BlazorComponent { this._state = [] } this._state.push({ - keyboard: this._element.getAttribute('data-bs-keyboard') === 'true', - backdrop: this._element.getAttribute('data-bs-backdrop') !== 'static' + keyboard: this._element.getAttribute('data-bs-keyboard'), + backdrop: this._element.getAttribute('data-bs-backdrop') }) this._invoker.invokeMethodAsync(this._invokerShownMethod) @@ -87,7 +87,7 @@ export class Modal extends BlazorComponent { this._originY = 0; this._dialogWidth = 0; this._dialogHeight = 0; - this._pt = {top: 0, left: 0}; + this._pt = { top: 0, left: 0 }; this._header = this._dialog.querySelector('.modal-header') drag(this._header, @@ -137,7 +137,7 @@ export class Modal extends BlazorComponent { this._handlerEscape = e => { if (e.key === 'Escape') { const state = this._state[this._state.length - 1] - if (state.keyboard) { + if (state.keyboard === 'true') { this._hide() this._state.pop() } -- Gitee From bc295568c9af6496993040bb7008e2bd9e8b35d2 Mon Sep 17 00:00:00 2001 From: Argo-Asicotech Date: Thu, 24 Nov 2022 22:14:14 +0800 Subject: [PATCH 2/2] chore: bump version 7.0.7-beta01 --- 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 ea48c032a..c6e49aa70 100644 --- a/src/BootstrapBlazor/BootstrapBlazor.csproj +++ b/src/BootstrapBlazor/BootstrapBlazor.csproj @@ -1,7 +1,7 @@ - 7.0.6 + 7.0.7-beta01 -- Gitee