From 96283d7cd8203d9bd32a02fec5d4bac7dbeba4b8 Mon Sep 17 00:00:00 2001 From: jx Date: Fri, 1 Apr 2022 21:26:15 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=96=E9=83=A8?= =?UTF-8?q?=E6=93=8D=E4=BD=9CEditor=E5=92=8CMarkdown=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=99=A8=E7=9A=84=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Samples/Editors.razor | 9 +++++++ .../Samples/Editors.razor.cs | 8 ++++++ .../Samples/Markdowns.razor | 7 ++++++ .../Samples/Markdowns.razor.cs | 4 +++ .../Components/Editor/Editor.js | 4 +++ .../Components/Editor/Editor.razor.cs | 8 ++++++ .../Components/Markdown/Markdown.js | 25 +++++++++++-------- .../Components/Markdown/Markdown.razor.cs | 15 +++++++++++ 8 files changed, 70 insertions(+), 10 deletions(-) diff --git a/src/BootstrapBlazor.Shared/Samples/Editors.razor b/src/BootstrapBlazor.Shared/Samples/Editors.razor index 1e4b6c289..e1baadd14 100644 --- a/src/BootstrapBlazor.Shared/Samples/Editors.razor +++ b/src/BootstrapBlazor.Shared/Samples/Editors.razor @@ -1,4 +1,5 @@ @page "/editors" + @inject SwalService SwalService @inject IStringLocalizer Localizer @@ -48,4 +49,12 @@ + +

@((MarkupString)Localizer["P6"].Value)

