From 17b9482304a021e0133776e33823c10380031608 Mon Sep 17 00:00:00 2001 From: Argo Date: Tue, 18 Jan 2022 05:05:27 +0000 Subject: [PATCH] =?UTF-8?q?!2327=20refactor(#I4R9DA):=20update=20popover.j?= =?UTF-8?q?s=20javascript=20*=20refactor:=20=E5=BE=AE=E8=B0=83=20Popover?= =?UTF-8?q?=20=E8=84=9A=E6=9C=AC=E4=BB=A3=E7=A0=81=20*=20revert:=20?= =?UTF-8?q?=E6=81=A2=E5=A4=8D=E9=85=8D=E7=BD=AE=20*=20doc:=20=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .editorconfig | 2 +- src/BootstrapBlazor/Components/Button/ButtonBase.cs | 8 ++++---- src/BootstrapBlazor/Components/Popover/Popover.js | 4 +--- .../wwwroot/js/bootstrap.blazor.bundle.min.js | 2 +- src/BootstrapBlazor/wwwroot/js/bootstrap.blazor.min.js | 2 +- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.editorconfig b/.editorconfig index d0722647b..3635de8b6 100644 --- a/.editorconfig +++ b/.editorconfig @@ -91,7 +91,7 @@ csharp_style_var_when_type_is_apparent = true:silent csharp_style_var_elsewhere = true:silent csharp_prefer_static_local_function= true:silent # Expression-bodied members -csharp_style_expression_bodied_methods =true:silent +csharp_style_expression_bodied_methods =false:silent csharp_style_expression_bodied_constructors = false:silent csharp_style_expression_bodied_operators = false:silent csharp_style_expression_bodied_properties = true:silent diff --git a/src/BootstrapBlazor/Components/Button/ButtonBase.cs b/src/BootstrapBlazor/Components/Button/ButtonBase.cs index 69c555c92..e23619256 100644 --- a/src/BootstrapBlazor/Components/Button/ButtonBase.cs +++ b/src/BootstrapBlazor/Components/Button/ButtonBase.cs @@ -179,8 +179,8 @@ public abstract class ButtonBase : TooltipComponentBase exception = ex; } - // 恢复按钮 - if (IsAsync && ButtonType == ButtonType.Button) + // 恢复按钮 + if (IsAsync && ButtonType == ButtonType.Button) { ButtonIcon = Icon; IsDisabled = false; @@ -189,8 +189,8 @@ public abstract class ButtonBase : TooltipComponentBase if (exception != null) { - // 如果有异常发生强制按钮恢复 - StateHasChanged(); + // 如果有异常发生强制按钮恢复 + StateHasChanged(); throw exception; } }); diff --git a/src/BootstrapBlazor/Components/Popover/Popover.js b/src/BootstrapBlazor/Components/Popover/Popover.js index a3cacc3e6..bebbb6f52 100644 --- a/src/BootstrapBlazor/Components/Popover/Popover.js +++ b/src/BootstrapBlazor/Components/Popover/Popover.js @@ -34,9 +34,7 @@ } if (method !== 'dispose') { var op = { html, sanitize: false, title, content, placement, trigger }; - if (instance == null) { - instance = new bootstrap.Popover(ele, op); - } + instance = new bootstrap.Popover(ele, op); if (method !== '') { $(ele).popover(method); } diff --git a/src/BootstrapBlazor/wwwroot/js/bootstrap.blazor.bundle.min.js b/src/BootstrapBlazor/wwwroot/js/bootstrap.blazor.bundle.min.js index d0a063fd9..c08542edc 100644 --- a/src/BootstrapBlazor/wwwroot/js/bootstrap.blazor.bundle.min.js +++ b/src/BootstrapBlazor/wwwroot/js/bootstrap.blazor.bundle.min.js @@ -13,4 +13,4 @@ var QRCode;!function(){function a(a){this.mode=c.MODE_8BIT_BYTE,this.data=a,this /*! 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('