Change history UI

Author: SeriaWei

…Trail/Attributes/IgnoreAuditAttribute.cs …Trail/Attributes/AuditIgnoreAttribute.cssrc/EasyFrameWork/AuditTrail/Attributes/IgnoreAuditAttribute.cs renamed to src/EasyFrameWork/AuditTrail/Attributes/AuditIgnoreAttribute.cs src/EasyFrameWork/AuditTrail/Attributes/IgnoreAuditAttribute.cs renamed to src/EasyFrameWork/AuditTrail/Attributes/AuditIgnoreAttribute.cs

@@ -7,7 +7,7 @@
 namespace Easy.AuditTrail.Attributes
 {
     [AttributeUsage(AttributeTargets.Class | AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
-    public class IgnoreAuditAttribute : Attribute
+    public class AuditIgnoreAttribute : Attribute
     {
     }
 }

…Attributes/AuditRecordStatusAttribute.cs …Attributes/AuditRecordStatusAttribute.cssrc/ZKEACMS/Common/Attributes/AuditRecordStatusAttribute.cs renamed to src/EasyFrameWork/AuditTrail/Attributes/AuditRecordStatusAttribute.cs src/ZKEACMS/Common/Attributes/AuditRecordStatusAttribute.cs renamed to src/EasyFrameWork/AuditTrail/Attributes/AuditRecordStatusAttribute.cs

@@ -4,7 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace ZKEACMS.Common.Attributes
+namespace Easy.AuditTrail.Attributes
 {
     [AttributeUsage(AttributeTargets.Property)]
     public class AuditRecordStatusAttribute : Attribute

src/EasyFrameWork/AuditTrail/FieldChange.cs

@@ -8,7 +8,9 @@ namespace Easy.AuditTrail
 {
     public class FieldChange
     {
+        public int Sequence { get; set; }
         public string Field { get; set; }
+        public int? ValueType { get; set; }
         public string OldValue { get; set; }
         public string NewValue { get; set; }
     }

src/EasyFrameWork/IApplicationContext.cs

@@ -13,6 +13,7 @@ public interface IApplicationContext
         IUser CurrentUser { get; }
         IUser CurrentCustomer { get; }
         IWebHostEnvironment HostingEnvironment { get; }
+        IServiceProvider ServiceProvider { get; }
         bool IsAuthenticated { get; }
         T As<T>() where T : class, IApplicationContext;
         T Get<T>(string name);

src/EasyFrameWork/Models/EditorEntity.cs

@@ -10,41 +10,26 @@ namespace Easy.Models
 {
     public class EditorEntity
     {
-
         public virtual string Title { get; set; }
-        /// <summary>
-        /// 说明
-        /// </summary>
+
         public virtual string Description { get; set; }
-        /// <summary>
-        /// 是否通过
-        /// </summary>
+
+        [AuditRecordStatus]
         public virtual int? Status { get; set; }
-        /// <summary>
-        /// 创建人ID
-        /// </summary>
+
         public virtual string CreateBy { get; set; }
-        /// <summary>
-        /// 创建人
-        /// </summary>
+
         public virtual string CreatebyName { get; set; }
-        /// <summary>
-        /// 创建日期
-        /// </summary>
+
         public virtual DateTime? CreateDate { get; set; }
-        /// <summary>
-        /// 修改人ID
-        /// </summary>
+
         public virtual string LastUpdateBy { get; set; }
-        /// <summary>
-        /// 最后修改人
-        /// </summary>
+
         public virtual string LastUpdateByName { get; set; }
-        /// <summary>
-        /// 最后更新日期
-        /// </summary>
+
         public virtual DateTime? LastUpdateDate { get; set; }
-        [NotMapped, IgnoreAudit]
+
+        [NotMapped, AuditIgnore]
         public virtual Constant.ActionType? ActionType { get; set; }
     }
 

src/EasyFrameWork/Mvc/ApplicationContext.cs

@@ -30,6 +30,7 @@ public ApplicationContext(IHttpContextAccessor httpContextAccessor)
         {
             _stateResolvers = new ConcurrentDictionary<string, Func<object>>();
             HttpContextAccessor = httpContextAccessor;
+            ServiceProvider = httpContextAccessor.HttpContext.RequestServices;
         }
         public IHttpContextAccessor HttpContextAccessor
         {
@@ -53,6 +54,7 @@ public IWebHostEnvironment HostingEnvironment
         {
             get { return Get<IWebHostEnvironment>(nameof(HostingEnvironment)); }
         }
+        public IServiceProvider ServiceProvider { get; }
         public bool IsAuthenticated
         {
             get { return HttpContextAccessor.HttpContext.User.Identity.IsAuthenticated; }

src/Plugins/Directory.Build.props

@@ -12,7 +12,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<EmbeddedResource Include="**\*" Exclude="bin\**;obj\**;Views\**;*.csproj;data.db"/>
+		<EmbeddedResource Include="**\*" Exclude="bin\**;obj\**;Views\**;*.csproj;data.db;*.cs;zkea.plugin;*.md"/>
 	</ItemGroup>
 
 	<ItemGroup>

src/Plugins/ZKEACMS.Article/ArticlePlug.cs

@@ -189,6 +189,8 @@ public override void ConfigureServices(IServiceCollection serviceCollection)
             serviceCollection.ConfigureMetaData<ArticleTypeWidget, ArticleTypeWidgetMetaData>();
             serviceCollection.ConfigureMetaData<ArticleSpecialDetailWidget, ArticleSpecialDetailWidgetMetaData>();
             serviceCollection.ConfigureMetaData<ArticleGalleryWidget, ArticleGalleryWidgetMetaData>();
+
+            serviceCollection.AddAuditValueProvider<ArticleTypeAuditValueProvider>();
         }
     }
 }

src/Plugins/ZKEACMS.Article/Service/ArticleTypeAuditValueProvider.cs

@@ -0,0 +1,39 @@
+using Easy.AuditTrail;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using ZKEACMS.Article.Models;
+
+namespace ZKEACMS.Article.Service
+{
+    internal class ArticleTypeAuditValueProvider : IAuditValueProvider
+    {
+        private readonly IArticleTypeService _articleTypeService;
+
+        public ArticleTypeAuditValueProvider(IArticleTypeService articleTypeService)
+        {
+            _articleTypeService = articleTypeService;
+        }
+
+        public bool CanHandle(PropertyInfo property, Type entityType, AuditOperationType operationType)
+        {
+            return property.Name == nameof(ArticleEntity.ArticleTypeID) && entityType == typeof(ArticleEntity);
+        }
+
+        public string GetDisplayValue(PropertyInfo property, object rawValue)
+        {
+            if (rawValue != null && int.TryParse(rawValue.ToString(), out int articleTypeID))
+            {
+                var articleType = _articleTypeService.Get(articleTypeID);
+                if (articleType != null)
+                {
+                    return articleType.Title;
+                }
+            }
+            return rawValue?.ToString() ?? string.Empty;
+        }
+    }
+}

src/Plugins/ZKEACMS.Article/Views/Article/Edit.cshtml

@@ -32,6 +32,7 @@
                 {
                     <input type="submit" class="btn btn-info publish" value="@L("Publish")" data-value="@ActionType.Publish" />
                 }
+                @Html.ChangeHistoryBtn(Model)
                 <a class="btn btn-default" href="@Url.Action("Index")">@L("Cancel")</a>
             </div>
         }