Browse Source

Moved ConvertToDynamicObject to framework

pull/13082/head
malik masis 4 years ago
parent
commit
62529edbf8
  1. 19
      framework/src/Volo.Abp.Core/System/Collections/Generic/AbpDictionaryExtensions.cs
  2. 21
      modules/cms-kit/src/Volo.CmsKit.Common.Web/Contents/Helper.cs
  3. 2
      modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml
  4. 5
      modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml

19
framework/src/Volo.Abp.Core/System/Collections/Generic/AbpDictionaryExtensions.cs

@ -1,4 +1,5 @@
using System.Collections.Concurrent;
using System.Dynamic;
namespace System.Collections.Generic;
@ -128,4 +129,22 @@ public static class AbpDictionaryExtensions
{
return dictionary.GetOrAdd(key, k => factory());
}
/// <summary>
/// Converts a <string,object> dictionary to dynamic object so added and removed at run
/// </summary>
/// <param name="dictionary">The collection object</param>
/// <returns>If value is correct, return ExpandoObject that represents an object</returns>
public static dynamic ConvertToDynamicObject(this Dictionary<string, object> dictionary)
{
var expandoObject = new ExpandoObject();
var expendObjectCollection = (ICollection<KeyValuePair<string, object>>)expandoObject;
foreach (var keyValuePair in dictionary)
{
expendObjectCollection.Add(keyValuePair);
}
return expandoObject;
}
}

21
modules/cms-kit/src/Volo.CmsKit.Common.Web/Contents/Helper.cs

@ -1,21 +0,0 @@
using System.Collections.Generic;
using System.Dynamic;
namespace Volo.CmsKit.Web.Contents;
public static class DictionaryDynamicExtensions
{
public static dynamic ConvertToDynamicObject(this Dictionary<string, object> dict) //TODO: Move to AbpDictionaryExtensions
{
var expandoObject = new ExpandoObject();
var eoColl = (ICollection<KeyValuePair<string, object>>)expandoObject;
foreach (var kvp in dict)
{
eoColl.Add(kvp);
}
return expandoObject;
}
}

2
modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Blogs/BlogPost.cshtml

@ -1,6 +1,5 @@
@page
@using System.Dynamic
@using Volo.Abp.Data
@using Volo.CmsKit.Public.Blogs
@using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Blogs.BlogPostComment
@ -13,7 +12,6 @@
@using Volo.CmsKit.Public.Web.Renderers
@using Volo.Abp.AspNetCore.Mvc.UI.Packages.HighlightJs
@using Volo.CmsKit.Contents
@using Volo.CmsKit.Web.Contents;
@inherits CmsKitPublicPageBase

5
modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/Public/CmsKit/Pages/Index.cshtml

@ -1,5 +1,4 @@

@page
@page
@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap
@using Volo.CmsKit.Contents
@using System.Dynamic
@ -7,8 +6,6 @@
@using Volo.Abp.Data
@using Volo.Abp.AspNetCore.Mvc.UI.Packages.HighlightJs;
@using Volo.Abp.AspNetCore.Mvc.UI.Widgets;
@using Volo.CmsKit.Web.Contents;
@inject IMarkdownToHtmlRenderer MarkdownRenderer

Loading…
Cancel
Save