+ + + + + + diff --git a/src/BootstrapBlazor.Shared/Samples/Editors.razor.cs b/src/BootstrapBlazor.Shared/Samples/Editors.razor.cs index 922b8d680..d791639ce 100644 --- a/src/BootstrapBlazor.Shared/Samples/Editors.razor.cs +++ b/src/BootstrapBlazor.Shared/Samples/Editors.razor.cs @@ -14,6 +14,9 @@ public sealed partial class Editors { private string? EditorValue { get; set; } + [NotNull] + private Editor? Editor { get; set; } + private Task OnValueChanged(string val) { EditorValue = val; @@ -25,6 +28,11 @@ public sealed partial class Editors EditorValue = Localizer["UpdateValue"]; } + private async Task InsertHtmlAsync() + { + await Editor.DoMethodAysnc("pasteHTML", "

这里是外部按钮插入的内容

"); + } + private List? EditorPluginItems { get; set; } private async Task PluginClick(string pluginItemName) diff --git a/src/BootstrapBlazor.Shared/Samples/Markdowns.razor b/src/BootstrapBlazor.Shared/Samples/Markdowns.razor index 70a467bf6..f096e943b 100644 --- a/src/BootstrapBlazor.Shared/Samples/Markdowns.razor +++ b/src/BootstrapBlazor.Shared/Samples/Markdowns.razor @@ -86,4 +86,11 @@ + + + + + + + diff --git a/src/BootstrapBlazor.Shared/Samples/Markdowns.razor.cs b/src/BootstrapBlazor.Shared/Samples/Markdowns.razor.cs index ed7b7473d..df6e5cfb1 100644 --- a/src/BootstrapBlazor.Shared/Samples/Markdowns.razor.cs +++ b/src/BootstrapBlazor.Shared/Samples/Markdowns.razor.cs @@ -2,6 +2,7 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Website: https://www.blazor.zone or https://argozhang.github.io/ +using BootstrapBlazor.Components; using BootstrapBlazor.Shared.Common; using System.Globalization; @@ -29,6 +30,9 @@ public partial class Markdowns console.log('test'); ```"; + [NotNull] + private Markdown? Markdown { get; set; } + /// /// OnInitializedAsync 方法 /// diff --git a/src/BootstrapBlazor/Components/Editor/Editor.js b/src/BootstrapBlazor/Components/Editor/Editor.js index c33395c45..ca5ba018e 100644 --- a/src/BootstrapBlazor/Components/Editor/Editor.js +++ b/src/BootstrapBlazor/Components/Editor/Editor.js @@ -111,6 +111,10 @@ else { invoker(); } + }, + bb_editor_method: function (el, method, parameter) { + var editor = el.getElementsByClassName("editor-body"); + $(editor).toggleClass('open').summernote(method, ...parameter); } }); })(jQuery); diff --git a/src/BootstrapBlazor/Components/Editor/Editor.razor.cs b/src/BootstrapBlazor/Components/Editor/Editor.razor.cs index bc32c6334..c456e01f5 100644 --- a/src/BootstrapBlazor/Components/Editor/Editor.razor.cs +++ b/src/BootstrapBlazor/Components/Editor/Editor.razor.cs @@ -104,6 +104,14 @@ public partial class Editor : IDisposable [Parameter] public Func>? OnClickButton { get; set; } + /// + /// 执行editor的方法 + /// + public async Task DoMethodAysnc(string method, params object[] value) + { + await JSRuntime.InvokeVoidAsync(EditorElement, "bb_editor_method", method, value); + } + /// /// OnInitialized 方法 /// diff --git a/src/Extensions/Components/BootstrapBlazor.Markdown/Components/Markdown/Markdown.js b/src/Extensions/Components/BootstrapBlazor.Markdown/Components/Markdown/Markdown.js index 942985692..257b86965 100644 --- a/src/Extensions/Components/BootstrapBlazor.Markdown/Components/Markdown/Markdown.js +++ b/src/Extensions/Components/BootstrapBlazor.Markdown/Components/Markdown/Markdown.js @@ -13,17 +13,18 @@ editor.setMarkdown(value); } else { - $.extend(value, { - events: { - blur: function () { - var editor = $.data(el, 'editor'); - var val = editor.getMarkdown(); - var html = editor.getHTML(); - obj.invokeMethodAsync(method, [val, html]); + $.extend(value, + { + events: { + blur: function() { + var editor = $.data(el, 'editor'); + var val = editor.getMarkdown(); + var html = editor.getHTML(); + obj.invokeMethodAsync(method, [val, html]); + } } - } - }) - + }); + // 修复弹窗内初始化值不正确问题 var handler = window.setInterval(function () { if ($el.is(':visible')) { @@ -39,6 +40,10 @@ } }, 100); } + }, + bb_markdown_method: function (el, obj, method, parameter) { + var editor = $.data(el, 'editor'); + editor[method](...parameter); } }); })(jQuery); diff --git a/src/Extensions/Components/BootstrapBlazor.Markdown/Components/Markdown/Markdown.razor.cs b/src/Extensions/Components/BootstrapBlazor.Markdown/Components/Markdown/Markdown.razor.cs index 6b8e461ae..30963671b 100644 --- a/src/Extensions/Components/BootstrapBlazor.Markdown/Components/Markdown/Markdown.razor.cs +++ b/src/Extensions/Components/BootstrapBlazor.Markdown/Components/Markdown/Markdown.razor.cs @@ -102,6 +102,21 @@ public partial class Markdown : IDisposable private bool IsRender { get; set; } + /// + /// 执行方法 + /// + /// + /// + /// + public async Task DoMethodAsync(string method, params object[] parameters) + { + if (Interop == null) + { + Interop = new JSInterop(JSRuntime); + } + await Interop.InvokeVoidAsync(this, MarkdownElement, "bb_markdown_method", method, parameters); + } + /// /// OnInitialized 方法 /// -- Gitee From 7dca0b04bcde7977cb58150ed84a1399c9bdfbc2 Mon Sep 17 00:00:00 2001 From: Argo-Tianyi Date: Sat, 2 Apr 2022 13:38:30 +0800 Subject: [PATCH 02/11] revert: format document --- src/BootstrapBlazor.Shared/Samples/Editors.razor | 1 - 1 file changed, 1 deletion(-) diff --git a/src/BootstrapBlazor.Shared/Samples/Editors.razor b/src/BootstrapBlazor.Shared/Samples/Editors.razor index e1baadd14..983f76a13 100644 --- a/src/BootstrapBlazor.Shared/Samples/Editors.razor +++ b/src/BootstrapBlazor.Shared/Samples/Editors.razor @@ -1,5 +1,4 @@ @page "/editors" - @inject SwalService SwalService @inject IStringLocalizer Localizer -- Gitee From b751010af7ba6c8e2bbf1303c618d660862ded12 Mon Sep 17 00:00:00 2001 From: Argo-Tianyi Date: Sat, 2 Apr 2022 13:38:43 +0800 Subject: [PATCH 03/11] doc: use PlaceHolder --- src/BootstrapBlazor.Shared/Samples/Editors.razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor.Shared/Samples/Editors.razor b/src/BootstrapBlazor.Shared/Samples/Editors.razor index 983f76a13..17729a029 100644 --- a/src/BootstrapBlazor.Shared/Samples/Editors.razor +++ b/src/BootstrapBlazor.Shared/Samples/Editors.razor @@ -16,7 +16,7 @@

@((MarkupString)Localizer["P3"].Value)

- + -- Gitee From a0788071b83fe1c4190d1f3725e6d075bf9c7537 Mon Sep 17 00:00:00 2001 From: Argo-Tianyi Date: Sat, 2 Apr 2022 13:48:26 +0800 Subject: [PATCH 04/11] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=20MD=20?= =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Markdown/Markdown.js | 25 ++++++++++--------- .../Components/Markdown/Markdown.min.js | 2 +- .../js/bootstrap.blazor.markdown.min.js | 2 +- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/Extensions/Components/BootstrapBlazor.Markdown/Components/Markdown/Markdown.js b/src/Extensions/Components/BootstrapBlazor.Markdown/Components/Markdown/Markdown.js index 257b86965..96a9088e4 100644 --- a/src/Extensions/Components/BootstrapBlazor.Markdown/Components/Markdown/Markdown.js +++ b/src/Extensions/Components/BootstrapBlazor.Markdown/Components/Markdown/Markdown.js @@ -9,21 +9,20 @@ var $el = $(el); if (method === "setMarkdown") { //$el.toastuiEditor('setMarkdown', value); - var editor = $.data(el,'editor'); + var editor = $.data(el, 'editor'); editor.setMarkdown(value); } else { - $.extend(value, - { - events: { - blur: function() { - var editor = $.data(el, 'editor'); - var val = editor.getMarkdown(); - var html = editor.getHTML(); - obj.invokeMethodAsync(method, [val, html]); - } + $.extend(value, { + events: { + blur: function () { + var editor = $.data(el, 'editor'); + var val = editor.getMarkdown(); + var html = editor.getHTML(); + obj.invokeMethodAsync(method, [val, html]); } - }); + } + }); // 修复弹窗内初始化值不正确问题 var handler = window.setInterval(function () { @@ -43,7 +42,9 @@ }, bb_markdown_method: function (el, obj, method, parameter) { var editor = $.data(el, 'editor'); - editor[method](...parameter); + if (editor) { + editor[method](parameter); + } } }); })(jQuery); diff --git a/src/Extensions/Components/BootstrapBlazor.Markdown/Components/Markdown/Markdown.min.js b/src/Extensions/Components/BootstrapBlazor.Markdown/Components/Markdown/Markdown.min.js index 7567451cb..064bceacc 100644 --- a/src/Extensions/Components/BootstrapBlazor.Markdown/Components/Markdown/Markdown.min.js +++ b/src/Extensions/Components/BootstrapBlazor.Markdown/Components/Markdown/Markdown.min.js @@ -2,4 +2,4 @@ * Markdown : Argo@163.com * @version 5.1.0 */ -(function(n){n.extend({bb_markdown:function(t,i,r,u){var o=n(t),f,e;u==="setMarkdown"?(f=n.data(t,"editor"),f.setMarkdown(r)):(n.extend(r,{events:{blur:function(){var r=n.data(t,"editor"),f=r.getMarkdown(),e=r.getHTML();i.invokeMethodAsync(u,[f,e])}}}),e=window.setInterval(function(){if(o.is(":visible")){window.clearInterval(e);r.el=t;r.plugins=[];r.enableHighlight&&r.plugins.push(toastui.Editor.plugin.codeSyntaxHighlight);delete r.enableHighlight;const i=toastui.Editor.factory(r);n.data(t,"editor",i)}},100))}})})(jQuery); \ No newline at end of file +(function(n){n.extend({bb_markdown:function(t,i,r,u){var o=n(t),f,e;u==="setMarkdown"?(f=n.data(t,"editor"),f.setMarkdown(r)):(n.extend(r,{events:{blur:function(){var r=n.data(t,"editor"),f=r.getMarkdown(),e=r.getHTML();i.invokeMethodAsync(u,[f,e])}}}),e=window.setInterval(function(){if(o.is(":visible")){window.clearInterval(e);r.el=t;r.plugins=[];r.enableHighlight&&r.plugins.push(toastui.Editor.plugin.codeSyntaxHighlight);delete r.enableHighlight;const i=toastui.Editor.factory(r);n.data(t,"editor",i)}},100))},bb_markdown_method:function(t,i,r,u){var f=n.data(t,"editor");f&&f[r](u)}})})(jQuery); \ No newline at end of file diff --git a/src/Extensions/Components/BootstrapBlazor.Markdown/wwwroot/js/bootstrap.blazor.markdown.min.js b/src/Extensions/Components/BootstrapBlazor.Markdown/wwwroot/js/bootstrap.blazor.markdown.min.js index d7ead4a45..b35b45847 100644 --- a/src/Extensions/Components/BootstrapBlazor.Markdown/wwwroot/js/bootstrap.blazor.markdown.min.js +++ b/src/Extensions/Components/BootstrapBlazor.Markdown/wwwroot/js/bootstrap.blazor.markdown.min.js @@ -48,4 +48,4 @@ var t=function(e,n){return t=Object.setPrototypeOf||{__proto__:[]}instanceof Arr * Markdown : Argo@163.com * @version 5.1.0 */ -(function(n){n.extend({bb_markdown:function(t,i,r,u){var o=n(t),f,e;u==="setMarkdown"?(f=n.data(t,"editor"),f.setMarkdown(r)):(n.extend(r,{events:{blur:function(){var r=n.data(t,"editor"),f=r.getMarkdown(),e=r.getHTML();i.invokeMethodAsync(u,[f,e])}}}),e=window.setInterval(function(){if(o.is(":visible")){window.clearInterval(e);r.el=t;r.plugins=[];r.enableHighlight&&r.plugins.push(toastui.Editor.plugin.codeSyntaxHighlight);delete r.enableHighlight;const i=toastui.Editor.factory(r);n.data(t,"editor",i)}},100))}})})(jQuery); \ No newline at end of file +(function(n){n.extend({bb_markdown:function(t,i,r,u){var o=n(t),f,e;u==="setMarkdown"?(f=n.data(t,"editor"),f.setMarkdown(r)):(n.extend(r,{events:{blur:function(){var r=n.data(t,"editor"),f=r.getMarkdown(),e=r.getHTML();i.invokeMethodAsync(u,[f,e])}}}),e=window.setInterval(function(){if(o.is(":visible")){window.clearInterval(e);r.el=t;r.plugins=[];r.enableHighlight&&r.plugins.push(toastui.Editor.plugin.codeSyntaxHighlight);delete r.enableHighlight;const i=toastui.Editor.factory(r);n.data(t,"editor",i)}},100))},bb_markdown_method:function(t,i,r,u){var f=n.data(t,"editor");f&&f[r](u)}})})(jQuery); \ No newline at end of file -- Gitee From e010c1fb8cd3b4db547a96dd2e65d72872caeaac Mon Sep 17 00:00:00 2001 From: Argo-Tianyi Date: Sat, 2 Apr 2022 13:48:42 +0800 Subject: [PATCH 05/11] =?UTF-8?q?refactor:=20=E7=A7=BB=E5=8A=A8=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Markdown/Markdown.razor.cs | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/Extensions/Components/BootstrapBlazor.Markdown/Components/Markdown/Markdown.razor.cs b/src/Extensions/Components/BootstrapBlazor.Markdown/Components/Markdown/Markdown.razor.cs index 30963671b..a616547ad 100644 --- a/src/Extensions/Components/BootstrapBlazor.Markdown/Components/Markdown/Markdown.razor.cs +++ b/src/Extensions/Components/BootstrapBlazor.Markdown/Components/Markdown/Markdown.razor.cs @@ -102,21 +102,6 @@ public partial class Markdown : IDisposable private bool IsRender { get; set; } - /// - /// 执行方法 - /// - /// - /// - /// - public async Task DoMethodAsync(string method, params object[] parameters) - { - if (Interop == null) - { - Interop = new JSInterop(JSRuntime); - } - await Interop.InvokeVoidAsync(this, MarkdownElement, "bb_markdown_method", method, parameters); - } - /// /// OnInitialized 方法 /// @@ -209,6 +194,21 @@ public partial class Markdown : IDisposable } } + /// + /// 执行方法 + /// + /// + /// + /// + public async ValueTask DoMethodAsync(string method, params object[] parameters) + { + if (Interop == null) + { + Interop = new JSInterop(JSRuntime); + } + await Interop.InvokeVoidAsync(this, MarkdownElement, "bb_markdown_method", method, parameters); + } + /// /// Dispose 方法 /// -- Gitee From f53f96cb5a07b008e8bb980908726dc95cd043fc Mon Sep 17 00:00:00 2001 From: Argo-Tianyi Date: Sat, 2 Apr 2022 13:48:56 +0800 Subject: [PATCH 06/11] chore: bump version 6.0.2 --- .../BootstrapBlazor.Markdown/BootstrapBlazor.Markdown.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Extensions/Components/BootstrapBlazor.Markdown/BootstrapBlazor.Markdown.csproj b/src/Extensions/Components/BootstrapBlazor.Markdown/BootstrapBlazor.Markdown.csproj index 0181e7ee0..d3381ca24 100644 --- a/src/Extensions/Components/BootstrapBlazor.Markdown/BootstrapBlazor.Markdown.csproj +++ b/src/Extensions/Components/BootstrapBlazor.Markdown/BootstrapBlazor.Markdown.csproj @@ -1,7 +1,7 @@ - 6.0.1 + 6.0.2 -- Gitee From 1a61cd70916b4159d2524eee67d5b1bea5a30ead Mon Sep 17 00:00:00 2001 From: Argo-Tianyi Date: Sat, 2 Apr 2022 14:00:55 +0800 Subject: [PATCH 07/11] =?UTF-8?q?chore:=20=E6=81=A2=E5=A4=8D=20...=20?= =?UTF-8?q?=E8=AF=AD=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BootstrapBlazor.Markdown/Components/Markdown/Markdown.js | 2 +- .../Components/Markdown/Markdown.min.js | 2 +- .../wwwroot/js/bootstrap.blazor.markdown.min.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Extensions/Components/BootstrapBlazor.Markdown/Components/Markdown/Markdown.js b/src/Extensions/Components/BootstrapBlazor.Markdown/Components/Markdown/Markdown.js index 96a9088e4..1756cc4b1 100644 --- a/src/Extensions/Components/BootstrapBlazor.Markdown/Components/Markdown/Markdown.js +++ b/src/Extensions/Components/BootstrapBlazor.Markdown/Components/Markdown/Markdown.js @@ -43,7 +43,7 @@ bb_markdown_method: function (el, obj, method, parameter) { var editor = $.data(el, 'editor'); if (editor) { - editor[method](parameter); + editor[method](...parameter); } } }); diff --git a/src/Extensions/Components/BootstrapBlazor.Markdown/Components/Markdown/Markdown.min.js b/src/Extensions/Components/BootstrapBlazor.Markdown/Components/Markdown/Markdown.min.js index 064bceacc..0d841290b 100644 --- a/src/Extensions/Components/BootstrapBlazor.Markdown/Components/Markdown/Markdown.min.js +++ b/src/Extensions/Components/BootstrapBlazor.Markdown/Components/Markdown/Markdown.min.js @@ -2,4 +2,4 @@ * Markdown : Argo@163.com * @version 5.1.0 */ -(function(n){n.extend({bb_markdown:function(t,i,r,u){var o=n(t),f,e;u==="setMarkdown"?(f=n.data(t,"editor"),f.setMarkdown(r)):(n.extend(r,{events:{blur:function(){var r=n.data(t,"editor"),f=r.getMarkdown(),e=r.getHTML();i.invokeMethodAsync(u,[f,e])}}}),e=window.setInterval(function(){if(o.is(":visible")){window.clearInterval(e);r.el=t;r.plugins=[];r.enableHighlight&&r.plugins.push(toastui.Editor.plugin.codeSyntaxHighlight);delete r.enableHighlight;const i=toastui.Editor.factory(r);n.data(t,"editor",i)}},100))},bb_markdown_method:function(t,i,r,u){var f=n.data(t,"editor");f&&f[r](u)}})})(jQuery); \ No newline at end of file +(function(n){n.extend({bb_markdown:function(t,i,r,u){var o=n(t),f,e;u==="setMarkdown"?(f=n.data(t,"editor"),f.setMarkdown(r)):(n.extend(r,{events:{blur:function(){var r=n.data(t,"editor"),f=r.getMarkdown(),e=r.getHTML();i.invokeMethodAsync(u,[f,e])}}}),e=window.setInterval(function(){if(o.is(":visible")){window.clearInterval(e);r.el=t;r.plugins=[];r.enableHighlight&&r.plugins.push(toastui.Editor.plugin.codeSyntaxHighlight);delete r.enableHighlight;const i=toastui.Editor.factory(r);n.data(t,"editor",i)}},100))},bb_markdown_method:function(t,i,r,u){var f=n.data(t,"editor");f&&f[r](...u)}})})(jQuery); \ No newline at end of file diff --git a/src/Extensions/Components/BootstrapBlazor.Markdown/wwwroot/js/bootstrap.blazor.markdown.min.js b/src/Extensions/Components/BootstrapBlazor.Markdown/wwwroot/js/bootstrap.blazor.markdown.min.js index b35b45847..4cf525ccc 100644 --- a/src/Extensions/Components/BootstrapBlazor.Markdown/wwwroot/js/bootstrap.blazor.markdown.min.js +++ b/src/Extensions/Components/BootstrapBlazor.Markdown/wwwroot/js/bootstrap.blazor.markdown.min.js @@ -48,4 +48,4 @@ var t=function(e,n){return t=Object.setPrototypeOf||{__proto__:[]}instanceof Arr * Markdown : Argo@163.com * @version 5.1.0 */ -(function(n){n.extend({bb_markdown:function(t,i,r,u){var o=n(t),f,e;u==="setMarkdown"?(f=n.data(t,"editor"),f.setMarkdown(r)):(n.extend(r,{events:{blur:function(){var r=n.data(t,"editor"),f=r.getMarkdown(),e=r.getHTML();i.invokeMethodAsync(u,[f,e])}}}),e=window.setInterval(function(){if(o.is(":visible")){window.clearInterval(e);r.el=t;r.plugins=[];r.enableHighlight&&r.plugins.push(toastui.Editor.plugin.codeSyntaxHighlight);delete r.enableHighlight;const i=toastui.Editor.factory(r);n.data(t,"editor",i)}},100))},bb_markdown_method:function(t,i,r,u){var f=n.data(t,"editor");f&&f[r](u)}})})(jQuery); \ No newline at end of file +(function(n){n.extend({bb_markdown:function(t,i,r,u){var o=n(t),f,e;u==="setMarkdown"?(f=n.data(t,"editor"),f.setMarkdown(r)):(n.extend(r,{events:{blur:function(){var r=n.data(t,"editor"),f=r.getMarkdown(),e=r.getHTML();i.invokeMethodAsync(u,[f,e])}}}),e=window.setInterval(function(){if(o.is(":visible")){window.clearInterval(e);r.el=t;r.plugins=[];r.enableHighlight&&r.plugins.push(toastui.Editor.plugin.codeSyntaxHighlight);delete r.enableHighlight;const i=toastui.Editor.factory(r);n.data(t,"editor",i)}},100))},bb_markdown_method:function(t,i,r,u){var f=n.data(t,"editor");f&&f[r](...u)}})})(jQuery); \ No newline at end of file -- Gitee From acb03620eac4d01f1995d6c5c2015774b0ccc1b7 Mon Sep 17 00:00:00 2001 From: Argo-Tianyi Date: Sat, 2 Apr 2022 14:33:11 +0800 Subject: [PATCH 08/11] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=E6=89=93?= =?UTF-8?q?=E5=8C=85=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/BootstrapBlazor.csproj | 2 +- src/BootstrapBlazor/Components/Editor/Editor.razor.cs | 5 +---- .../wwwroot/js/bootstrap.blazor.bundle.min.js | 2 +- src/BootstrapBlazor/wwwroot/js/bootstrap.blazor.min.js | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj index 47e310bac..84542c241 100644 --- a/src/BootstrapBlazor/BootstrapBlazor.csproj +++ b/src/BootstrapBlazor/BootstrapBlazor.csproj @@ -1,7 +1,7 @@ - 6.4.11 + 6.4.12 diff --git a/src/BootstrapBlazor/Components/Editor/Editor.razor.cs b/src/BootstrapBlazor/Components/Editor/Editor.razor.cs index c456e01f5..325222503 100644 --- a/src/BootstrapBlazor/Components/Editor/Editor.razor.cs +++ b/src/BootstrapBlazor/Components/Editor/Editor.razor.cs @@ -107,10 +107,7 @@ public partial class Editor : IDisposable /// /// 执行editor的方法 /// - public async Task DoMethodAysnc(string method, params object[] value) - { - await JSRuntime.InvokeVoidAsync(EditorElement, "bb_editor_method", method, value); - } + public ValueTask DoMethodAysnc(string method, params object[] value) => JSRuntime.InvokeVoidAsync(EditorElement, "bb_editor_method", method, value); /// /// OnInitialized 方法 diff --git a/src/BootstrapBlazor/wwwroot/js/bootstrap.blazor.bundle.min.js b/src/BootstrapBlazor/wwwroot/js/bootstrap.blazor.bundle.min.js index a5c6e3184..08bb1e33e 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('