From 438b304ad05ba9d86850bb0e389b27570eaadb86 Mon Sep 17 00:00:00 2001 From: Argo-Tianyi Date: Mon, 16 Aug 2021 12:29:08 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=9C=AA=E9=80=89=E6=8B=A9=E6=97=B6=E4=BB=8D?= =?UTF-8?q?=E5=BC=B9=E5=87=BA=E7=A1=AE=E8=AE=A4=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Popover/Popover.js | 13 ++++++++----- .../wwwroot/js/bootstrap.blazor.bundle.min.js | 2 +- .../wwwroot/js/bootstrap.blazor.min.js | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/BootstrapBlazor/Components/Popover/Popover.js b/src/BootstrapBlazor/Components/Popover/Popover.js index be82d1ac2..826628ec8 100644 --- a/src/BootstrapBlazor/Components/Popover/Popover.js +++ b/src/BootstrapBlazor/Components/Popover/Popover.js @@ -154,6 +154,11 @@ return button; }; + var disposePopup = function ($ele) { + $ele.popover('dispose'); + $ele.removeClass('is-show'); + }; + $(document).on('click', function (e) { // hide popover var hide = true; @@ -170,8 +175,7 @@ $('[data-bs-toggle="confirm"][aria-describedby^="popover"]').each(function (index, ele) { if ($target[0] !== ele) { var $ele = $(ele); - $ele.popover('hide'); - $ele.removeClass('is-show'); + disposePopup($ele); } }); } @@ -204,14 +208,13 @@ // 确认弹窗按钮事件 var $confirm = findConfirmButton($(this)); - if ($confirm != null) { + if ($confirm.length > 0) { // 关闭弹窗 - $confirm.popover('hide'); + disposePopup($confirm); // remove popover var buttonId = $confirm.attr('id'); $ele = $('[data-bs-target="' + buttonId + '"]'); - $('#' + buttonId).removeClass('is-show'); var $button = this.getAttribute('data-dismiss') === 'confirm' ? $ele.find('.popover-confirm-buttons .btn:first') diff --git a/src/BootstrapBlazor/wwwroot/js/bootstrap.blazor.bundle.min.js b/src/BootstrapBlazor/wwwroot/js/bootstrap.blazor.bundle.min.js index 8fbe4f47c..3464ea078 100644 --- a/src/BootstrapBlazor/wwwroot/js/bootstrap.blazor.bundle.min.js +++ b/src/BootstrapBlazor/wwwroot/js/bootstrap.blazor.bundle.min.js @@ -30,4 +30,4 @@ x();"bottom"===a.start?(c.css({top:b.outerHeight()-c.outerHeight()}),n(0,!0)):"t /*! Summernote v0.8.18 | (c) 2013- Alan Hong and other contributors | MIT license */ !function(t,e){if("object"==typeof exports&&"object"==typeof module)module.exports=e(require("jquery"));else if("function"==typeof define&&define.amd)define(["jquery"],e);else{var n="object"==typeof exports?e(require("jquery")):e(t.jQuery);for(var o in n)("object"==typeof exports?exports:t)[o]=n[o]}}(self,(function(t){return(()=>{"use strict";var e={9458:e=>{e.exports=t}},n={};function o(t){var i=n[t];if(void 0!==i)return i.exports;var r=n[t]={exports:{}};return e[t](r,r.exports,o),r.exports}o.amdO={},o.n=t=>{var e=t&&t.__esModule?()=>t.default:()=>t;return o.d(e,{a:e}),e},o.d=(t,e)=>{for(var n in e)o.o(e,n)&&!o.o(t,n)&&Object.defineProperty(t,n,{enumerable:!0,get:e[n]})},o.o=(t,e)=>Object.prototype.hasOwnProperty.call(t,e),o.r=t=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})};var i={};return(()=>{o.r(i);var t=o(9458),e=o.n(t);function n(t){return(n="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function r(t,e){for(var n=0;n'),u=s('