Merge pull request #13407 from abpframework/auto-merge/rel-6-0/1204

Merge branch dev with rel-6.0

modules/cms-kit/host/Volo.CmsKit.Web.Unified/CmsKitWebUnifiedModule.cs

@@ -156,7 +156,7 @@ public class CmsKitWebUnifiedModule : AbpModule
 
         Configure<CmsKitContentWidgetOptions>(options =>
         {
-            options.AddWidget("ExComment", "CommentDate", "DecisionCommentDate");
+            options.AddWidget("ExComment", "CommentDate");
         });
     }
 

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Contents/AddWidgetModal.cshtml

@@ -20,23 +20,25 @@
         <abp-modal-body>
             <div class="container">
                 @if (Model.Widgets.Count() > 1)
-            {
-
-                <abp-select asp-for="ViewModel.Widget" />
+                {
+                    <abp-select asp-for="ViewModel.Widget" />
 
-                foreach (var item in Model.ViewModel.Details)
+                    foreach (var item in Model.ViewModel.Details)
+                    {
+                        if (item.EditorComponentName is not null)
+                        {
+                            <div hidden id="editor-@item.Name">
+                                <form data-check-form-on-close="false">
+                                    @await Component.InvokeAsync(@item.EditorComponentName)
+                                </form>
+                            </div>
+                        }
+                    }
+                }
+                else
                 {
-                    <div hidden id="editor-@item.Name">
-                        <form data-check-form-on-close="false">
-                            @await Component.InvokeAsync(@item.EditorComponentName)
-                        </form>
-                    </div>
+                    <p>@L["PleaseConfigureWidgets"].Value</p>
                 }
-            }
-            else
-            {
-                <p>@L["PleaseConfigureWidgets"].Value</p>
-            }
         </div>
     </abp-modal-body>
     <abp-modal-footer>

modules/cms-kit/src/Volo.CmsKit.Common.Application/Volo/CmsKit/Contents/CmsKitContentWidgetOptions.cs

@@ -11,7 +11,7 @@ public class CmsKitContentWidgetOptions
         WidgetConfigs = new();
     }
 
-    public void AddWidget(string widgetKey, string widgetName, string editorWidgetName)
+    public void AddWidget(string widgetKey, string widgetName, string editorWidgetName = null)
     {
         var config = new ContentWidgetConfig(widgetName, editorWidgetName);
         WidgetConfigs.Add(widgetKey, config);