Browse Source

Migrate new naming schema

pull/11649/head
Mladen Macanovic 5 years ago
parent
commit
bf2422a549
  1. 4
      framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/PageToolbars/PageToolbarExtensions.cs
  2. 4
      framework/src/Volo.Abp.BlazoriseUI/AbpBlazoriseUIModule.cs
  3. 2
      framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs
  4. 2
      framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor
  5. 4
      framework/src/Volo.Abp.BlazoriseUI/Components/PageAlert.razor.cs
  6. 2
      framework/src/Volo.Abp.BlazoriseUI/Components/UiPageProgress.razor.cs
  7. 2
      modules/account/src/Volo.Abp.Account.Blazor/Pages/Account/AccountManage.razor
  8. 2
      modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Themes/Basic/LoginDisplay.razor
  9. 2
      modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor
  10. 2
      modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor
  11. 2
      modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor
  12. 2
      modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/SettingManagement.razor

4
framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/PageToolbars/PageToolbarExtensions.cs

@ -47,7 +47,7 @@ public static class PageToolbarExtensions
string text, string text,
Func<Task> clicked, Func<Task> clicked,
object icon = null, object icon = null,
Color color = Color.Primary, Color color = null,
bool disabled = false, bool disabled = false,
int order = 0, int order = 0,
string requiredPolicyName = null) string requiredPolicyName = null)
@ -55,7 +55,7 @@ public static class PageToolbarExtensions
toolbar.AddComponent<ToolbarButton>( toolbar.AddComponent<ToolbarButton>(
new Dictionary<string, object> new Dictionary<string, object>
{ {
{ nameof(ToolbarButton.Color), color}, { nameof(ToolbarButton.Color), color ?? Color.Primary},
{ nameof(ToolbarButton.Text), text}, { nameof(ToolbarButton.Text), text},
{ nameof(ToolbarButton.Disabled), disabled}, { nameof(ToolbarButton.Disabled), disabled},
{ nameof(ToolbarButton.Icon), icon}, { nameof(ToolbarButton.Icon), icon},

4
framework/src/Volo.Abp.BlazoriseUI/AbpBlazoriseUIModule.cs

@ -23,8 +23,8 @@ public class AbpBlazoriseUIModule : AbpModule
{ {
context.Services.AddBlazorise(options => context.Services.AddBlazorise(options =>
{ {
options.DelayTextOnKeyPress = true; options.Debounce = true;
options.DelayTextOnKeyPressInterval = 800; options.DebounceInterval = 800;
}); });
context.Services.AddSingleton(typeof(AbpBlazorMessageLocalizerHelper<>)); context.Services.AddSingleton(typeof(AbpBlazorMessageLocalizerHelper<>));

2
framework/src/Volo.Abp.BlazoriseUI/AbpCrudPageBase.cs

@ -307,7 +307,7 @@ public abstract class AbpCrudPageBase<
protected virtual async Task OnDataGridReadAsync(DataGridReadDataEventArgs<TListViewModel> e) protected virtual async Task OnDataGridReadAsync(DataGridReadDataEventArgs<TListViewModel> e)
{ {
CurrentSorting = e.Columns CurrentSorting = e.Columns
.Where(c => c.SortDirection != SortDirection.None) .Where(c => c.SortDirection != SortDirection.Default)
.Select(c => c.Field + (c.SortDirection == SortDirection.Descending ? " DESC" : "")) .Select(c => c.Field + (c.SortDirection == SortDirection.Descending ? " DESC" : ""))
.JoinAsString(","); .JoinAsString(",");
CurrentPage = e.Page; CurrentPage = e.Page;

2
framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor

@ -52,7 +52,7 @@
{ {
<EntityAction TItem="TItem" <EntityAction TItem="TItem"
Clicked="async () => await action.Clicked(context)" Clicked="async () => await action.Clicked(context)"
Color="@(action.Color != null ? (Blazorise.Color) action.Color : Blazorise.Color.None)" Color="@(action.Color != null ? (Blazorise.Color) action.Color : Blazorise.Color.Default)"
Icon="@action.Icon" Icon="@action.Icon"
Visible="@(action.Visible != null ? action.Visible(context) : true)" Visible="@(action.Visible != null ? action.Visible(context) : true)"
Text="@action.Text" Text="@action.Text"

4
framework/src/Volo.Abp.BlazoriseUI/Components/PageAlert.razor.cs

@ -64,11 +64,11 @@ public partial class PageAlert : ComponentBase, IDisposable
AlertType.Warning => Color.Warning, AlertType.Warning => Color.Warning,
AlertType.Danger => Color.Danger, AlertType.Danger => Color.Danger,
AlertType.Dark => Color.Dark, AlertType.Dark => Color.Dark,
AlertType.Default => Color.None, AlertType.Default => Color.Default,
AlertType.Light => Color.Light, AlertType.Light => Color.Light,
AlertType.Primary => Color.Primary, AlertType.Primary => Color.Primary,
AlertType.Secondary => Color.Secondary, AlertType.Secondary => Color.Secondary,
_ => Color.None, _ => Color.Default,
}; };
return color; return color;

2
framework/src/Volo.Abp.BlazoriseUI/Components/UiPageProgress.razor.cs

@ -51,7 +51,7 @@ public partial class UiPageProgress : ComponentBase, IDisposable
UiPageProgressType.Success => Color.Success, UiPageProgressType.Success => Color.Success,
UiPageProgressType.Warning => Color.Warning, UiPageProgressType.Warning => Color.Warning,
UiPageProgressType.Error => Color.Danger, UiPageProgressType.Error => Color.Danger,
_ => Color.None, _ => Color.Default,
}; };
} }
} }

2
modules/account/src/Volo.Abp.Account.Blazor/Pages/Account/AccountManage.razor

@ -4,7 +4,7 @@
<Row> <Row>
<Column ColumnSize="ColumnSize.Is12"> <Column ColumnSize="ColumnSize.Is12">
<Tabs @bind-SelectedTab="@SelectedTab" TabPosition="TabPosition.Left" Pills="true"> <Tabs @bind-SelectedTab="@SelectedTab" TabPosition="TabPosition.Start" Pills="true">
<Items> <Items>
<Tab Name="Password">@L["ProfileTab:Password"]</Tab> <Tab Name="Password">@L["ProfileTab:Password"]</Tab>
<Tab Name="PersonalInfo">@L["ProfileTab:PersonalInfo"]</Tab> <Tab Name="PersonalInfo">@L["ProfileTab:PersonalInfo"]</Tab>

2
modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Themes/Basic/LoginDisplay.razor

@ -11,7 +11,7 @@
<AuthorizeView> <AuthorizeView>
<Authorized> <Authorized>
<Dropdown RightAligned="true"> <Dropdown RightAligned="true">
<DropdownToggle Color="Color.None"> <DropdownToggle Color="Color.Default">
@if (CurrentTenant.Name != null) @if (CurrentTenant.Name != null)
{ {
<span><i>@CurrentTenant.Name</i>\@CurrentUser.UserName</span> <span><i>@CurrentTenant.Name</i>\@CurrentUser.UserName</span>

2
modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor

@ -11,7 +11,7 @@
<AuthorizeView> <AuthorizeView>
<Authorized> <Authorized>
<Dropdown RightAligned="true"> <Dropdown RightAligned="true">
<DropdownToggle Color="Color.None"> <DropdownToggle Color="Color.Default">
@if (CurrentTenant.Name != null) @if (CurrentTenant.Name != null)
{ {
<span><i>@CurrentTenant.Name</i>\@CurrentUser.UserName</span> <span><i>@CurrentTenant.Name</i>\@CurrentUser.UserName</span>

2
modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor

@ -15,7 +15,7 @@
} }
else else
{ {
<Tabs TabPosition="TabPosition.Left" Pills="true" @bind-SelectedTab="@SelectedTabName"> <Tabs TabPosition="TabPosition.Start" Pills="true" @bind-SelectedTab="@SelectedTabName">
<Items> <Items>
@foreach (var group in Groups) @foreach (var group in Groups)
{ {

2
modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor

@ -17,7 +17,7 @@
@if (_groups != null) @if (_groups != null)
{ {
<Tabs TabPosition="TabPosition.Left" Pills="true" @bind-SelectedTab="@_selectedTabName"> <Tabs TabPosition="TabPosition.Start" Pills="true" @bind-SelectedTab="@_selectedTabName">
<Items> <Items>
@foreach (var group in _groups) @foreach (var group in _groups)
{ {

2
modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/SettingManagement.razor

@ -11,7 +11,7 @@
<Card> <Card>
<CardBody> <CardBody>
<Tabs @bind-SelectedTab="@SelectedGroup" TabPosition="TabPosition.Left" Pills="true"> <Tabs @bind-SelectedTab="@SelectedGroup" TabPosition="TabPosition.Start" Pills="true">
<Items> <Items>
@foreach (var group in SettingComponentCreationContext.Groups) @foreach (var group in SettingComponentCreationContext.Groups)
{ {

Loading…
Cancel
Save