Add ExtraProperties to CreateUpdateResourceDto and CreateEditResource…

…ViewModel
EasyAbp · May 9, 2020 · 3ff5bf1 · 3ff5bf1
1 parent 730b4e3
commit 3ff5bf1
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 4 deletions.
diff --git a/common.props b/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>0.1.6</Version>
+    <Version>0.1.7</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>EasyAbp Team</Authors>

diff --git a/...s.Application.Contracts/EasyAbp/SharedResources/Resources/Dtos/CreateUpdateResourceDto.cs b/...s.Application.Contracts/EasyAbp/SharedResources/Resources/Dtos/CreateUpdateResourceDto.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
 namespace EasyAbp.SharedResources.Resources.Dtos
 {
@@ -16,6 +17,9 @@ public class CreateUpdateResourceDto
         [DisplayName("ResourcePreviewMediaResources")]
         public string PreviewMediaResources { get; set; }
 
+        [DisplayName("ResourceExtraProperties")]
+        public Dictionary<string, object> ExtraProperties { get; set; }
+
         [DisplayName("ResourceIsPublished")]
         public bool IsPublished { get; set; }
     }

diff --git a/...aredResources.Application.Contracts/EasyAbp/SharedResources/Resources/Dtos/ResourceDto.cs b/...aredResources.Application.Contracts/EasyAbp/SharedResources/Resources/Dtos/ResourceDto.cs
@@ -3,7 +3,7 @@
 
 namespace EasyAbp.SharedResources.Resources.Dtos
 {
-    public class ResourceDto : FullAuditedEntityDto<Guid>
+    public class ResourceDto : ExtensibleFullAuditedEntityDto<Guid>
     {
         public Guid CategoryId { get; set; }
 

diff --git a/src/EasyAbp.SharedResources.Domain.Shared/EasyAbp/SharedResources/Localization/cs.json b/src/EasyAbp.SharedResources.Domain.Shared/EasyAbp/SharedResources/Localization/cs.json
@@ -17,6 +17,7 @@
     "ResourceName": "Name",
     "ResourceDescription": "Description",
     "ResourcePreviewMediaResources": "Preview media resources",
+    "ResourceExtraProperties":"Extra properties",
     "ResourceIsPublished": "Published resource",
     "CreateResource": "New",
     "EditResource": "Edit",

diff --git a/src/EasyAbp.SharedResources.Domain.Shared/EasyAbp/SharedResources/Localization/en.json b/src/EasyAbp.SharedResources.Domain.Shared/EasyAbp/SharedResources/Localization/en.json
@@ -17,6 +17,7 @@
     "ResourceName": "Name",
     "ResourceDescription": "Description",
     "ResourcePreviewMediaResources": "Preview media resources",
+    "ResourceExtraProperties":"Extra properties",
     "ResourceIsPublished": "Published resource",
     "CreateResource": "New",
     "EditResource": "Edit",

diff --git a/src/EasyAbp.SharedResources.Domain.Shared/EasyAbp/SharedResources/Localization/pl.json b/src/EasyAbp.SharedResources.Domain.Shared/EasyAbp/SharedResources/Localization/pl.json
@@ -17,6 +17,7 @@
     "ResourceName": "Name",
     "ResourceDescription": "Description",
     "ResourcePreviewMediaResources": "Preview media resources",
+    "ResourceExtraProperties":"Extra properties",
     "ResourceIsPublished": "Published resource",
     "CreateResource": "New",
     "EditResource": "Edit",

diff --git a/src/EasyAbp.SharedResources.Domain.Shared/EasyAbp/SharedResources/Localization/pt-BR.json b/src/EasyAbp.SharedResources.Domain.Shared/EasyAbp/SharedResources/Localization/pt-BR.json
@@ -17,6 +17,7 @@
     "ResourceName": "Name",
     "ResourceDescription": "Description",
     "ResourcePreviewMediaResources": "Preview media resources",
+    "ResourceExtraProperties":"Extra properties",
     "ResourceIsPublished": "Published resource",
     "CreateResource": "New",
     "EditResource": "Edit",

diff --git a/src/EasyAbp.SharedResources.Domain.Shared/EasyAbp/SharedResources/Localization/sl.json b/src/EasyAbp.SharedResources.Domain.Shared/EasyAbp/SharedResources/Localization/sl.json
@@ -17,6 +17,7 @@
     "ResourceName": "Name",
     "ResourceDescription": "Description",
     "ResourcePreviewMediaResources": "Preview media resources",
+    "ResourceExtraProperties":"Extra properties",
     "ResourceIsPublished": "Published resource",
     "CreateResource": "New",
     "EditResource": "Edit",

diff --git a/src/EasyAbp.SharedResources.Domain.Shared/EasyAbp/SharedResources/Localization/tr.json b/src/EasyAbp.SharedResources.Domain.Shared/EasyAbp/SharedResources/Localization/tr.json
@@ -17,6 +17,7 @@
     "ResourceName": "Name",
     "ResourceDescription": "Description",
     "ResourcePreviewMediaResources": "Preview media resources",
+    "ResourceExtraProperties":"Extra properties",
     "ResourceIsPublished": "Published resource",
     "CreateResource": "New",
     "EditResource": "Edit",

diff --git a/src/EasyAbp.SharedResources.Domain.Shared/EasyAbp/SharedResources/Localization/vi.json b/src/EasyAbp.SharedResources.Domain.Shared/EasyAbp/SharedResources/Localization/vi.json
@@ -17,6 +17,7 @@
     "ResourceName": "Name",
     "ResourceDescription": "Description",
     "ResourcePreviewMediaResources": "Preview media resources",
+    "ResourceExtraProperties":"Extra properties",
     "ResourceIsPublished": "Published resource",
     "CreateResource": "New",
     "EditResource": "Edit",

diff --git a/src/EasyAbp.SharedResources.Domain.Shared/EasyAbp/SharedResources/Localization/zh-Hans.json b/src/EasyAbp.SharedResources.Domain.Shared/EasyAbp/SharedResources/Localization/zh-Hans.json
@@ -17,6 +17,7 @@
     "ResourceName": "名称",
     "ResourceDescription": "描述",
     "ResourcePreviewMediaResources": "预览媒体资源",
+    "ResourceExtraProperties":"扩展配置",
     "ResourceIsPublished": "是否发布",
     "CreateResource": "新建",
     "EditResource": "编辑",

diff --git a/src/EasyAbp.SharedResources.Domain.Shared/EasyAbp/SharedResources/Localization/zh-Hant.json b/src/EasyAbp.SharedResources.Domain.Shared/EasyAbp/SharedResources/Localization/zh-Hant.json
@@ -17,6 +17,7 @@
     "ResourceName": "名稱",
     "ResourceDescription": "描述",
     "ResourcePreviewMediaResources": "預覽媒體資源",
+    "ResourceExtraProperties":"擴展配寘",
     "ResourceIsPublished": "是否發佈",
     "CreateResource": "新建",
     "EditResource": "編輯",

diff --git a/...es.Web/Pages/SharedResources/Resources/Resource/ViewModels/CreateEditResourceViewModel.cs b/...es.Web/Pages/SharedResources/Resources/Resource/ViewModels/CreateEditResourceViewModel.cs
@@ -1,7 +1,9 @@
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form;
 
 namespace EasyAbp.SharedResources.Web.Pages.SharedResources.Resources.Resource.ViewModels
 {
@@ -20,6 +22,10 @@ public class CreateEditResourceViewModel
         [Display(Name = "ResourcePreviewMediaResources")]
         public string PreviewMediaResources { get; set; }
 
+        [TextArea(Rows = 4)]
+        [Display(Name = "ResourceExtraProperties")]
+        public string ExtraProperties { get; set; }
+
         [Display(Name = "ResourceIsPublished")]
         public bool IsPublished { get; set; }
     }

diff --git a/src/EasyAbp.SharedResources.Web/SharedResourcesWebAutoMapperProfile.cs b/src/EasyAbp.SharedResources.Web/SharedResourcesWebAutoMapperProfile.cs
@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using EasyAbp.SharedResources.Categories.Dtos;
 using EasyAbp.SharedResources.Resources.Dtos;
 using EasyAbp.SharedResources.ResourceItems.Dtos;
@@ -7,6 +8,7 @@
 using EasyAbp.SharedResources.Web.Pages.SharedResources.ResourceItems.ResourceItem.ViewModels;
 using EasyAbp.SharedResources.Web.Pages.SharedResources.Resources.Resource.ViewModels;
 using EasyAbp.SharedResources.Web.Pages.SharedResources.ResourceUsers.ResourceUser.ViewModels;
+using Newtonsoft.Json;
 using Volo.Abp.AutoMapper;
 
 namespace EasyAbp.SharedResources.Web
@@ -23,8 +25,12 @@ public SharedResourcesWebAutoMapperProfile()
             CreateMap<CreateEditCategoryViewModel, CreateUpdateCategoryDto>()
                 .Ignore(dto => dto.CustomMark);
             CreateMap<ResourceDto, CreateEditResourceViewModel>()
-                .ForSourceMember(dto => dto.IsAuthorized, opt => opt.DoNotValidate());
-            CreateMap<CreateEditResourceViewModel, CreateUpdateResourceDto>();
+                .ForSourceMember(dto => dto.IsAuthorized, opt => opt.DoNotValidate())
+                .ForMember(model => model.ExtraProperties, opt => opt.MapFrom(src => JsonConvert.SerializeObject(src.ExtraProperties)));
+            CreateMap<CreateEditResourceViewModel, CreateUpdateResourceDto>()
+                .ForMember(dto => dto.ExtraProperties,
+                    opt => opt.MapFrom(src =>
+                        JsonConvert.DeserializeObject<Dictionary<string, object>>(src.ExtraProperties)));
             CreateMap<ResourceItemDto, CreateEditResourceItemViewModel>();
             CreateMap<CreateEditResourceItemViewModel, CreateUpdateResourceItemDto>();
             CreateMap<ResourceItemContentDto, CreateEditResourceItemContentViewModel>();