From 1b1ecdbc5c75d5bf98b6653a9bd348e81178af37 Mon Sep 17 00:00:00 2001
From: cKey <35512826+colinin@users.noreply.github.com>
Date: Mon, 22 Nov 2021 09:36:08 +0800
Subject: [PATCH] =?UTF-8?q?feat(settings):=20=E5=8F=96=E6=B6=88SettingMana?=
 =?UTF-8?q?gement.Application.Contracts=E6=A8=A1=E5=9D=97=E7=9A=84?=
 =?UTF-8?q?=E6=97=A0=E5=85=B3=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ingManagement.Application.Contracts.csproj |  8 +-
 ...ingManagementApplicationContractsModule.cs | 58 ++++++------
 .../AbpSettingManagementPermissionProvider.cs | 47 +++++-----
 .../Dto/SettingDetailsDto.cs                  | 93 +++++++++++--------
 ...N.Abp.SettingManagement.Application.csproj |  1 +
 .../AbpSettingManagementApplicationModule.cs  | 28 +++---
 6 files changed, 121 insertions(+), 114 deletions(-)

diff --git a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN.Abp.SettingManagement.Application.Contracts.csproj b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN.Abp.SettingManagement.Application.Contracts.csproj
index 7b064a363..82b20033a 100644
--- a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN.Abp.SettingManagement.Application.Contracts.csproj
+++ b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN.Abp.SettingManagement.Application.Contracts.csproj
@@ -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>
diff --git a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/AbpSettingManagementApplicationContractsModule.cs b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/AbpSettingManagementApplicationContractsModule.cs
index 363727665..198ceecb9 100644
--- a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/AbpSettingManagementApplicationContractsModule.cs
+++ b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/AbpSettingManagementApplicationContractsModule.cs
@@ -1,29 +1,29 @@
-using Volo.Abp.Application;
-using Volo.Abp.Localization;
-using Volo.Abp.Modularity;
-using Volo.Abp.SettingManagement;
-using Volo.Abp.SettingManagement.Localization;
-using Volo.Abp.VirtualFileSystem;
-
-namespace LINGYUN.Abp.SettingManagement
-{
-    [DependsOn(typeof(AbpDddApplicationModule))]
-    [DependsOn(typeof(AbpSettingManagementDomainSharedModule))]
-    public class AbpSettingManagementApplicationContractsModule : AbpModule
-    {
-        public override void ConfigureServices(ServiceConfigurationContext context)
-        {
-            Configure<AbpVirtualFileSystemOptions>(options =>
-            {
-                options.FileSets.AddEmbedded<AbpSettingManagementApplicationContractsModule>();
-            });
-
-            Configure<AbpLocalizationOptions>(options =>
-            {
-                options.Resources
-                .Get<AbpSettingManagementResource>()
-                .AddVirtualJson("/LINGYUN/Abp/SettingManagement/Localization/ApplicationContracts");
-            });
-        }
-    }
-}
+using Volo.Abp.Application;
+using Volo.Abp.Localization;
+using Volo.Abp.Modularity;
+using Volo.Abp.SettingManagement;
+using Volo.Abp.SettingManagement.Localization;
+using Volo.Abp.VirtualFileSystem;
+
+namespace LINGYUN.Abp.SettingManagement
+{
+    [DependsOn(typeof(AbpDddApplicationContractsModule))]
+    [DependsOn(typeof(AbpSettingManagementDomainSharedModule))]
+    public class AbpSettingManagementApplicationContractsModule : AbpModule
+    {
+        public override void ConfigureServices(ServiceConfigurationContext context)
+        {
+            Configure<AbpVirtualFileSystemOptions>(options =>
+            {
+                options.FileSets.AddEmbedded<AbpSettingManagementApplicationContractsModule>();
+            });
+
+            Configure<AbpLocalizationOptions>(options =>
+            {
+                options.Resources
+                .Get<AbpSettingManagementResource>()
+                .AddVirtualJson("/LINGYUN/Abp/SettingManagement/Localization/ApplicationContracts");
+            });
+        }
+    }
+}
diff --git a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/AbpSettingManagementPermissionProvider.cs b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/AbpSettingManagementPermissionProvider.cs
index b7012c860..b62e99ea7 100644
--- a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/AbpSettingManagementPermissionProvider.cs
+++ b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/AbpSettingManagementPermissionProvider.cs
@@ -1,25 +1,22 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using Volo.Abp.Authorization.Permissions;
-using Volo.Abp.Localization;
-using Volo.Abp.SettingManagement.Localization;
-
-namespace LINGYUN.Abp.SettingManagement
-{
-    public class AbpSettingManagementPermissionProvider : PermissionDefinitionProvider
-    {
-        public override void Define(IPermissionDefinitionContext context)
-        {
-            var settingPermissionGroup = context.AddGroup(AbpSettingManagementPermissions.GroupName, L("Permission:SettingManagement"));
-            
-            var settingPermissions = settingPermissionGroup.AddPermission(AbpSettingManagementPermissions.Settings.Default, L("Permission:Settings"));
-            settingPermissions.AddChild(AbpSettingManagementPermissions.Settings.Manager, L("Permission:Manager"));
-        }
-
-        private static LocalizableString L(string name)
-        {
-            return LocalizableString.Create<AbpSettingManagementResource>(name);
-        }
-    }
-}
+using Volo.Abp.Authorization.Permissions;
+using Volo.Abp.Localization;
+using Volo.Abp.SettingManagement.Localization;
+
+namespace LINGYUN.Abp.SettingManagement
+{
+    public class AbpSettingManagementPermissionProvider : PermissionDefinitionProvider
+    {
+        public override void Define(IPermissionDefinitionContext context)
+        {
+            var settingPermissionGroup = context.AddGroup(AbpSettingManagementPermissions.GroupName, L("Permission:SettingManagement"));
+            
+            var settingPermissions = settingPermissionGroup.AddPermission(AbpSettingManagementPermissions.Settings.Default, L("Permission:Settings"));
+            settingPermissions.AddChild(AbpSettingManagementPermissions.Settings.Manager, L("Permission:Manager"));
+        }
+
+        private static LocalizableString L(string name)
+        {
+            return LocalizableString.Create<AbpSettingManagementResource>(name);
+        }
+    }
+}
diff --git a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/Dto/SettingDetailsDto.cs b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/Dto/SettingDetailsDto.cs
index fa10b6fb3..56c47a192 100644
--- a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/Dto/SettingDetailsDto.cs
+++ b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/Dto/SettingDetailsDto.cs
@@ -1,42 +1,53 @@
-using System.Collections.Generic;
-
-namespace LINGYUN.Abp.SettingManagement
-{
-    public class SettingDetailsDto
-    {
-        public string Name { get; set; }
-
-        public string DisplayName { get; set; }
-
-        public string Description { get; set; }
-
-        public string Value { get; set; }
-
-        public string DefaultValue { get; set; }
-
-        public bool IsEncrypted { get; set; }
-
-        public ValueType ValueType { get; set; }
-        /// <summary>
-        /// 选项列表,仅当 ValueType 为 Option有效
-        /// </summary>
-        public List<OptionDto> Options { get; set; } = new List<OptionDto>();
-
-        public SettingDetailsDto AddOption(string name, string value)
-        {
-            Options.Add(new OptionDto
-            {
-                Name = name,
-                Value = value
-            });
-
-            return this;
-        }
-
-        public SettingDetailsDto AddOptions(IEnumerable<OptionDto> options)
-        {
-            Options.AddRange(options);
-            return this;
-        }
-    }
+using System.Collections.Generic;
+
+namespace LINGYUN.Abp.SettingManagement
+{
+    public class SettingDetailsDto
+    {
+        public string Name { get; set; }
+
+        public string DisplayName { get; set; }
+
+        public string Description { get; set; }
+
+        public string Value { get; set; }
+
+        public string DefaultValue { get; set; }
+
+        public bool IsEncrypted { get; set; }
+
+        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
+            {
+                Name = name,
+                Value = value
+            });
+
+            return this;
+        }
+
+        public SettingDetailsDto AddOptions(IEnumerable<OptionDto> options)
+        {
+            Options.AddRange(options);
+            return this;
+        }
+    }
 }
