From 058ed319ee66958bab0d0958bcaf59e8b8612810 Mon Sep 17 00:00:00 2001 From: malik masis Date: Thu, 14 Jul 2022 13:52:39 +0300 Subject: [PATCH] Merge pull request #13311 from abpframework/dynamic-widget-dynamic-parameters Dynamic widget dynamic parameters --- .../CmsKitWebUnifiedModule.cs | 2 +- ...{ExampleDate.cshtml => CommentDate.cshtml} | 2 +- .../CommentDateViewComponent.cs | 25 ++++++++++++++++ ...Date.cshtml => DecisionCommentDate.cshtml} | 2 +- ...cs => DecisionCommentDateViewComponent.cs} | 12 ++++---- .../ExampleDateViewComponent.cs | 29 ------------------- .../CmsKit/Contents/AddWidgetModal.cshtml | 2 +- .../Pages/CmsKit/Contents/addWidgetModal.js | 2 +- 8 files changed, 37 insertions(+), 39 deletions(-) rename modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/{ExampleDate.cshtml => CommentDate.cshtml} (68%) create mode 100644 modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/CommentDateViewComponent.cs rename modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/{ExampleModalDate.cshtml => DecisionCommentDate.cshtml} (75%) rename modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/{ExampleModalDateViewComponent.cs => DecisionCommentDateViewComponent.cs} (53%) delete mode 100644 modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/ExampleDateViewComponent.cs diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs index 27956c08ca..e3094a7da8 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs @@ -153,7 +153,7 @@ public class CmsKitWebUnifiedModule : AbpModule Configure(options => { - options.AddWidget("ExampleWidget", "ExampleDate", "ExampleModalDate"); + options.AddWidget("ExComment", "CommentDate", "DecisionCommentDate"); }); } diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/ExampleDate.cshtml b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/CommentDate.cshtml similarity index 68% rename from modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/ExampleDate.cshtml rename to modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/CommentDate.cshtml index 9c07e18b1f..7921c0ecbd 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/ExampleDate.cshtml +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/CommentDate.cshtml @@ -1,4 +1,4 @@ -@model Volo.CmsKit.ViewComponents.ExampleDateViewModel +@model Volo.CmsKit.ViewComponents.CommentDateViewComponent

Welcome Comment Date Component

@if (Model.IsShow) diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/CommentDateViewComponent.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/CommentDateViewComponent.cs new file mode 100644 index 0000000000..4122bb1481 --- /dev/null +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/CommentDateViewComponent.cs @@ -0,0 +1,25 @@ +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using Volo.Abp.AspNetCore.Mvc; +using Volo.Abp.AspNetCore.Mvc.UI.Widgets; + +namespace Volo.CmsKit.ViewComponents; + +[Widget( + AutoInitialize = true +)] + +[ViewComponent(Name = "CommentDate")] +public class CommentDateViewComponent : AbpViewComponent +{ + public bool IsShow { get; set; } + + public CommentDateViewComponent() + { + } + + public virtual async Task InvokeAsync(string isShow) + { + return View("~/ViewComponents/CommentDate.cshtml", new CommentDateViewComponent() { IsShow = bool.Parse(isShow) }); + } +} diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/ExampleModalDate.cshtml b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/DecisionCommentDate.cshtml similarity index 75% rename from modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/ExampleModalDate.cshtml rename to modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/DecisionCommentDate.cshtml index aca74ce2bb..0622000bb7 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/ExampleModalDate.cshtml +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/DecisionCommentDate.cshtml @@ -1,5 +1,5 @@ @using Volo.CmsKit.ViewComponents -@model ExampleModalDateViewModel +@model DecisionCommentDateViewModel
diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/ExampleModalDateViewComponent.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/DecisionCommentDateViewComponent.cs similarity index 53% rename from modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/ExampleModalDateViewComponent.cs rename to modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/DecisionCommentDateViewComponent.cs index 69490df9eb..c4f52d508a 100644 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/ExampleModalDateViewComponent.cs +++ b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/DecisionCommentDateViewComponent.cs @@ -1,8 +1,10 @@ using System.ComponentModel; +using System.ComponentModel.DataAnnotations; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc.UI.Widgets; +using Volo.Abp.Localization; namespace Volo.CmsKit.ViewComponents; @@ -10,20 +12,20 @@ namespace Volo.CmsKit.ViewComponents; AutoInitialize = true )] -[ViewComponent(Name = "ExampleModalDate")] -public class ExampleModalDateViewComponent : AbpViewComponent +[ViewComponent(Name = "DecisionCommentDate")] +public class DecisionCommentDateViewComponent : AbpViewComponent { - public ExampleModalDateViewComponent() + public DecisionCommentDateViewComponent() { } public virtual async Task InvokeAsync() { - return View("~/ViewComponents/ExampleModalDate.cshtml", new ExampleModalDateViewModel()); + return View("~/ViewComponents/DecisionCommentDate.cshtml", new DecisionCommentDateViewModel()); } } -public class ExampleModalDateViewModel +public class DecisionCommentDateViewModel { [DisplayName("Show date in the component")] public bool IsShow { get; set; } = true; diff --git a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/ExampleDateViewComponent.cs b/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/ExampleDateViewComponent.cs deleted file mode 100644 index 28fe583d97..0000000000 --- a/modules/cms-kit/host/Volo.CmsKit.Web.Unified/ViewComponents/ExampleDateViewComponent.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System.ComponentModel; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; -using Volo.Abp.AspNetCore.Mvc; -using Volo.Abp.AspNetCore.Mvc.UI.Widgets; - -namespace Volo.CmsKit.ViewComponents; - -[Widget( - AutoInitialize = true -)] - -[ViewComponent(Name = "ExampleDate")] -public class ExampleDateViewComponent : AbpViewComponent -{ - public ExampleDateViewComponent() - { - } - - public virtual async Task InvokeAsync(string isShow) - { - return View("~/ViewComponents/ExampleDate.cshtml", new ExampleDateViewModel() { IsShow = bool.Parse(isShow) }); - } -} - -public class ExampleDateViewModel -{ - public bool IsShow { get; set; } -} \ No newline at end of file diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml index aaf15898af..87831e4e1d 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml @@ -42,4 +42,4 @@ - \ No newline at end of file + diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js index 8fcae3fa11..2f625fe2fa 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/addWidgetModal.js @@ -21,7 +21,7 @@ $(function () { $(".save-changes").click(function () { - let properties = activeForm.serializeFormToObject(); + let properties = activeForm.serializeFormToObject(); let widgetText = "[Widget Type=\"" + widgetType + "\" ";