Merge pull request #16985 from abpframework/liangshiwei/patch

Move Order to ExtensionPropertyUI

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

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

framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ObjectExtensionInfo.cs

@@ -69,7 +69,7 @@ public class ObjectExtensionInfo
     [NotNull]
     public virtual ImmutableList<ObjectExtensionPropertyInfo> GetProperties()
     {
-        return Properties.OrderBy(t => t.Value.Order).Select(t => t.Value)
+        return Properties.OrderBy(t => t.Value.UI.Order).Select(t => t.Value)
                         .ToImmutableList();
     }
 

framework/src/Volo.Abp.ObjectExtending/Volo/Abp/ObjectExtending/ObjectExtensionPropertyInfo.cs

@@ -59,11 +59,6 @@ public class ObjectExtensionPropertyInfo : IHasNameWithLocalizableDisplayName, I
 
     [NotNull]
     public ExtensionPropertyLookupConfiguration Lookup { get; set; }
-    
-    /// <summary>
-    /// The Display order of the Property.
-    /// </summary>
-    public int Order { get; set; }
 
     public ExtensionPropertyUI UI { get; set; }
 
@@ -93,6 +88,8 @@ public class ObjectExtensionPropertyInfo : IHasNameWithLocalizableDisplayName, I
 
     public class ExtensionPropertyUI
     {
+        public int Order { get; set; }
+        
         public ExtensionPropertyUIEditModal EditModal { get; set; }
 
         public ExtensionPropertyUI()