Browse Source

improve

pull/17254/head
liangshiwei 3 years ago
parent
commit
b5b2cfb07e
  1. 2
      modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/SettingComponentCreationContext.cs
  2. 2
      modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/SettingComponentGroup.cs
  3. 3
      modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Settings/EmailingPageContributor.cs
  4. 3
      modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Settings/TimeZonePageContributor.cs
  5. 2
      modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/SettingPageCreationContext.cs
  6. 3
      modules/setting-management/src/Volo.Abp.SettingManagement.Web/Settings/EmailingPageContributor.cs
  7. 3
      modules/setting-management/src/Volo.Abp.SettingManagement.Web/Settings/TimeZonePageContributor.cs

2
modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/SettingComponentCreationContext.cs

@ -25,7 +25,7 @@ public class SettingComponentCreationContext : IServiceProviderAccessor
private void Order() 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.Clear();
Groups.AddRange(orderedItems); Groups.AddRange(orderedItems);
} }

2
modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/SettingComponentGroup.cs

@ -5,7 +5,7 @@ namespace Volo.Abp.SettingManagement.Blazor;
public class SettingComponentGroup public class SettingComponentGroup
{ {
public const int DefaultOrder = 1000; public const int DefaultOrder = 1;
public string Id { public string Id {
get => _id; get => _id;

3
modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Settings/EmailingPageContributor.cs

@ -23,8 +23,7 @@ public class EmailingPageContributor : ISettingComponentContributor
new SettingComponentGroup( new SettingComponentGroup(
"Volo.Abp.SettingManagement", "Volo.Abp.SettingManagement",
l["Menu:Emailing"], l["Menu:Emailing"],
typeof(EmailSettingGroupViewComponent), typeof(EmailSettingGroupViewComponent)
order : 3
) )
); );
} }

3
modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Settings/TimeZonePageContributor.cs

@ -20,8 +20,7 @@ public class TimeZonePageContributor : ISettingComponentContributor
new SettingComponentGroup( new SettingComponentGroup(
"Volo.Abp.TimeZone", "Volo.Abp.TimeZone",
l["Menu:TimeZone"], l["Menu:TimeZone"],
typeof(TimeZoneSettingGroupViewComponent), typeof(TimeZoneSettingGroupViewComponent)
order : 4
) )
); );
} }

2
modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/SettingPageCreationContext.cs

@ -25,7 +25,7 @@ public class SettingPageCreationContext : IServiceProviderAccessor
private void Order() 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.Clear();
Groups.AddRange(orderedItems); Groups.AddRange(orderedItems);
} }

3
modules/setting-management/src/Volo.Abp.SettingManagement.Web/Settings/EmailingPageContributor.cs

@ -23,8 +23,7 @@ public class EmailingPageContributor : SettingPageContributorBase
new SettingPageGroup( new SettingPageGroup(
"Volo.Abp.EmailSetting", "Volo.Abp.EmailSetting",
l["Menu:Emailing"], l["Menu:Emailing"],
typeof(EmailSettingGroupViewComponent), typeof(EmailSettingGroupViewComponent)
order : 3
) )
); );
return Task.CompletedTask; return Task.CompletedTask;

3
modules/setting-management/src/Volo.Abp.SettingManagement.Web/Settings/TimeZonePageContributor.cs

@ -25,8 +25,7 @@ public class TimeZonePageContributor : SettingPageContributorBase
new SettingPageGroup( new SettingPageGroup(
"Volo.Abp.TimeZone", "Volo.Abp.TimeZone",
l["Menu:TimeZone"], l["Menu:TimeZone"],
typeof(TimeZoneSettingGroupViewComponent), typeof(TimeZoneSettingGroupViewComponent)
order : 4
) )
); );
} }

Loading…
Cancel
Save