Redesign FieldDataType.

Adjust controller routes. Add missing permissions. Separate CreateUpdateDynamicEntityDto.
EasyAbp · Aug 18, 2021 · 48f3d8a · 48f3d8a
1 parent 8c6df6a
commit 48f3d8a
Show file tree

Hide file tree

Showing 15 changed files with 39 additions and 26 deletions.
diff --git a/...ties/Dtos/CreateUpdateDynamicEntityDto.cs → ...icEntities/Dtos/CreateDynamicEntityDto.cs b/...ties/Dtos/CreateUpdateDynamicEntityDto.cs → ...icEntities/Dtos/CreateDynamicEntityDto.cs
@@ -1,11 +1,9 @@
 using System;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Data;
 using Volo.Abp.ObjectExtending;
 
 namespace EasyAbp.Abp.DynamicEntity.DynamicEntities.Dtos
 {
-    public class CreateUpdateDynamicEntityDto : ExtensibleObject
+    public class CreateDynamicEntityDto : ExtensibleObject
     {
         public virtual Guid? ModelDefinitionId { get; set; }
     }

diff --git a/src/EasyAbp.Abp.DynamicEntity.Application.Contracts/DynamicEntities/Dtos/GetListInput.cs b/src/EasyAbp.Abp.DynamicEntity.Application.Contracts/DynamicEntities/Dtos/GetListInput.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using EasyAbp.Abp.DynamicQuery;
+using System;
 using EasyAbp.Abp.DynamicQuery.Dtos;
 using EasyAbp.Abp.DynamicQuery.Filters;
 using Volo.Abp.Application.Dtos;
@@ -8,6 +7,8 @@ namespace EasyAbp.Abp.DynamicEntity.DynamicEntities.Dtos
 {
     public class GetListInput : PagedAndSortedResultRequestDto, IDynamicQueryInput
     {
+        public Guid ModelDefinitionId { get; set; }
+
         public DynamicQueryGroup FilterGroup { get; set; }
     }
 }
diff --git a/...bp.Abp.DynamicEntity.Application.Contracts/DynamicEntities/Dtos/UpdateDynamicEntityDto.cs b/...bp.Abp.DynamicEntity.Application.Contracts/DynamicEntities/Dtos/UpdateDynamicEntityDto.cs
@@ -0,0 +1,8 @@
+using Volo.Abp.ObjectExtending;
+
+namespace EasyAbp.Abp.DynamicEntity.DynamicEntities.Dtos
+{
+    public class UpdateDynamicEntityDto : ExtensibleObject
+    {
+    }
+}
diff --git a/...syAbp.Abp.DynamicEntity.Application.Contracts/DynamicEntities/IDynamicEntityAppService.cs b/...syAbp.Abp.DynamicEntity.Application.Contracts/DynamicEntities/IDynamicEntityAppService.cs
@@ -8,8 +8,8 @@ public interface IDynamicEntityAppService : ICrudAppService<
         DynamicEntityDto,
         Guid,
         GetListInput,
-        CreateUpdateDynamicEntityDto,
-        CreateUpdateDynamicEntityDto>
+        CreateDynamicEntityDto,
+        UpdateDynamicEntityDto>
     {
     }
 }
diff --git a/...asyAbp.Abp.DynamicEntity.Application.Contracts/DynamicEntityApplicationContractsModule.cs b/...asyAbp.Abp.DynamicEntity.Application.Contracts/DynamicEntityApplicationContractsModule.cs
@@ -13,6 +13,5 @@ namespace EasyAbp.Abp.DynamicEntity
     [DependsOn(typeof(DynamicQueryApplicationContractsModule))]
     public class DynamicEntityApplicationContractsModule : AbpModule
     {
-
     }
 }
diff --git a/...amicEntity.Application.Contracts/Permissions/DynamicEntityPermissionDefinitionProvider.cs b/...amicEntity.Application.Contracts/Permissions/DynamicEntityPermissionDefinitionProvider.cs
@@ -19,6 +19,11 @@ public override void Define(IPermissionDefinitionContext context)
             modelDefinitionPermission.AddChild(DynamicEntityPermissions.ModelDefinition.Create, L("Permission:Create"));
             modelDefinitionPermission.AddChild(DynamicEntityPermissions.ModelDefinition.Update, L("Permission:Update"));
             modelDefinitionPermission.AddChild(DynamicEntityPermissions.ModelDefinition.Delete, L("Permission:Delete"));
