From 946b5a9e8c8c83ea45d7c8e3d450563f75f3cf87 Mon Sep 17 00:00:00 2001 From: Jadyn Date: Mon, 16 Jan 2023 11:23:03 +0800 Subject: [PATCH 1/2] cms-kit: Fix `ContentParser` parse content --- .../Pages/CmsKit/Components/Contents/ContentParser.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Web/Pages/CmsKit/Components/Contents/ContentParser.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Pages/CmsKit/Components/Contents/ContentParser.cs index 290222a376..f86e4ba913 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Common.Web/Pages/CmsKit/Components/Contents/ContentParser.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Pages/CmsKit/Components/Contents/ContentParser.cs @@ -40,7 +40,7 @@ public class ContentParser : ITransientDependency private void ParseContent(string content, List parsedList) { - var replacedText = Regex.Replace(content, @"\[.*?\]", Delimeter); + var replacedText = Regex.Replace(content, @"\[Widget.*?\]", Delimeter); if (!replacedText.Contains(Delimeter)) { parsedList.Add(replacedText); From 59c54897e253574f5fdf8482293886b5ecd7c632 Mon Sep 17 00:00:00 2001 From: Jadyn Date: Mon, 16 Jan 2023 11:25:47 +0800 Subject: [PATCH 2/2] cms-kit: Add `virtual` to methods of `ContentParser` --- .../Pages/CmsKit/Components/Contents/ContentParser.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Web/Pages/CmsKit/Components/Contents/ContentParser.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Pages/CmsKit/Components/Contents/ContentParser.cs index f86e4ba913..13ecaf9da8 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Common.Web/Pages/CmsKit/Components/Contents/ContentParser.cs +++ b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Pages/CmsKit/Components/Contents/ContentParser.cs @@ -19,7 +19,7 @@ public class ContentParser : ITransientDependency _options = options.Value; } - public Task> ParseAsync(string content) + public virtual Task> ParseAsync(string content) { if (!_options.WidgetConfigs.Any() || content is null) { @@ -38,7 +38,7 @@ public class ContentParser : ITransientDependency return Task.FromResult(contentFragments); } - private void ParseContent(string content, List parsedList) + protected virtual void ParseContent(string content, List parsedList) { var replacedText = Regex.Replace(content, @"\[Widget.*?\]", Delimeter); if (!replacedText.Contains(Delimeter)) @@ -74,7 +74,7 @@ public class ContentParser : ITransientDependency } } - private void FillContentFragment(string content, List parsedList, List contentFragments) + protected virtual void FillContentFragment(string content, List parsedList, List contentFragments) { content = Regex.Replace(content, @"=\s*""", @"="""); content = Regex.Replace(content, @"""\s*=", @"""=");