\ No newline at end of file
diff --git a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application/LINGYUN.Abp.SettingManagement.Application.csproj b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application/LINGYUN.Abp.SettingManagement.Application.csproj
index cd511ec44..08582f640 100644
--- a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application/LINGYUN.Abp.SettingManagement.Application.csproj
+++ b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application/LINGYUN.Abp.SettingManagement.Application.csproj
@@ -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>
diff --git a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application/LINGYUN/Abp/SettingManagement/AbpSettingManagementApplicationModule.cs b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application/LINGYUN/Abp/SettingManagement/AbpSettingManagementApplicationModule.cs
index 318b8d6ac..39de5c8d9 100644
--- a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application/LINGYUN/Abp/SettingManagement/AbpSettingManagementApplicationModule.cs
+++ b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application/LINGYUN/Abp/SettingManagement/AbpSettingManagementApplicationModule.cs
@@ -1,13 +1,15 @@
-using Volo.Abp.Modularity;
-using Volo.Abp.SettingManagement;
-
-namespace LINGYUN.Abp.SettingManagement
-{
-    [DependsOn(
-        typeof(AbpSettingManagementDomainModule),
-        typeof(AbpSettingManagementApplicationContractsModule)
-        )]
-    public class AbpSettingManagementApplicationModule : AbpModule
-    {
-    }
-}
+using Volo.Abp.Application;
+using Volo.Abp.Modularity;
+using Volo.Abp.SettingManagement;
+
+namespace LINGYUN.Abp.SettingManagement
+{
+    [DependsOn(
+        typeof(AbpSettingManagementDomainModule),
+        typeof(AbpSettingManagementApplicationContractsModule),
+        typeof(AbpDddApplicationModule)
+        )]
+    public class AbpSettingManagementApplicationModule : AbpModule
+    {
+    }
+}