Browse Source
Merge pull request #395 from colinin/4.4.2
feat(settings): 取消SettingManagement.Application.Contracts模块的无关依赖
pull/396/head
yx lin
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with
121 additions and
114 deletions
-
aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN.Abp.SettingManagement.Application.Contracts.csproj
-
aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/AbpSettingManagementApplicationContractsModule.cs
-
aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/AbpSettingManagementPermissionProvider.cs
-
aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/Dto/SettingDetailsDto.cs
-
aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application/LINGYUN.Abp.SettingManagement.Application.csproj
-
aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application/LINGYUN/Abp/SettingManagement/AbpSettingManagementApplicationModule.cs
|
|
|
@ -1,4 +1,4 @@ |
|
|
|
<Project Sdk="Microsoft.NET.Sdk"> |
|
|
|
<Project Sdk="Microsoft.NET.Sdk"> |
|
|
|
|
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
@ -18,12 +18,8 @@ |
|
|
|
</ItemGroup> |
|
|
|
|
|
|
|
<ItemGroup> |
|
|
|
<PackageReference Include="Volo.Abp.Ddd.Application" Version="4.4.0" /> |
|
|
|
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="4.4.0" /> |
|
|
|
<PackageReference Include="Volo.Abp.SettingManagement.Domain.Shared" Version="4.4.0" /> |
|
|
|
</ItemGroup> |
|
|
|
|
|
|
|
<ItemGroup> |
|
|
|
<ProjectReference Include="..\..\account\LINGYUN.Abp.Account.Application.Contracts\LINGYUN.Abp.Account.Application.Contracts.csproj" /> |
|
|
|
</ItemGroup> |
|
|
|
|
|
|
|
</Project> |
|
|
|
|
|
|
|
@ -7,7 +7,7 @@ using Volo.Abp.VirtualFileSystem; |
|
|
|
|
|
|
|
namespace LINGYUN.Abp.SettingManagement |
|
|
|
{ |
|
|
|
[DependsOn(typeof(AbpDddApplicationModule))] |
|
|
|
[DependsOn(typeof(AbpDddApplicationContractsModule))] |
|
|
|
[DependsOn(typeof(AbpSettingManagementDomainSharedModule))] |
|
|
|
public class AbpSettingManagementApplicationContractsModule : AbpModule |
|
|
|
{ |
|
|
|
|
|
|
|
@ -1,7 +1,4 @@ |
|
|
|
using System; |
|
|
|
using System.Collections.Generic; |
|
|
|
using System.Text; |
|
|
|
using Volo.Abp.Authorization.Permissions; |
|
|
|
using Volo.Abp.Authorization.Permissions; |
|
|
|
using Volo.Abp.Localization; |
|
|
|
using Volo.Abp.SettingManagement.Localization; |
|
|
|
|
|
|
|
|
|
|
|
@ -18,10 +18,21 @@ namespace LINGYUN.Abp.SettingManagement |
|
|
|
|
|
|
|
public ValueType ValueType { get; set; } |
|
|
|
/// <summary>
|
|
|
|
/// 插槽,前端定义控件
|
|
|
|
/// </summary>
|
|
|
|
public string Slot { get; set; } |
|
|
|
/// <summary>
|
|
|
|
/// 选项列表,仅当 ValueType 为 Option有效
|
|
|
|
/// </summary>
|
|
|
|
public List<OptionDto> Options { get; set; } = new List<OptionDto>(); |
|
|
|
|
|
|
|
public SettingDetailsDto WithSlot(string slot) |
|
|
|
{ |
|
|
|
Slot = slot; |
|
|
|
|
|
|
|
return this; |
|
|
|
} |
|
|
|
|
|
|
|
public SettingDetailsDto AddOption(string name, string value) |
|
|
|
{ |
|
|
|
Options.Add(new OptionDto |
|
|
|
|
|
|
|
@ -8,6 +8,7 @@ |
|
|
|
|
|
|
|
<ItemGroup> |
|
|
|
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.Contracts" Version="4.4.0" /> |
|
|
|
<PackageReference Include="Volo.Abp.Ddd.Application" Version="4.4.0" /> |
|
|
|
<PackageReference Include="Volo.Abp.Emailing" Version="4.4.0" /> |
|
|
|
<PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="4.4.0" /> |
|
|
|
</ItemGroup> |
|
|
|
|
|
|
|
@ -1,11 +1,13 @@ |
|
|
|
using Volo.Abp.Modularity; |
|
|
|
using Volo.Abp.Application; |
|
|
|
using Volo.Abp.Modularity; |
|
|
|
using Volo.Abp.SettingManagement; |
|
|
|
|
|
|
|
namespace LINGYUN.Abp.SettingManagement |
|
|
|
{ |
|
|
|
[DependsOn( |
|
|
|
typeof(AbpSettingManagementDomainModule), |
|
|
|
typeof(AbpSettingManagementApplicationContractsModule) |
|
|
|
typeof(AbpSettingManagementApplicationContractsModule), |
|
|
|
typeof(AbpDddApplicationModule) |
|
|
|
)] |
|
|
|
public class AbpSettingManagementApplicationModule : AbpModule |
|
|
|
{ |
|
|
|
|