diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/SettingComponentCreationContext.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/SettingComponentCreationContext.cs index d016fb66ce..ff386cc260 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/SettingComponentCreationContext.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/SettingComponentCreationContext.cs @@ -25,7 +25,7 @@ public class SettingComponentCreationContext : IServiceProviderAccessor private void Order() { - var orderedItems = Groups.OrderBy(item => item.Order).ToArray(); + var orderedItems = Groups.OrderBy(item => item.Order).ThenBy(item => item.DisplayName).ToArray(); Groups.Clear(); Groups.AddRange(orderedItems); } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/SettingComponentGroup.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/SettingComponentGroup.cs index 0577f38b76..7b1aca36aa 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/SettingComponentGroup.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/SettingComponentGroup.cs @@ -5,7 +5,7 @@ namespace Volo.Abp.SettingManagement.Blazor; public class SettingComponentGroup { - public const int DefaultOrder = 1000; + public const int DefaultOrder = 1; public string Id { get => _id; diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Settings/EmailingPageContributor.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Settings/EmailingPageContributor.cs index 13cdc2acde..aec58c8ca8 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Settings/EmailingPageContributor.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Settings/EmailingPageContributor.cs @@ -23,8 +23,7 @@ public class EmailingPageContributor : ISettingComponentContributor new SettingComponentGroup( "Volo.Abp.SettingManagement", l["Menu:Emailing"], - typeof(EmailSettingGroupViewComponent), - order : 3 + typeof(EmailSettingGroupViewComponent) ) ); } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Settings/TimeZonePageContributor.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Settings/TimeZonePageContributor.cs index a23a32cb53..6effd64494 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Settings/TimeZonePageContributor.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Settings/TimeZonePageContributor.cs @@ -20,8 +20,7 @@ public class TimeZonePageContributor : ISettingComponentContributor new SettingComponentGroup( "Volo.Abp.TimeZone", l["Menu:TimeZone"], - typeof(TimeZoneSettingGroupViewComponent), - order : 4 + typeof(TimeZoneSettingGroupViewComponent) ) ); } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/SettingPageCreationContext.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/SettingPageCreationContext.cs index 51490e4e63..957342592d 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/SettingPageCreationContext.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/SettingPageCreationContext.cs @@ -25,7 +25,7 @@ public class SettingPageCreationContext : IServiceProviderAccessor private void Order() { - var orderedItems = Groups.OrderBy(item => item.Order).ToArray(); + var orderedItems = Groups.OrderBy(item => item.Order).ThenBy(item => item.DisplayName).ToArray(); Groups.Clear(); Groups.AddRange(orderedItems); } diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Settings/EmailingPageContributor.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Settings/EmailingPageContributor.cs index 0c369f12ff..5096404a11 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Settings/EmailingPageContributor.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Settings/EmailingPageContributor.cs @@ -23,8 +23,7 @@ public class EmailingPageContributor : SettingPageContributorBase new SettingPageGroup( "Volo.Abp.EmailSetting", l["Menu:Emailing"], - typeof(EmailSettingGroupViewComponent), - order : 3 + typeof(EmailSettingGroupViewComponent) ) ); return Task.CompletedTask; diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Settings/TimeZonePageContributor.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Settings/TimeZonePageContributor.cs index 21c35baccc..696d1204da 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Settings/TimeZonePageContributor.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Settings/TimeZonePageContributor.cs @@ -25,8 +25,7 @@ public class TimeZonePageContributor : SettingPageContributorBase new SettingPageGroup( "Volo.Abp.TimeZone", l["Menu:TimeZone"], - typeof(TimeZoneSettingGroupViewComponent), - order : 4 + typeof(TimeZoneSettingGroupViewComponent) ) ); }