+
+            var dynamicEntityPermission = myGroup.AddPermission(DynamicEntityPermissions.DynamicEntity.Default, L("Permission:DynamicEntity"));
+            dynamicEntityPermission.AddChild(DynamicEntityPermissions.DynamicEntity.Create, L("Permission:Create"));
+            dynamicEntityPermission.AddChild(DynamicEntityPermissions.DynamicEntity.Update, L("Permission:Update"));
+            dynamicEntityPermission.AddChild(DynamicEntityPermissions.DynamicEntity.Delete, L("Permission:Delete"));
         }
 
         private static LocalizableString L(string name)

diff --git a/src/EasyAbp.Abp.DynamicEntity.Application/DynamicEntities/DynamicEntityAppService.cs b/src/EasyAbp.Abp.DynamicEntity.Application/DynamicEntities/DynamicEntityAppService.cs
@@ -6,7 +6,7 @@
 
 namespace EasyAbp.Abp.DynamicEntity.DynamicEntities
 {
-    public class DynamicEntityAppService  : CrudAppService<DynamicEntity, DynamicEntityDto, Guid, GetListInput, CreateUpdateDynamicEntityDto, CreateUpdateDynamicEntityDto>,
+    public class DynamicEntityAppService  : CrudAppService<DynamicEntity, DynamicEntityDto, Guid, GetListInput, CreateDynamicEntityDto, UpdateDynamicEntityDto>,
         IDynamicEntityAppService
     {
         private readonly IDynamicEntityRepository _repository;
@@ -18,7 +18,8 @@ public DynamicEntityAppService(IDynamicEntityRepository repository) : base(repos
 
         protected override async Task<IQueryable<DynamicEntity>> CreateFilteredQueryAsync(GetListInput input)
         {
-            return await _repository.ExecuteDynamicQueryAsync(input.FilterGroup);
+            return (await _repository.ExecuteDynamicQueryAsync(input.FilterGroup))
+                .Where(x => x.ModelDefinitionId == input.ModelDefinitionId);
         }
     }
 }
diff --git a/src/EasyAbp.Abp.DynamicEntity.Application/DynamicEntityApplicationAutoMapperProfile.cs b/src/EasyAbp.Abp.DynamicEntity.Application/DynamicEntityApplicationAutoMapperProfile.cs
@@ -34,7 +34,8 @@ public DynamicEntityApplicationAutoMapperProfile()
                 ;
 
             CreateMap<DynamicEntities.DynamicEntity, DynamicEntityDto>();
-            CreateMap<CreateUpdateDynamicEntityDto, DynamicEntities.DynamicEntity>(MemberList.Source);
+            CreateMap<CreateDynamicEntityDto, DynamicEntities.DynamicEntity>(MemberList.Source);
+            CreateMap<UpdateDynamicEntityDto, DynamicEntities.DynamicEntity>(MemberList.Source);
         }
     }
 }
diff --git a/src/EasyAbp.Abp.DynamicEntity.Domain.Shared/Localization/DynamicEntity/en.json b/src/EasyAbp.Abp.DynamicEntity.Domain.Shared/Localization/DynamicEntity/en.json
@@ -5,7 +5,7 @@
     "Permission:Create": "Create",
     "Permission:Update": "Update",
     "Permission:Delete": "Delete",
-    "Menu:DynamicEntityManagement": "Dynamic entity",
+    "Menu:DynamicEntityManagement": "Dynamic entity management",
     "Menu:FieldDefinition": "Field Definition",
     "FieldDefinition": "Field Definition",
     "FieldDefinitionName": "Name",

diff --git a/src/EasyAbp.Abp.DynamicEntity.Domain.Shared/Localization/DynamicEntity/zh-Hans.json b/src/EasyAbp.Abp.DynamicEntity.Domain.Shared/Localization/DynamicEntity/zh-Hans.json
@@ -5,7 +5,7 @@
     "Permission:Create": "创建",
     "Permission:Update": "编辑",
     "Permission:Delete": "删除",
-    "Menu:DynamicEntityManagement": "动态实体",
+    "Menu:DynamicEntityManagement": "动态实体管理",
     "Menu:FieldDefinition": "字段定义",
     "FieldDefinition": "字段定义",
     "FieldDefinitionName": "名称",

diff --git a/src/EasyAbp.Abp.DynamicEntity.Domain.Shared/Localization/DynamicEntity/zh-Hant.json b/src/EasyAbp.Abp.DynamicEntity.Domain.Shared/Localization/DynamicEntity/zh-Hant.json
@@ -5,7 +5,7 @@
     "Permission:Create": "創建",
     "Permission:Update": "編輯",
     "Permission:Delete": "刪除",
-    "Menu:DynamicEntityManagement": "動態實體",
+    "Menu:DynamicEntityManagement": "動態實體管理",
     "Menu:FieldDefinition": "字段定義",
     "FieldDefinition": "字段定義",
     "FieldDefinitionName": "名稱",

