Merge pull request #14111 from abpframework/auto-merge/rel-6-0/1363

Merge branch dev with rel-6.0

docs/en/UI/Angular/Theme-Configurations.md

@@ -0,0 +1,3 @@
+# Angular UI: Theme Configurations
+
+> This document is in draft version.

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateProjectBuilder.cs

@@ -235,6 +235,12 @@ public class TemplateProjectBuilder : IProjectBuilder, ITransientDependency
         if (args.Theme.HasValue)
         {
             Logger.LogInformation("Theme: " + args.Theme);
+
+            if (args.UiFramework == UiFramework.Angular && (args.Theme != AppTemplate.DefaultTheme || args.Theme != AppProTemplate.DefaultTheme))
+            {
+                Logger.LogWarning("You may need to make some additional changes for this theme. " +
+                                  "See the documentation for more information: https://docs.abp.io/en/abp/latest/UI/Angular/Theme-Configurations");
+            }
         }
 
         if(args.ThemeStyle.HasValue) 

framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/Modularity/ModuleExtensionConfigurationHelper.cs

@@ -174,6 +174,11 @@ public static class ModuleExtensionConfigurationHelper
                         property.DefaultValue = propertyConfig.DefaultValue;
                         property.DefaultValueFactory = propertyConfig.DefaultValueFactory;
                         property.Lookup = propertyConfig.UI.Lookup;
+                        property.Configuration.Clear();
+                        foreach (var configuration in propertyConfig.Configuration)
+                        {
+                            property.Configuration[configuration.Key] = configuration.Value;
+                        }
                     }
                 );
         }