diff --git a/src/EasyAbp.Abp.DynamicEntity.HttpApi/DynamicEntities/DynamicEntityController.cs b/src/EasyAbp.Abp.DynamicEntity.HttpApi/DynamicEntities/DynamicEntityController.cs
@@ -8,7 +8,7 @@
 namespace EasyAbp.Abp.DynamicEntity.DynamicEntities
 {
     [RemoteService(Name = "EasyAbpDynamicEntity")]
-    [Route("/api/dynamic/dynamicEntity")]
+    [Route("/api/abp/dynamic-entity/dynamic-entity")]
     public class DynamicEntityController : DynamicEntity.DynamicEntityController, IDynamicEntityAppService
     {
         private readonly IDynamicEntityAppService _service;
@@ -19,14 +19,14 @@ public DynamicEntityController(IDynamicEntityAppService service)
         }
 
         [HttpPost]
-        public virtual Task<DynamicEntityDto> CreateAsync(CreateUpdateDynamicEntityDto input)
+        public virtual Task<DynamicEntityDto> CreateAsync(CreateDynamicEntityDto input)
         {
             return _service.CreateAsync(input);
         }
 
         [HttpPut]
         [Route("{id}")]
-        public virtual Task<DynamicEntityDto> UpdateAsync(Guid id, CreateUpdateDynamicEntityDto input)
+        public virtual Task<DynamicEntityDto> UpdateAsync(Guid id, UpdateDynamicEntityDto input)
         {
             return _service.UpdateAsync(id, input);
         }

diff --git a/src/EasyAbp.Abp.DynamicEntity.HttpApi/FieldDefinitions/FieldDefinitionController.cs b/src/EasyAbp.Abp.DynamicEntity.HttpApi/FieldDefinitions/FieldDefinitionController.cs
@@ -8,7 +8,7 @@
 namespace EasyAbp.Abp.DynamicEntity.FieldDefinitions
 {
     [RemoteService(Name = "EasyAbpDynamicEntity")]
-    [Route("/api/dynamic/fieldDefinition")]
+    [Route("/api/abp/dynamic-entity/field-definition")]
     public class FieldDefinitionController : DynamicEntityController, IFieldDefinitionAppService
     {
         private readonly IFieldDefinitionAppService _service;
@@ -19,7 +19,7 @@ public FieldDefinitionController(IFieldDefinitionAppService service)
         }
 
         [HttpGet]
-        [Route("byName")]
+        [Route("by-name/{name}")]
         public virtual Task<FieldDefinitionDto> GetByName(string name)
         {
             return _service.GetByName(name);

diff --git a/src/EasyAbp.Abp.DynamicEntity.HttpApi/ModelDefinitions/ModelDefinitionController.cs b/src/EasyAbp.Abp.DynamicEntity.HttpApi/ModelDefinitions/ModelDefinitionController.cs
@@ -8,7 +8,7 @@
 namespace EasyAbp.Abp.DynamicEntity.ModelDefinitions
 {
     [RemoteService(Name = "EasyAbpDynamicEntity")]
-    [Route("/api/dynamic/modelDefinition")]
+    [Route("/api/abp/dynamic-entity/model-definition")]
     public class ModelDefinitionController : DynamicEntityController, IModelDefinitionAppService
     {
         private readonly IModelDefinitionAppService _service;
@@ -39,7 +39,7 @@ public virtual Task DeleteAsync(Guid id)
         }
 
         [HttpGet]
-        [Route("getByName/{name}")]
+        [Route("by-name/{name}")]
         public Task<ModelDefinitionDto> GetByName(string name)
         {
             return _service.GetByName(name);

diff --git a/src/EasyAbp.Abp.DynamicEntity.Web/Pages/DynamicEntity/FieldDefinition/index.js b/src/EasyAbp.Abp.DynamicEntity.Web/Pages/DynamicEntity/FieldDefinition/index.js
@@ -48,15 +48,15 @@
             { data: "displayName" },
             { data: "type", render: function ( data, type, row, meta ) {
                 switch (data) {
-                    case 1:
+                    case 0:
                         return l("FieldDataType.Text");
-                    case 2:
+                    case 1:
                         return l("FieldDataType.Number");
-                    case 4:
+                    case 2:
                         return l("FieldDataType.Float");
-                    case 8:
+                    case 3:
                         return l("FieldDataType.Boolean");
-                    case 16:
+                    case 4:
                         return l("FieldDataType.DateTime");
                 }
             }},
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,5 @@ namespace EasyAbp.Abp.DynamicEntity @@
         [DependsOn(typeof(DynamicQueryApplicationContractsModule))]
         public class DynamicEntityApplicationContractsModule : AbpModule
         {
         }
     }