tsai
/
abp
mirror of https://github.com/abpframework/abp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Upgrade to Blazorise 2.0.

pull/24906/head
maliming 7 months ago
parent
8b057f0518
commit
2c37961d71
No known key found for this signature in database GPG Key ID: A646B9CB645ECEA4
35 changed files with 198 additions and 194 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      Directory.Packages.props
  2. 5
      framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/Extensibility/TableColumns/TableColumn.cs
  3. 30
      framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor
  4. 7
      framework/src/Volo.Abp.BlazoriseUI/Components/DataGridEntityActionsColumn.razor.cs
  5. 2
      framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/CheckExtensionProperty.razor
  6. 6
      framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/DateTimeExtensionProperty.razor
  7. 2
      framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/LookupExtensionProperty.razor
  8. 2
      framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/SelectExtensionProperty.razor
  9. 6
      framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/TextAreaExtensionProperty.razor
  10. 4
      framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/TextExtensionProperty.razor
  11. 4
      framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/TimeExtensionProperty.razor
  12. 4
      framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor
  13. 16
      modules/account/src/Volo.Abp.Account.Blazor/Pages/Account/AccountManage.razor
  14. 2
      modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Themes/Basic/LoginDisplay.razor
  15. 2
      modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor
  16. 14
      modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor
  17. 24
      modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor
  18. 70
      modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor
  19. 16
      modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor
  20. 42
      modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/ResourcePermissionManagementModal.razor
  21. 52
      modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/EmailSettingGroup/EmailSettingGroupViewComponent.razor
  22. 2
      modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/TimeZoneSettingGroup/TimeZoneSettingGroupViewComponent.razor
  23. 24
      modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor
  24. 4
      templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj
  25. 4
      templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
  26. 4
      templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/MyCompanyName.MyProjectName.Blazor.WebAssembly.Client.csproj
  27. 4
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/MyCompanyName.MyProjectName.Blazor.Client.csproj
  28. 4
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj
  29. 4
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
  30. 4
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Client/MyCompanyName.MyProjectName.Blazor.WebApp.Client.csproj
  31. 4
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client.csproj
  32. 4
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.csproj
  33. 4
      templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/MyCompanyName.MyProjectName.Blazor.WebApp.csproj
  34. 4
      templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host.Client/MyCompanyName.MyProjectName.Blazor.Host.Client.csproj
  35. 4
      templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyCompanyName.MyProjectName.Blazor.Server.Host.csproj

8
Directory.Packages.props
View File

@ -19,10 +19,10 @@
<PackageVersion Include="Azure.Identity" Version="1.14.2" /> <PackageVersion Include="Azure.Identity" Version="1.14.2" />
<PackageVersion Include="Azure.Messaging.ServiceBus" Version="7.20.1" /> <PackageVersion Include="Azure.Messaging.ServiceBus" Version="7.20.1" />
<PackageVersion Include="Azure.Storage.Blobs" Version="12.25.0" /> <PackageVersion Include="Azure.Storage.Blobs" Version="12.25.0" />
<PackageVersion Include="Blazorise" Version="1.8.8" /> <PackageVersion Include="Blazorise" Version="2.0.0" />
<PackageVersion Include="Blazorise.Components" Version="1.8.8" /> <PackageVersion Include="Blazorise.Components" Version="2.0.0" />
<PackageVersion Include="Blazorise.DataGrid" Version="1.8.8" /> <PackageVersion Include="Blazorise.DataGrid" Version="2.0.0" />
<PackageVersion Include="Blazorise.Snackbar" Version="1.8.8" /> <PackageVersion Include="Blazorise.Snackbar" Version="2.0.0" />
<PackageVersion Include="Castle.Core" Version="5.2.1" /> <PackageVersion Include="Castle.Core" Version="5.2.1" />
<PackageVersion Include="Castle.Core.AsyncInterceptor" Version="2.1.0" /> <PackageVersion Include="Castle.Core.AsyncInterceptor" Version="2.1.0" />
<PackageVersion Include="CommonMark.NET" Version="0.15.1" /> <PackageVersion Include="CommonMark.NET" Version="0.15.1" />

5
framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/Extensibility/TableColumns/TableColumn.cs
View File

@ -11,7 +11,10 @@ public class TableColumn
public string Data { get; set; } = default!; public string Data { get; set; } = default!;
public string Width { get; set; } = default!; /// <summary>
/// px
/// </summary>
public double Width { get; set; } = default!;
public string PropertyName { get; set; } = default!; public string PropertyName { get; set; } = default!;

30
framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor
View File

@ -7,7 +7,7 @@
ReadData="@ReadData" ReadData="@ReadData"
TotalItems="@TotalItems" TotalItems="@TotalItems"
ShowPager="@ShowPager" ShowPager="@ShowPager"
CurrentPage="@CurrentPage" Page="@CurrentPage"
PageSize="@PageSize" PageSize="@PageSize"
Responsive="@Responsive" Responsive="@Responsive"
Striped Striped
@ -44,9 +44,9 @@
<EntityAction TItem="TItem" <EntityAction TItem="TItem"
Color="@(action.Color != null ? (Blazorise.Color)action.Color : Blazorise.Color.Primary)" Color="@(action.Color != null ? (Blazorise.Color)action.Color : Blazorise.Color.Primary)"
Icon="@action.Icon" Icon="@action.Icon"
Clicked="async () => await action.Clicked(context!)" Clicked="async () => await action.Clicked(context.Item!)"
ConfirmationMessage="() => action.ConfirmationMessage.Invoke(context!)" ConfirmationMessage="() => action.ConfirmationMessage.Invoke(context.Item!)"
Visible="@(action.Visible != null ? action.Visible(context!) : true)" Visible="@(action.Visible != null ? action.Visible(context.Item!) : true)"
Text="@action.Text" Text="@action.Text"
Disabled="@action.Disabled"> Disabled="@action.Disabled">
</EntityAction> </EntityAction>
@ -54,10 +54,10 @@
else else
{ {
<EntityAction TItem="TItem" <EntityAction TItem="TItem"
Clicked="async () => await action.Clicked(context!)" Clicked="async () => await action.Clicked(context.Item!)"
Color="@(action.Color != null ? (Blazorise.Color)action.Color : Blazorise.Color.Primary)" Color="@(action.Color != null ? (Blazorise.Color)action.Color : Blazorise.Color.Primary)"
Icon="@action.Icon" Icon="@action.Icon"
Visible="@(action.Visible != null ? action.Visible(context!) : true)" Visible="@(action.Visible != null ? action.Visible(context.Item!) : true)"
Text="@action.Text" Text="@action.Text"
Disabled="@action.Disabled"> Disabled="@action.Disabled">
</EntityAction> </EntityAction>
@ -73,17 +73,17 @@
{ {
@if (column.ValueConverter == null) @if (column.ValueConverter == null)
{ {
<DataGridColumn TItem="TItem" Field="@column.Data" Width="@column.Width" Caption="@column.Title" Sortable="@column.Sortable" DisplayFormat="@column.DisplayFormat" DisplayFormatProvider="@column.DisplayFormatProvider" Displayable="column.Visible" > <DataGridColumn TItem="TItem" Field="@column.Data" Width="@Width.Px(column.Width)" Caption="@column.Title" Sortable="@column.Sortable" DisplayFormat="@column.DisplayFormat" DisplayFormatProvider="@column.DisplayFormatProvider" Displayable="column.Visible" >
<DisplayTemplate> <DisplayTemplate>
@RenderCustomTableColumnComponent(column.Component, context!) @RenderCustomTableColumnComponent(column.Component, context.Item!)
</DisplayTemplate> </DisplayTemplate>
</DataGridColumn> </DataGridColumn>
} }
else else
{ {
<DataGridColumn TItem="TItem" Field="@column.Data" Width="@column.Width" Caption="@column.Title" Sortable="@column.Sortable" Displayable="column.Visible"> <DataGridColumn TItem="TItem" Field="@column.Data" Width="@Width.Px(column.Width)" Caption="@column.Title" Sortable="@column.Sortable" Displayable="column.Visible">
<DisplayTemplate> <DisplayTemplate>
@RenderCustomTableColumnComponent(column.Component, context!) @RenderCustomTableColumnComponent(column.Component, context.Item!)
</DisplayTemplate> </DisplayTemplate>
</DataGridColumn> </DataGridColumn>
} }
@ -96,7 +96,7 @@
{ {
<DataGridColumn TItem="TItem" <DataGridColumn TItem="TItem"
Field="@column.Data" Field="@column.Data"
Width="@column.Width" Width="@Width.Px(column.Width)"
Caption="@column.Title" Caption="@column.Title"
Sortable="@column.Sortable" Sortable="@column.Sortable"
DisplayFormat="@column.DisplayFormat" DisplayFormat="@column.DisplayFormat"
@ -107,19 +107,19 @@
{ {
<DataGridColumn TItem="TItem" <DataGridColumn TItem="TItem"
Field="@column.Data" Field="@column.Data"
Width="@column.Width" Width="@Width.Px(column.Width)"
Caption="@column.Title" Caption="@column.Title"
Sortable="@column.Sortable" Sortable="@column.Sortable"
Displayable="column.Visible"> Displayable="column.Visible">
<DisplayTemplate> <DisplayTemplate>
@((MarkupString)GetConvertedFieldValue(context, column)) @((MarkupString)GetConvertedFieldValue(context.Item, column))
</DisplayTemplate> </DisplayTemplate>
</DataGridColumn> </DataGridColumn>
} }
} }
else else
{ {
<DataGridColumn TItem="TItem" Field="@nameof(IHasExtraProperties.ExtraProperties)" SortField="@column.PropertyName" Width="@column.Width" Caption="@column.Title" Displayable="column.Visible" Sortable="@column.Sortable"> <DataGridColumn TItem="TItem" Field="@nameof(IHasExtraProperties.ExtraProperties)" SortField="@column.PropertyName" Width="@Width.Px(column.Width)" Caption="@column.Title" Displayable="column.Visible" Sortable="@column.Sortable">
<DisplayTemplate> <DisplayTemplate>
@{ @{
var entity = context as IHasExtraProperties; var entity = context as IHasExtraProperties;
@ -140,7 +140,7 @@
{ {
if (column.ValueConverter != null) if (column.ValueConverter != null)
{ {
@((MarkupString)GetConvertedFieldValue(context, column)) @((MarkupString)GetConvertedFieldValue(context.Item, column))
} }
else else
{ {

7
framework/src/Volo.Abp.BlazoriseUI/Components/DataGridEntityActionsColumn.razor.cs
View File

@ -1,5 +1,6 @@
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Blazorise;
using Blazorise.DataGrid; using Blazorise.DataGrid;
using Localization.Resources.AbpUi; using Localization.Resources.AbpUi;
using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components;
@ -21,13 +22,13 @@ public partial class DataGridEntityActionsColumn<TItem> : DataGridColumn<TItem>
protected virtual ValueTask SetDefaultValuesAsync() protected virtual ValueTask SetDefaultValuesAsync()
{ {
Caption = UiLocalizer["Actions"]; Caption = UiLocalizer["Actions"];
Width = "150px"; Width = Blazorise.Width.Px(150);
Sortable = false; Sortable = false;
Field = ResolveFieldName(); Field = ResolveFieldName();
return ValueTask.CompletedTask; return ValueTask.CompletedTask;
} }
protected virtual string ResolveFieldName() protected virtual string ResolveFieldName()
{ {
var props = typeof(TItem).GetProperties(); var props = typeof(TItem).GetProperties();

2
framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/CheckExtensionProperty.razor
View File

@ -7,7 +7,7 @@
{ {
<Validation Validator="@Validate" MessageLocalizer="@LH.Localize"> <Validation Validator="@Validate" MessageLocalizer="@LH.Localize">
<Field> <Field>
<Check TValue="bool" @bind-Checked="@Value" Disabled="IsReadonlyField"> <Check TValue="bool" @bind-Value="@Value" Disabled="IsReadonlyField">
<ChildContent> <ChildContent>
@PropertyInfo.GetLocalizedDisplayName(StringLocalizerFactory) @PropertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)
</ChildContent> </ChildContent>

6
framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/DateTimeExtensionProperty.razor
View File

@ -10,15 +10,15 @@
<Validation Validator="@Validate" MessageLocalizer="@LH.Localize"> <Validation Validator="@Validate" MessageLocalizer="@LH.Localize">
<Field> <Field>
<FieldLabel>@PropertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)</FieldLabel> <FieldLabel>@PropertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)</FieldLabel>
<DateEdit TValue="DateTime?" <DateInput TValue="DateTime?"
InputMode="@(PropertyInfo.IsDate() ? DateInputMode.Date : DateInputMode.DateTime)" InputMode="@(PropertyInfo.IsDate() ? DateInputMode.Date : DateInputMode.DateTime)"
Pattern="@PropertyInfo.GetDateEditInputFormatOrNull()" Pattern="@PropertyInfo.GetDateEditInputFormatOrNull()"
Disabled="IsReadonlyField" Disabled="IsReadonlyField"
@bind-Date="@Value"> @bind-Value="@Value">
<Feedback> <Feedback>
<ValidationError/> <ValidationError/>
</Feedback> </Feedback>
</DateEdit> </DateInput>
</Field> </Field>
</Validation> </Validation>
} }

2
framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/LookupExtensionProperty.razor
View File

@ -15,7 +15,7 @@
SelectedValueChanged="@SelectedValueChanged" SelectedValueChanged="@SelectedValueChanged"
SearchChanged="@SearchFilterChangedAsync" SearchChanged="@SearchFilterChangedAsync"
Validator="@Validate" Validator="@Validate"
MinLength="0" MinSearchLength="0"
Disabled="IsReadonlyField"> Disabled="IsReadonlyField">
</Autocomplete> </Autocomplete>
</Field> </Field>

2
framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/SelectExtensionProperty.razor
View File

@ -6,7 +6,7 @@
<Validation Validator="@Validate" MessageLocalizer="@LH.Localize"> <Validation Validator="@Validate" MessageLocalizer="@LH.Localize">
<Field> <Field>
<FieldLabel>@PropertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)</FieldLabel> <FieldLabel>@PropertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)</FieldLabel>
<Select @bind-SelectedValue="@SelectedValue"> <Select @bind-Value="@SelectedValue">
<ChildContent> <ChildContent>
@foreach (var item in SelectItems) @foreach (var item in SelectItems)
{ {

6
framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/TextAreaExtensionProperty.razor
View File

@ -1,4 +1,4 @@
@typeparam TEntity @typeparam TEntity
@typeparam TResourceType @typeparam TResourceType
@using Volo.Abp.BlazoriseUI @using Volo.Abp.BlazoriseUI
@using Volo.Abp.Localization @using Volo.Abp.Localization
@ -9,11 +9,11 @@
<Validation Validator="@Validate" MessageLocalizer="@LH.Localize"> <Validation Validator="@Validate" MessageLocalizer="@LH.Localize">
<Field> <Field>
<FieldLabel>@PropertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)</FieldLabel> <FieldLabel>@PropertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)</FieldLabel>
<MemoEdit @bind-Text="@Value" AutoSize Disabled="IsReadonlyField"> <MemoInput @bind-Value="@Value" AutoSize Disabled="IsReadonlyField">
<Feedback> <Feedback>
<ValidationError/> <ValidationError/>
</Feedback> </Feedback>
</MemoEdit> </MemoInput>
</Field> </Field>
</Validation> </Validation>
} }

4
framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/TextExtensionProperty.razor
View File

@ -9,11 +9,11 @@
<Validation Validator="@Validate" MessageLocalizer="@LH.Localize"> <Validation Validator="@Validate" MessageLocalizer="@LH.Localize">
<Field> <Field>
<FieldLabel>@PropertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)</FieldLabel> <FieldLabel>@PropertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)</FieldLabel>
<TextEdit @bind-Text="@Value" Role="@PropertyInfo.GetTextRole()" InputMode="@PropertyInfo.GetTextInputMode()" Disabled="IsReadonlyField"> <TextInput @bind-Value="@Value" Role="@PropertyInfo.GetTextRole()" InputMode="@PropertyInfo.GetTextInputMode()" Disabled="IsReadonlyField">
<Feedback> <Feedback>
<ValidationError/> <ValidationError/>
</Feedback> </Feedback>
</TextEdit> </TextInput>
</Field> </Field>
</Validation> </Validation>
} }

4
framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/TimeExtensionProperty.razor
View File

@ -8,11 +8,11 @@
<Validation Validator="@Validate" MessageLocalizer="@LH.Localize"> <Validation Validator="@Validate" MessageLocalizer="@LH.Localize">
<Field> <Field>
<FieldLabel>@PropertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)</FieldLabel>--> <FieldLabel>@PropertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)</FieldLabel>-->
<TimeEdit TValue="TimeSpan?" @bind-Time="@Value" Disabled="IsReadonlyField"> <TimeInput TValue="TimeSpan?" @bind-Value="@Value" Disabled="IsReadonlyField">
<Feedback> <Feedback>
<ValidationError/> <ValidationError/>
</Feedback> </Feedback>
</TimeEdit> </TimeInput>
</Field> </Field>
</Validation> </Validation>
} }

4
framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor
View File

@ -1,5 +1,5 @@
<Modal @ref="@ModalRef" Closing="@OnModalClosing"> <Modal @ref="@ModalRef" Closing="@OnModalClosing" Centered="@CenterMessage">
<ModalContent Centered="@CenterMessage"> <ModalContent>
@if (!Title.IsNullOrEmpty()) @if (!Title.IsNullOrEmpty())
{ {
<ModalHeader> <ModalHeader>

16
modules/account/src/Volo.Abp.Account.Blazor/Pages/Account/AccountManage.razor
View File

@ -23,15 +23,15 @@
<EditForm id="ChangePasswordForm" Model="@ChangePasswordModel" OnValidSubmit="ChangePasswordAsync"> <EditForm id="ChangePasswordForm" Model="@ChangePasswordModel" OnValidSubmit="ChangePasswordAsync">
<Field> <Field>
<FieldLabel>@L["DisplayName:CurrentPassword"]</FieldLabel> <FieldLabel>@L["DisplayName:CurrentPassword"]</FieldLabel>
<TextEdit Role="@TextRole.Password" @bind-Text="@ChangePasswordModel.CurrentPassword" /> <TextInput Role="@TextRole.Password" @bind-Value="@ChangePasswordModel.CurrentPassword" />
</Field> </Field>
<Field> <Field>
<FieldLabel>@L["DisplayName:NewPassword"]</FieldLabel> <FieldLabel>@L["DisplayName:NewPassword"]</FieldLabel>
<TextEdit Role="@TextRole.Password" @bind-Text="@ChangePasswordModel.NewPassword" /> <TextInput Role="@TextRole.Password" @bind-Value="@ChangePasswordModel.NewPassword" />
</Field> </Field>
<Field> <Field>
<FieldLabel>@L["DisplayName:NewPasswordConfirm"]</FieldLabel> <FieldLabel>@L["DisplayName:NewPasswordConfirm"]</FieldLabel>
<TextEdit Role="@TextRole.Password" @bind-Text="@ChangePasswordModel.NewPasswordConfirm" /> <TextInput Role="@TextRole.Password" @bind-Value="@ChangePasswordModel.NewPasswordConfirm" />
</Field> </Field>
<Field> <Field>
<SubmitButton Form="ChangePasswordForm" Clicked="@ChangePasswordAsync" /> <SubmitButton Form="ChangePasswordForm" Clicked="@ChangePasswordAsync" />
@ -45,25 +45,25 @@
<EditForm id="UpdatePersonalInfoForm" Model="@PersonalInfoModel" OnValidSubmit="UpdatePersonalInfoAsync"> <EditForm id="UpdatePersonalInfoForm" Model="@PersonalInfoModel" OnValidSubmit="UpdatePersonalInfoAsync">
<Field> <Field>
<FieldLabel>@L["DisplayName:UserName"]</FieldLabel> <FieldLabel>@L["DisplayName:UserName"]</FieldLabel>
<TextEdit @bind-Text="@PersonalInfoModel.UserName" /> <TextInput @bind-Value="@PersonalInfoModel.UserName" />
</Field> </Field>
<Fields> <Fields>
<Field ColumnSize="ColumnSize.Is6"> <Field ColumnSize="ColumnSize.Is6">
<FieldLabel>@L["DisplayName:Name"]</FieldLabel> <FieldLabel>@L["DisplayName:Name"]</FieldLabel>
<TextEdit @bind-Text="@PersonalInfoModel.Name" /> <TextInput @bind-Value="@PersonalInfoModel.Name" />
</Field> </Field>
<Field ColumnSize="ColumnSize.Is6"> <Field ColumnSize="ColumnSize.Is6">
<FieldLabel>@L["DisplayName:Surname"]</FieldLabel> <FieldLabel>@L["DisplayName:Surname"]</FieldLabel>
<TextEdit @bind-Text="@PersonalInfoModel.Surname" /> <TextInput @bind-Value="@PersonalInfoModel.Surname" />
</Field> </Field>
</Fields> </Fields>
<Field> <Field>
<FieldLabel>@L["DisplayName:Email"]</FieldLabel> <FieldLabel>@L["DisplayName:Email"]</FieldLabel>
<TextEdit @bind-Text="@PersonalInfoModel.Email" /> <TextInput @bind-Value="@PersonalInfoModel.Email" />
</Field> </Field>
<Field> <Field>
<FieldLabel>@L["DisplayName:PhoneNumber"]</FieldLabel> <FieldLabel>@L["DisplayName:PhoneNumber"]</FieldLabel>
<TextEdit @bind-Text="@PersonalInfoModel.PhoneNumber" /> <TextInput @bind-Value="@PersonalInfoModel.PhoneNumber" />
</Field> </Field>
// TODO: Move this logic to 'ExtensionProperties' component. // TODO: Move this logic to 'ExtensionProperties' component.

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

@ -10,7 +10,7 @@
@inject IStringLocalizer<AbpUiResource> L @inject IStringLocalizer<AbpUiResource> L
<AuthorizeView> <AuthorizeView>
<Authorized> <Authorized>
<Dropdown RightAligned="true"> <Dropdown EndAligned="true">
<DropdownToggle Color="Color.Default"> <DropdownToggle Color="Color.Default">
@if (CurrentTenant.Name != null) @if (CurrentTenant.Name != null)
{ {

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

@ -10,7 +10,7 @@
@inject IOptions<AbpAspNetCoreComponentsWebOptions> AbpAspNetCoreComponentsWebOptions @inject IOptions<AbpAspNetCoreComponentsWebOptions> AbpAspNetCoreComponentsWebOptions
<AuthorizeView> <AuthorizeView>
<Authorized> <Authorized>
<Dropdown RightAligned="true"> <Dropdown EndAligned="true">
<DropdownToggle Color="Color.Default"> <DropdownToggle Color="Color.Default">
@if (CurrentTenant.Name != null) @if (CurrentTenant.Name != null)
{ {

14
modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor
View File

@ -2,8 +2,8 @@
@using Microsoft.Extensions.Localization @using Microsoft.Extensions.Localization
@inherits AbpFeatureManagementComponentBase @inherits AbpFeatureManagementComponentBase
<Modal @ref="Modal" Closing="@ClosingModal"> <Modal @ref="Modal" Closing="@ClosingModal" Size="ModalSize.Large">
<ModalContent Size="ModalSize.Large"> <ModalContent>
<ModalHeader> <ModalHeader>
<ModalTitle>@L["Features"]@ProviderKeyDisplayName</ModalTitle> <ModalTitle>@L["Features"]@ProviderKeyDisplayName</ModalTitle>
<CloseButton Clicked="CloseModal" /> <CloseButton Clicked="CloseModal" />
@ -41,9 +41,9 @@
{ {
<Field Style="@GetFeatureStyles(feature)"> <Field Style="@GetFeatureStyles(feature)">
<FieldLabel>@GetShownName(feature)</FieldLabel> <FieldLabel>@GetShownName(feature)</FieldLabel>
<TextEdit Disabled="@disabled" <TextInput Disabled="@disabled"
Text="@feature.Value" Value="@feature.Value"
TextChanged="@(async (v) => await OnFeatureValueChangedAsync(v, feature))" /> ValueChanged="@(async (v) => await OnFeatureValueChangedAsync(v, feature))" />
@if (feature.Description != null) @if (feature.Description != null)
{ {
<div class="form-text">@feature.Description</div> <div class="form-text">@feature.Description</div>
@ -57,7 +57,7 @@
var selectedValue = SelectionStringValues[feature.Name]; var selectedValue = SelectionStringValues[feature.Name];
<Field Style="@GetFeatureStyles(feature)"> <Field Style="@GetFeatureStyles(feature)">
<FieldLabel>@GetShownName(feature)</FieldLabel> <FieldLabel>@GetShownName(feature)</FieldLabel>
<Select TValue="string" Disabled="disabled" SelectedValue="selectedValue" SelectedValueChanged="s => SelectionStringValues[feature.Name] = s"> <Select TValue="string" Disabled="disabled" Value="selectedValue" ValueChanged="s => SelectionStringValues[feature.Name] = s">
@foreach (var item in items) @foreach (var item in items)
{ {
<SelectItem Value="@item.Value"> <SelectItem Value="@item.Value">
@ -75,7 +75,7 @@
if (feature.ValueType is ToggleStringValueType) if (feature.ValueType is ToggleStringValueType)
{ {
<Field Style="@GetFeatureStyles(feature)"> <Field Style="@GetFeatureStyles(feature)">
<Check TValue="bool" Disabled="disabled" Checked="@ToggleValues[feature.Name]" CheckedChanged="@(async (v) => await OnSelectedValueChangedAsync(v, feature))"> <Check TValue="bool" Disabled="disabled" Value="@ToggleValues[feature.Name]" ValueChanged="@(async (v) => await OnSelectedValueChangedAsync(v, feature))">
@GetShownName(feature) @GetShownName(feature)
</Check> </Check>
@if (feature.Description != null) @if (feature.Description != null)

24
modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor
View File

@ -39,8 +39,8 @@
@* ************************* CREATE MODAL ************************* *@ @* ************************* CREATE MODAL ************************* *@
@if (HasCreatePermission) @if (HasCreatePermission)
{ {
<Modal @ref="CreateModal" Closing="@ClosingCreateModal"> <Modal @ref="CreateModal" Closing="@ClosingCreateModal" Centered="true">
<ModalContent Centered="true"> <ModalContent>
<Form id="CreateRoleForm"> <Form id="CreateRoleForm">
<ModalHeader> <ModalHeader>
<ModalTitle>@L["NewRole"]</ModalTitle> <ModalTitle>@L["NewRole"]</ModalTitle>
@ -51,17 +51,17 @@
<Validation MessageLocalizer="@LH.Localize"> <Validation MessageLocalizer="@LH.Localize">
<Field> <Field>
<FieldLabel>@L["DisplayName:RoleName"] *</FieldLabel> <FieldLabel>@L["DisplayName:RoleName"] *</FieldLabel>
<TextEdit @bind-Text="@NewEntity.Name" Autofocus="true"> <TextInput @bind-Value="@NewEntity.Name" Autofocus="true">
<Feedback> <Feedback>
<ValidationError/> <ValidationError/>
</Feedback> </Feedback>
</TextEdit> </TextInput>
</Field> </Field>
<ExtensionProperties TEntityType="IdentityRoleCreateDto" TResourceType="IdentityResource" Entity="@NewEntity" LH="@LH" ModalType="ExtensionPropertyModalType.CreateModal" /> <ExtensionProperties TEntityType="IdentityRoleCreateDto" TResourceType="IdentityResource" Entity="@NewEntity" LH="@LH" ModalType="ExtensionPropertyModalType.CreateModal" />
</Validation> </Validation>
<Field> <Field>
<Check TValue="bool" @bind-Checked="@NewEntity.IsDefault">@L["DisplayName:IsDefault"]</Check> <Check TValue="bool" @bind-Value="@NewEntity.IsDefault">@L["DisplayName:IsDefault"]</Check>
<Check TValue="bool" @bind-Checked="@NewEntity.IsPublic">@L["DisplayName:IsPublic"]</Check> <Check TValue="bool" @bind-Value="@NewEntity.IsPublic">@L["DisplayName:IsPublic"]</Check>
</Field> </Field>
</Validations> </Validations>
</ModalBody> </ModalBody>
@ -76,8 +76,8 @@
@* ************************* EDIT MODAL ************************* *@ @* ************************* EDIT MODAL ************************* *@
@if (HasUpdatePermission) @if (HasUpdatePermission)
{ {
<Modal @ref="EditModal" Closing="@ClosingEditModal"> <Modal @ref="EditModal" Closing="@ClosingEditModal" Centered="true">
<ModalContent Centered="true"> <ModalContent>
<Form id="EditRoleForm"> <Form id="EditRoleForm">
<ModalHeader> <ModalHeader>
<ModalTitle>@L["Edit"]</ModalTitle> <ModalTitle>@L["Edit"]</ModalTitle>
@ -89,17 +89,17 @@
<Validation MessageLocalizer="@LH.Localize"> <Validation MessageLocalizer="@LH.Localize">
<Field> <Field>
<FieldLabel>@L["DisplayName:RoleName"] *</FieldLabel> <FieldLabel>@L["DisplayName:RoleName"] *</FieldLabel>
<TextEdit @bind-Text="EditingEntity.Name" Autofocus="true"> <TextInput @bind-Value="EditingEntity.Name" Autofocus="true">
<Feedback> <Feedback>
<ValidationError/> <ValidationError/>
</Feedback> </Feedback>
</TextEdit> </TextInput>
</Field> </Field>
<ExtensionProperties TEntityType="IdentityRoleUpdateDto" TResourceType="IdentityResource" Entity="@EditingEntity" LH="@LH" ModalType="ExtensionPropertyModalType.EditModal" /> <ExtensionProperties TEntityType="IdentityRoleUpdateDto" TResourceType="IdentityResource" Entity="@EditingEntity" LH="@LH" ModalType="ExtensionPropertyModalType.EditModal" />
</Validation> </Validation>
<Field> <Field>
<Check TValue="bool" @bind-Checked="@EditingEntity.IsDefault">@L["DisplayName:IsDefault"]</Check> <Check TValue="bool" @bind-Value="@EditingEntity.IsDefault">@L["DisplayName:IsDefault"]</Check>
<Check TValue="bool" @bind-Checked="@EditingEntity.IsPublic">@L["DisplayName:IsPublic"]</Check> <Check TValue="bool" @bind-Value="@EditingEntity.IsPublic">@L["DisplayName:IsPublic"]</Check>
</Field> </Field>
</Validations> </Validations>
</ModalBody> </ModalBody>

70
modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor
View File

@ -26,7 +26,7 @@
<Column ColumnSize="ColumnSize.Is4" class="form-group row" style="text-align:right;"> <Column ColumnSize="ColumnSize.Is4" class="form-group row" style="text-align:right;">
<label for="inputPassword" class="col-sm-4 col-form-label pt-1"> @L["Search"] </label> <label for="inputPassword" class="col-sm-4 col-form-label pt-1"> @L["Search"] </label>
<div class="col-sm-8"> <div class="col-sm-8">
<TextEdit class="form-control-sm" id="inputPassword" Text="@GetListInput.Filter" TextChanged="@OnSearchTextChanged" /> <TextInput class="form-control-sm" id="inputPassword" Value="@GetListInput.Filter" ValueChanged="@OnSearchTextChanged" />
</div> </div>
</Column> </Column>
@ -46,8 +46,8 @@
@* ************************* CREATE MODAL ************************* *@ @* ************************* CREATE MODAL ************************* *@
@if (HasCreatePermission) @if (HasCreatePermission)
{ {
<Modal @ref="CreateModal" Closing="@ClosingCreateModal"> <Modal @ref="CreateModal" Closing="@ClosingCreateModal" Centered="true">
<ModalContent Centered="true"> <ModalContent>
<Form id="CreateUserForm"> <Form id="CreateUserForm">
<ModalHeader> <ModalHeader>
<ModalTitle>@L["NewUser"]</ModalTitle> <ModalTitle>@L["NewUser"]</ModalTitle>
@ -65,31 +65,31 @@
<Validation MessageLocalizer="@LH.Localize"> <Validation MessageLocalizer="@LH.Localize">
<Field> <Field>
<FieldLabel>@L["DisplayName:UserName"] *</FieldLabel> <FieldLabel>@L["DisplayName:UserName"] *</FieldLabel>
<TextEdit @bind-Text="NewEntity.UserName" Autofocus="true"> <TextInput @bind-Value="NewEntity.UserName" Autofocus="true">
<Feedback> <Feedback>
<ValidationError /> <ValidationError />
</Feedback> </Feedback>
</TextEdit> </TextInput>
</Field> </Field>
</Validation> </Validation>
<Validation MessageLocalizer="@LH.Localize"> <Validation MessageLocalizer="@LH.Localize">
<Field> <Field>
<FieldLabel>@L["DisplayName:Name"]</FieldLabel> <FieldLabel>@L["DisplayName:Name"]</FieldLabel>
<TextEdit @bind-Text="NewEntity.Name"> <TextInput @bind-Value="NewEntity.Name">
<Feedback> <Feedback>
<ValidationError /> <ValidationError />
</Feedback> </Feedback>
</TextEdit> </TextInput>
</Field> </Field>
</Validation> </Validation>
<Validation MessageLocalizer="@LH.Localize"> <Validation MessageLocalizer="@LH.Localize">
<Field> <Field>
<FieldLabel>@L["DisplayName:Surname"]</FieldLabel> <FieldLabel>@L["DisplayName:Surname"]</FieldLabel>
<TextEdit @bind-Text="NewEntity.Surname"> <TextInput @bind-Value="NewEntity.Surname">
<Feedback> <Feedback>
<ValidationError /> <ValidationError />
</Feedback> </Feedback>
</TextEdit> </TextInput>
</Field> </Field>
</Validation> </Validation>
<Validation MessageLocalizer="@LH.Localize"> <Validation MessageLocalizer="@LH.Localize">
@ -97,8 +97,8 @@
<FieldLabel>@L["DisplayName:Password"] *</FieldLabel> <FieldLabel>@L["DisplayName:Password"] *</FieldLabel>
<Addons> <Addons>
<Addon AddonType="AddonType.Body"> <Addon AddonType="AddonType.Body">
<TextEdit Role="@_passwordTextRole" @bind-Text="NewEntity.Password"> <TextInput Role="@_passwordTextRole" @bind-Value="NewEntity.Password">
</TextEdit> </TextInput>
</Addon> </Addon>
<Addon AddonType="AddonType.End"> <Addon AddonType="AddonType.End">
<Button Color="Color.Secondary" Clicked="@(() => ChangePasswordTextRole(null))"> <Button Color="Color.Secondary" Clicked="@(() => ChangePasswordTextRole(null))">
@ -112,29 +112,29 @@
<Validation MessageLocalizer="@LH.Localize"> <Validation MessageLocalizer="@LH.Localize">
<Field> <Field>
<FieldLabel>@L["DisplayName:Email"] *</FieldLabel> <FieldLabel>@L["DisplayName:Email"] *</FieldLabel>
<TextEdit @bind-Text="NewEntity.Email"> <TextInput @bind-Value="NewEntity.Email">
<Feedback> <Feedback>
<ValidationError /> <ValidationError />
</Feedback> </Feedback>
</TextEdit> </TextInput>
</Field> </Field>
</Validation> </Validation>
<Validation MessageLocalizer="@LH.Localize"> <Validation MessageLocalizer="@LH.Localize">
<Field> <Field>
<FieldLabel>@L["DisplayName:PhoneNumber"]</FieldLabel> <FieldLabel>@L["DisplayName:PhoneNumber"]</FieldLabel>
<TextEdit @bind-Text="NewEntity.PhoneNumber"> <TextInput @bind-Value="NewEntity.PhoneNumber">
<Feedback> <Feedback>
<ValidationError /> <ValidationError />
</Feedback> </Feedback>
</TextEdit> </TextInput>
</Field> </Field>
</Validation> </Validation>
<Field> <Field>
<Check TValue="bool" @bind-Checked="@NewEntity.IsActive">@L["DisplayName:IsActive"]</Check> <Check TValue="bool" @bind-Value="@NewEntity.IsActive">@L["DisplayName:IsActive"]</Check>
</Field> </Field>
<Field> <Field>
<Tooltip Text="@L["Description:LockoutEnabled"].Value" style="width: fit-content;" Placement="TooltipPlacement.Right" > <Tooltip Text="@L["Description:LockoutEnabled"].Value" style="width: fit-content;" Placement="TooltipPlacement.Right" >
<Check TValue="bool" @bind-Checked="@NewEntity.LockoutEnabled">@L["DisplayName:LockoutEnabled"] <Icon Name="IconName.InfoCircle"/> </Check> <Check TValue="bool" @bind-Value="@NewEntity.LockoutEnabled">@L["DisplayName:LockoutEnabled"] <Icon Name="IconName.InfoCircle"/> </Check>
</Tooltip> </Tooltip>
</Field> </Field>
<ExtensionProperties TEntityType="IdentityUserCreateDto" TResourceType="IdentityResource" Entity="@NewEntity" LH="@LH" ModalType="ExtensionPropertyModalType.CreateModal" /> <ExtensionProperties TEntityType="IdentityUserCreateDto" TResourceType="IdentityResource" Entity="@NewEntity" LH="@LH" ModalType="ExtensionPropertyModalType.CreateModal" />
@ -146,7 +146,7 @@
{ {
<Field> <Field>
<input type="hidden" @bind-value="@role.Name" /> <input type="hidden" @bind-value="@role.Name" />
<Check TValue="bool" @bind-Checked="@role.IsAssigned" Disabled="@(!role.IsAssignable)">@role.Name</Check> <Check TValue="bool" @bind-Value="@role.IsAssigned" Disabled="@(!role.IsAssignable)">@role.Name</Check>
</Field> </Field>
} }
} }
@ -167,8 +167,8 @@
@* ************************* EDIT MODAL ************************* *@ @* ************************* EDIT MODAL ************************* *@
@if (HasUpdatePermission) @if (HasUpdatePermission)
{ {
<Modal @ref="EditModal" Closing="@ClosingEditModal"> <Modal @ref="EditModal" Closing="@ClosingEditModal" Centered="true">
<ModalContent Centered="true"> <ModalContent>
<Form id="EditUserForm"> <Form id="EditUserForm">
<ModalHeader> <ModalHeader>
<ModalTitle>@L["Edit"]</ModalTitle> <ModalTitle>@L["Edit"]</ModalTitle>
@ -191,31 +191,31 @@
<Validation MessageLocalizer="@LH.Localize"> <Validation MessageLocalizer="@LH.Localize">
<Field> <Field>
<FieldLabel>@L["DisplayName:UserName"] *</FieldLabel> <FieldLabel>@L["DisplayName:UserName"] *</FieldLabel>
<TextEdit @bind-Text="EditingEntity.UserName" Autofocus="true"> <TextInput @bind-Value="EditingEntity.UserName" Autofocus="true">
<Feedback> <Feedback>
<ValidationError /> <ValidationError />
</Feedback> </Feedback>
</TextEdit> </TextInput>
</Field> </Field>
</Validation> </Validation>
<Validation MessageLocalizer="@LH.Localize"> <Validation MessageLocalizer="@LH.Localize">
<Field> <Field>
<FieldLabel>@L["DisplayName:Name"]</FieldLabel> <FieldLabel>@L["DisplayName:Name"]</FieldLabel>
<TextEdit @bind-Text="EditingEntity.Name"> <TextInput @bind-Value="EditingEntity.Name">
<Feedback> <Feedback>
<ValidationError /> <ValidationError />
</Feedback> </Feedback>
</TextEdit> </TextInput>
</Field> </Field>
</Validation> </Validation>
<Validation MessageLocalizer="@LH.Localize"> <Validation MessageLocalizer="@LH.Localize">
<Field> <Field>
<FieldLabel>@L["DisplayName:Surname"]</FieldLabel> <FieldLabel>@L["DisplayName:Surname"]</FieldLabel>
<TextEdit @bind-Text="EditingEntity.Surname"> <TextInput @bind-Value="EditingEntity.Surname">
<Feedback> <Feedback>
<ValidationError /> <ValidationError />
</Feedback> </Feedback>
</TextEdit> </TextInput>
</Field> </Field>
</Validation> </Validation>
<Validation MessageLocalizer="@LH.Localize"> <Validation MessageLocalizer="@LH.Localize">
@ -223,8 +223,8 @@
<FieldLabel>@L["DisplayName:Password"]</FieldLabel> <FieldLabel>@L["DisplayName:Password"]</FieldLabel>
<Addons> <Addons>
<Addon AddonType="AddonType.Body"> <Addon AddonType="AddonType.Body">
<TextEdit Role="@_passwordTextRole" @bind-Text="EditingEntity.Password"> <TextInput Role="@_passwordTextRole" @bind-Value="EditingEntity.Password">
</TextEdit> </TextInput>
</Addon> </Addon>
<Addon AddonType="AddonType.End"> <Addon AddonType="AddonType.End">
<Button Color="Color.Secondary" Clicked="@(() => ChangePasswordTextRole(null))"> <Button Color="Color.Secondary" Clicked="@(() => ChangePasswordTextRole(null))">
@ -238,32 +238,32 @@
<Validation MessageLocalizer="@LH.Localize"> <Validation MessageLocalizer="@LH.Localize">
<Field> <Field>
<FieldLabel>@L["DisplayName:Email"] *</FieldLabel> <FieldLabel>@L["DisplayName:Email"] *</FieldLabel>
<TextEdit @bind-Text="EditingEntity.Email"> <TextInput @bind-Value="EditingEntity.Email">
<Feedback> <Feedback>
<ValidationError /> <ValidationError />
</Feedback> </Feedback>
</TextEdit> </TextInput>
</Field> </Field>
</Validation> </Validation>
<Validation MessageLocalizer="@LH.Localize"> <Validation MessageLocalizer="@LH.Localize">
<Field> <Field>
<FieldLabel>@L["DisplayName:PhoneNumber"]</FieldLabel> <FieldLabel>@L["DisplayName:PhoneNumber"]</FieldLabel>
<TextEdit @bind-Text="EditingEntity.PhoneNumber"> <TextInput @bind-Value="EditingEntity.PhoneNumber">
<Feedback> <Feedback>
<ValidationError /> <ValidationError />
</Feedback> </Feedback>
</TextEdit> </TextInput>
</Field> </Field>
</Validation> </Validation>
@if (!IsEditCurrentUser) @if (!IsEditCurrentUser)
{ {
<Field> <Field>
<Check TValue="bool" @bind-Checked="EditingEntity.IsActive">@L["DisplayName:IsActive"]</Check> <Check TValue="bool" @bind-Value="EditingEntity.IsActive">@L["DisplayName:IsActive"]</Check>
</Field> </Field>
} }
<Field> <Field>
<Tooltip Text="@L["Description:LockoutEnabled"].Value" style="width: fit-content;" Placement="TooltipPlacement.Right" > <Tooltip Text="@L["Description:LockoutEnabled"].Value" style="width: fit-content;" Placement="TooltipPlacement.Right" >
<Check TValue="bool" @bind-Checked="EditingEntity.LockoutEnabled">@L["DisplayName:LockoutEnabled"] <Icon Name="IconName.InfoCircle"/> </Check> <Check TValue="bool" @bind-Value="EditingEntity.LockoutEnabled">@L["DisplayName:LockoutEnabled"] <Icon Name="IconName.InfoCircle"/> </Check>
</Tooltip> </Tooltip>
</Field> </Field>
<ExtensionProperties TEntityType="IdentityUserUpdateDto" TResourceType="IdentityResource" Entity="@EditingEntity" LH="@LH" ModalType="ExtensionPropertyModalType.EditModal" /> <ExtensionProperties TEntityType="IdentityUserUpdateDto" TResourceType="IdentityResource" Entity="@EditingEntity" LH="@LH" ModalType="ExtensionPropertyModalType.EditModal" />
@ -277,7 +277,7 @@
{ {
<Field> <Field>
<input type="hidden" @bind-value="@role.Name" /> <input type="hidden" @bind-value="@role.Name" />
<Check TValue="bool" @bind-Checked="@role.IsAssigned" Disabled="@(!role.IsAssignable)">@role.Name</Check> <Check TValue="bool" @bind-Value="@role.IsAssigned" Disabled="@(!role.IsAssignable)">@role.Name</Check>
</Field> </Field>
} }
} }

16
modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor
View File

@ -1,6 +1,6 @@
@inherits Volo.Abp.AspNetCore.Components.AbpComponentBase @inherits Volo.Abp.AspNetCore.Components.AbpComponentBase
<Modal @ref="_modal" Closing="@ClosingModal"> <Modal @ref="_modal" Closing="@ClosingModal" Size="ModalSize.Large" Centered="true">
<ModalContent Size="ModalSize.Large" Centered="true"> <ModalContent>
<ModalHeader> <ModalHeader>
<ModalTitle>@L["Permissions"] - @_entityDisplayName</ModalTitle> <ModalTitle>@L["Permissions"] - @_entityDisplayName</ModalTitle>
<CloseButton Clicked="CloseModal" /> <CloseButton Clicked="CloseModal" />
@ -17,14 +17,14 @@
</span> </span>
</Addon> </Addon>
<Addon AddonType="AddonType.Body"> <Addon AddonType="AddonType.Body">
<TextEdit Text="@_permissionGroupSearchText" TextChanged="OnPermissionGroupSearchTextChangedAsync"/> <TextInput Value="@_permissionGroupSearchText" ValueChanged="OnPermissionGroupSearchTextChangedAsync"/>
</Addon> </Addon>
</Addons> </Addons>
</Field> </Field>
</Column> </Column>
<Column ColumnSize="ColumnSize.IsAuto"> <Column ColumnSize="ColumnSize.IsAuto">
<Field> <Field>
<Check Disabled="_selectAllDisabled" Cursor="Cursor.Pointer" CheckedChanged="@GrantAllAsync" Checked="@GrantAll" TValue="bool" Indeterminate="@GrantAny"> <Check Disabled="_selectAllDisabled" Cursor="Cursor.Pointer" ValueChanged="@GrantAllAsync" Value="@GrantAll" TValue="bool" Indeterminate="@GrantAny">
@L["SelectAllInAllTabs"] @L["SelectAllInAllTabs"]
</Check> </Check>
</Field> </Field>
@ -68,9 +68,9 @@
<Field> <Field>
<Check <Check
Disabled="@(IsPermissionGroupDisabled(group))" Disabled="@(IsPermissionGroupDisabled(group))"
Checked="@(group.Permissions.All(x => x.IsGranted))" Value="@(group.Permissions.All(x => x.IsGranted))"
Cursor="Cursor.Pointer" Cursor="Cursor.Pointer"
CheckedChanged="@(b => GroupGrantAllChanged(b, group))" ValueChanged="@(b => GroupGrantAllChanged(b, group))"
TValue="bool"> TValue="bool">
@L["SelectAllInThisTab"] @L["SelectAllInThisTab"]
</Check> </Check>
@ -84,8 +84,8 @@
<Check <Check
Disabled="@(IsDisabledPermission(permission))" Disabled="@(IsDisabledPermission(permission))"
Cursor="Cursor.Pointer" Cursor="Cursor.Pointer"
Checked="@permission.IsGranted" Value="@permission.IsGranted"
CheckedChanged="@(async (b) => await PermissionChanged(b, group, permission))" ValueChanged="@(async (b) => await PermissionChanged(b, group, permission))"
TValue="bool"> TValue="bool">
@GetShownName(permission) @GetShownName(permission)
</Check> </Check>

42
modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/ResourcePermissionManagementModal.razor
View File

@ -4,8 +4,8 @@
@inherits Volo.Abp.AspNetCore.Components.AbpComponentBase @inherits Volo.Abp.AspNetCore.Components.AbpComponentBase
@inject AbpBlazorMessageLocalizerHelper<AbpPermissionManagementResource> LH @inject AbpBlazorMessageLocalizerHelper<AbpPermissionManagementResource> LH
<Modal @ref="Modal" Closing="@ClosingModal"> <Modal @ref="Modal" Closing="@ClosingModal" Size="ModalSize.ExtraLarge" Centered="true">
<ModalContent Size="ModalSize.ExtraLarge" Centered="true"> <ModalContent>
<ModalHeader> <ModalHeader>
<ModalTitle>@L["ResourcePermissions"] - @ResourceDisplayName</ModalTitle> <ModalTitle>@L["ResourcePermissions"] - @ResourceDisplayName</ModalTitle>
<CloseButton Clicked="CloseModal" /> <CloseButton Clicked="CloseModal" />
@ -23,7 +23,7 @@
PageSize="PageSize"> PageSize="PageSize">
<DataGridColumns> <DataGridColumns>
<DataGridColumn <DataGridColumn
Width="150px" Width="Width.Px( 150 )"
Sortable="false" Sortable="false"
TItem="ResourcePermissionGrantInfoDto" TItem="ResourcePermissionGrantInfoDto"
Field="@nameof(ResourcePermissionGrantInfoDto.ProviderName)" Field="@nameof(ResourcePermissionGrantInfoDto.ProviderName)"
@ -34,10 +34,10 @@
@L["Actions"] @L["Actions"]
</DropdownToggle> </DropdownToggle>
<DropdownMenu> <DropdownMenu>
<DropdownItem Clicked="() => OpenEditModalAsync(context)"> <DropdownItem Clicked="() => OpenEditModalAsync(context.Item)">
@L["Edit"] @L["Edit"]
</DropdownItem> </DropdownItem>
<DropdownItem Clicked="() => DeleteResourcePermissionAsync(context)"> <DropdownItem Clicked="() => DeleteResourcePermissionAsync(context.Item)">
@L["Delete"] @L["Delete"]
</DropdownItem> </DropdownItem>
</DropdownMenu> </DropdownMenu>
@ -47,17 +47,17 @@
<DataGridColumn TItem="ResourcePermissionGrantInfoDto" Field="@nameof(ResourcePermissionGrantInfoDto.ProviderName)" Caption="@L["ResourcePermissionTarget"]" Sortable="false"> <DataGridColumn TItem="ResourcePermissionGrantInfoDto" Field="@nameof(ResourcePermissionGrantInfoDto.ProviderName)" Caption="@L["ResourcePermissionTarget"]" Sortable="false">
<DisplayTemplate> <DisplayTemplate>
@{ @{
<Tooltip Text="@context.ProviderNameDisplayName" Placement="TooltipPlacement.Right" Style="float: left;"> <Tooltip Text="@context.Item.ProviderNameDisplayName" Placement="TooltipPlacement.Right" Style="float: left;">
<span class="d-inline-block bg-light rounded-pill px-2 me-1 ms-1 mb-1">@context.ProviderName</span> <span class="d-inline-block bg-light rounded-pill px-2 me-1 ms-1 mb-1">@context.Item.ProviderName</span>
</Tooltip> </Tooltip>
@context.ProviderDisplayName @context.Item.ProviderDisplayName
} }
</DisplayTemplate> </DisplayTemplate>
</DataGridColumn> </DataGridColumn>
<DataGridColumn TItem="ResourcePermissionGrantInfoDto" Field="@nameof(ResourcePermissionGrantInfoDto.Permissions)" Caption="@L["ResourcePermissionPermissions"]" Sortable="false"> <DataGridColumn TItem="ResourcePermissionGrantInfoDto" Field="@nameof(ResourcePermissionGrantInfoDto.Permissions)" Caption="@L["ResourcePermissionPermissions"]" Sortable="false">
<DisplayTemplate> <DisplayTemplate>
@{ @{
foreach (var permission in context.Permissions) foreach (var permission in context.Item.Permissions)
{ {
<span class="d-inline-block bg-light rounded-pill px-2 me-1 mb-1">@permission.DisplayName</span> <span class="d-inline-block bg-light rounded-pill px-2 me-1 mb-1">@permission.DisplayName</span>
} }
@ -90,8 +90,8 @@
</ModalContent> </ModalContent>
</Modal> </Modal>
<Modal @ref="CreateModal" Closing="@ClosingCreateModal"> <Modal @ref="CreateModal" Closing="@ClosingCreateModal" Centered="true">
<ModalContent Centered="true"> <ModalContent>
<Form> <Form>
<ModalHeader> <ModalHeader>
<ModalTitle>@L["AddResourcePermission"]</ModalTitle> <ModalTitle>@L["AddResourcePermission"]</ModalTitle>
@ -101,8 +101,8 @@
<Validations @ref="@CreateValidationsRef" Model="@CreateEntity" ValidateOnLoad="false"> <Validations @ref="@CreateValidationsRef" Model="@CreateEntity" ValidateOnLoad="false">
<div class="mb-3"> <div class="mb-3">
<RadioGroup TValue="string" <RadioGroup TValue="string"
CheckedValue="@CurrentLookupService" Value="@CurrentLookupService"
CheckedValueChanged="@OnLookupServiceCheckedValueChanged"> ValueChanged="@OnLookupServiceCheckedValueChanged">
@foreach(var keyLookupService in ResourceProviderKeyLookupServices) @foreach(var keyLookupService in ResourceProviderKeyLookupServices)
{ {
<Radio Value="@(keyLookupService.Name)">@keyLookupService.DisplayName</Radio> <Radio Value="@(keyLookupService.Name)">@keyLookupService.DisplayName</Radio>
@ -122,20 +122,20 @@
class="mt-1"> class="mt-1">
</Autocomplete> </Autocomplete>
<Validation @ref="ProviderKeyValidationRef" Validator="ValidateProviderKey"> <Validation @ref="ProviderKeyValidationRef" Validator="ValidateProviderKey">
<TextEdit Style="display: none;"> <TextInput Style="display: none;">
<Feedback> <Feedback>
<ValidationError></ValidationError> <ValidationError></ValidationError>
</Feedback> </Feedback>
</TextEdit> </TextInput>
</Validation> </Validation>
</div> </div>
<div class="mb-3"> <div class="mb-3">
<h4>@L["ResourcePermissionPermissions"]</h4> <h4>@L["ResourcePermissionPermissions"]</h4>
<Switch TValue="bool" Checked="CreateEntity.Permissions.All(x => x.IsGranted)" CheckedChanged="GrantAllAsync">@L["GrantAllResourcePermissions"]</Switch> <Switch TValue="bool" Value="CreateEntity.Permissions.All(x => x.IsGranted)" ValueChanged="GrantAllAsync">@L["GrantAllResourcePermissions"]</Switch>
<div class="mt-2"> <div class="mt-2">
@foreach (var permission in CreateEntity.Permissions) @foreach (var permission in CreateEntity.Permissions)
{ {
<Check TValue="bool" Checked="@permission.IsGranted" CheckedChanged="@((c) => OnPermissionCheckedChanged(permission, c))">@permission.DisplayName</Check> <Check TValue="bool" Value="@permission.IsGranted" ValueChanged="@((c) => OnPermissionCheckedChanged(permission, c))">@permission.DisplayName</Check>
} }
</div> </div>
</div> </div>
@ -149,8 +149,8 @@
</ModalContent> </ModalContent>
</Modal> </Modal>
<Modal @ref="EditModal" Closing="@ClosingEditModal"> <Modal @ref="EditModal" Closing="@ClosingEditModal" Centered="true">
<ModalContent Centered="true"> <ModalContent>
<Form> <Form>
<ModalHeader> <ModalHeader>
<ModalTitle>@L["UpdateResourcePermission"]</ModalTitle> <ModalTitle>@L["UpdateResourcePermission"]</ModalTitle>
@ -160,11 +160,11 @@
<Validations @ref="@EditValidationsRef" Model="@EditEntity" ValidateOnLoad="false"> <Validations @ref="@EditValidationsRef" Model="@EditEntity" ValidateOnLoad="false">
<div class="mb-3"> <div class="mb-3">
<h4>@L["ResourcePermissionPermissions"]</h4> <h4>@L["ResourcePermissionPermissions"]</h4>
<Switch TValue="bool" Checked="EditEntity.Permissions.All(x => x.IsGranted)" CheckedChanged="GrantAllAsync">@L["GrantAllResourcePermissions"]</Switch> <Switch TValue="bool" Value="EditEntity.Permissions.All(x => x.IsGranted)" ValueChanged="GrantAllAsync">@L["GrantAllResourcePermissions"]</Switch>
<div class="mt-2"> <div class="mt-2">
@foreach (var permission in EditEntity.Permissions) @foreach (var permission in EditEntity.Permissions)
{ {
<Check TValue="bool" Checked="@permission.IsGranted" CheckedChanged="@((c) => OnPermissionCheckedChanged(permission, c))">@permission.DisplayName</Check> <Check TValue="bool" Value="@permission.IsGranted" ValueChanged="@((c) => OnPermissionCheckedChanged(permission, c))">@permission.DisplayName</Check>
} }
</div> </div>
</div> </div>

52
modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/EmailSettingGroup/EmailSettingGroupViewComponent.razor
View File

@ -11,79 +11,79 @@
<Validation MessageLocalizer="@LH.Localize"> <Validation MessageLocalizer="@LH.Localize">
<Field> <Field>
<FieldLabel>@L["DefaultFromDisplayName"] *</FieldLabel> <FieldLabel>@L["DefaultFromDisplayName"] *</FieldLabel>
<TextEdit @bind-Text="@EmailSettings.DefaultFromDisplayName"> <TextInput @bind-Value="@EmailSettings.DefaultFromDisplayName">
<Feedback> <Feedback>
<ValidationError/> <ValidationError/>
</Feedback> </Feedback>
</TextEdit> </TextInput>
</Field> </Field>
</Validation> </Validation>
<Validation MessageLocalizer="@LH.Localize"> <Validation MessageLocalizer="@LH.Localize">
<Field> <Field>
<FieldLabel>@L["DefaultFromAddress"] *</FieldLabel> <FieldLabel>@L["DefaultFromAddress"] *</FieldLabel>
<TextEdit @bind-Text="@EmailSettings.DefaultFromAddress"> <TextInput @bind-Value="@EmailSettings.DefaultFromAddress">
<Feedback> <Feedback>
<ValidationError/> <ValidationError/>
</Feedback> </Feedback>
</TextEdit> </TextInput>
</Field> </Field>
</Validation> </Validation>
<Validation MessageLocalizer="@LH.Localize"> <Validation MessageLocalizer="@LH.Localize">
<Field> <Field>
<FieldLabel>@L["SmtpHost"]</FieldLabel> <FieldLabel>@L["SmtpHost"]</FieldLabel>
<TextEdit @bind-Text="@EmailSettings.SmtpHost"> <TextInput @bind-Value="@EmailSettings.SmtpHost">
<Feedback> <Feedback>
<ValidationError/> <ValidationError/>
</Feedback> </Feedback>
</TextEdit> </TextInput>
</Field> </Field>
</Validation> </Validation>
<Validation MessageLocalizer="@LH.Localize"> <Validation MessageLocalizer="@LH.Localize">
<Field> <Field>
<FieldLabel>@L["SmtpPort"]</FieldLabel> <FieldLabel>@L["SmtpPort"]</FieldLabel>
<NumericEdit TValue="int" @bind-Value="@EmailSettings.SmtpPort"> <NumericInput TValue="int" @bind-Value="@EmailSettings.SmtpPort">
<Feedback> <Feedback>
<ValidationError/> <ValidationError/>
</Feedback> </Feedback>
</NumericEdit> </NumericInput>
</Field> </Field>
</Validation> </Validation>
<Field> <Field>
<Check TValue="bool" @bind-Checked="@EmailSettings.SmtpEnableSsl">@L["SmtpEnableSsl"]</Check> <Check TValue="bool" @bind-Value="@EmailSettings.SmtpEnableSsl">@L["SmtpEnableSsl"]</Check>
</Field> </Field>
<Field> <Field>
<Check TValue="bool" @bind-Checked="@EmailSettings.SmtpUseDefaultCredentials">@L["SmtpUseDefaultCredentials"]</Check> <Check TValue="bool" @bind-Value="@EmailSettings.SmtpUseDefaultCredentials">@L["SmtpUseDefaultCredentials"]</Check>
</Field> </Field>
@if (!EmailSettings.SmtpUseDefaultCredentials) @if (!EmailSettings.SmtpUseDefaultCredentials)
{ {
<Validation MessageLocalizer="@LH.Localize"> <Validation MessageLocalizer="@LH.Localize">
<Field> <Field>
<FieldLabel>@L["SmtpDomain"]</FieldLabel> <FieldLabel>@L["SmtpDomain"]</FieldLabel>
<TextEdit @bind-Text="@EmailSettings.SmtpDomain"> <TextInput @bind-Value="@EmailSettings.SmtpDomain">
<Feedback> <Feedback>
<ValidationError/> <ValidationError/>
</Feedback> </Feedback>
</TextEdit> </TextInput>
</Field> </Field>
</Validation> </Validation>
<Validation MessageLocalizer="@LH.Localize"> <Validation MessageLocalizer="@LH.Localize">
<Field> <Field>
<FieldLabel>@L["SmtpUserName"]</FieldLabel> <FieldLabel>@L["SmtpUserName"]</FieldLabel>
<TextEdit @bind-Text="@EmailSettings.SmtpUserName"> <TextInput @bind-Value="@EmailSettings.SmtpUserName">
<Feedback> <Feedback>
<ValidationError/> <ValidationError/>
</Feedback> </Feedback>
</TextEdit> </TextInput>
</Field> </Field>
</Validation> </Validation>
<Validation MessageLocalizer="@LH.Localize"> <Validation MessageLocalizer="@LH.Localize">
<Field> <Field>
<FieldLabel>@L["SmtpPassword"]</FieldLabel> <FieldLabel>@L["SmtpPassword"]</FieldLabel>
<TextEdit Role="TextRole.Password" @bind-Text="@EmailSettings.SmtpPassword" Placeholder="@L["SmtpPasswordPlaceholder"].Value"> <TextInput Role="TextRole.Password" @bind-Value="@EmailSettings.SmtpPassword" Placeholder="@L["SmtpPasswordPlaceholder"].Value">
<Feedback> <Feedback>
<ValidationError/> <ValidationError/>
</Feedback> </Feedback>
</TextEdit> </TextInput>
</Field> </Field>
</Validation> </Validation>
} }
@ -105,8 +105,8 @@
@if (HasSendTestEmailPermission) @if (HasSendTestEmailPermission)
{ {
<Modal @ref="SendTestEmailModal"> <Modal @ref="SendTestEmailModal" Centered="true">
<ModalContent Centered="true"> <ModalContent>
<Form id="SendTestEmailForm"> <Form id="SendTestEmailForm">
<ModalHeader> <ModalHeader>
<ModalTitle>@L["SendTestEmail"]</ModalTitle> <ModalTitle>@L["SendTestEmail"]</ModalTitle>
@ -117,41 +117,41 @@
<Validation MessageLocalizer="@LH.Localize"> <Validation MessageLocalizer="@LH.Localize">
<Field> <Field>
<FieldLabel>@L["SenderEmailAddress"]</FieldLabel> <FieldLabel>@L["SenderEmailAddress"]</FieldLabel>
<TextEdit @bind-Text="@SendTestEmailInput.SenderEmailAddress" Autofocus="true"> <TextInput @bind-Value="@SendTestEmailInput.SenderEmailAddress" Autofocus="true">
<Feedback> <Feedback>
<ValidationError/> <ValidationError/>
</Feedback> </Feedback>
</TextEdit> </TextInput>
</Field> </Field>
</Validation> </Validation>
<Validation MessageLocalizer="@LH.Localize"> <Validation MessageLocalizer="@LH.Localize">
<Field> <Field>
<FieldLabel>@L["TargetEmailAddress"]</FieldLabel> <FieldLabel>@L["TargetEmailAddress"]</FieldLabel>
<TextEdit @bind-Text="@SendTestEmailInput.TargetEmailAddress"> <TextInput @bind-Value="@SendTestEmailInput.TargetEmailAddress">
<Feedback> <Feedback>
<ValidationError/> <ValidationError/>
</Feedback> </Feedback>
</TextEdit> </TextInput>
</Field> </Field>
</Validation> </Validation>
<Validation MessageLocalizer="@LH.Localize"> <Validation MessageLocalizer="@LH.Localize">
<Field> <Field>
<FieldLabel>@L["Subject"]</FieldLabel> <FieldLabel>@L["Subject"]</FieldLabel>
<TextEdit @bind-Text="@SendTestEmailInput.Subject"> <TextInput @bind-Value="@SendTestEmailInput.Subject">
<Feedback> <Feedback>
<ValidationError/> <ValidationError/>
</Feedback> </Feedback>
</TextEdit> </TextInput>
</Field> </Field>
</Validation> </Validation>
<Validation MessageLocalizer="@LH.Localize"> <Validation MessageLocalizer="@LH.Localize">
<Field> <Field>
<FieldLabel>@L["Body"]</FieldLabel> <FieldLabel>@L["Body"]</FieldLabel>
<TextEdit @bind-Text="@SendTestEmailInput.Body"> <TextInput @bind-Value="@SendTestEmailInput.Body">
<Feedback> <Feedback>
<ValidationError/> <ValidationError/>
</Feedback> </Feedback>
</TextEdit> </TextInput>
</Field> </Field>
</Validation> </Validation>
</Validations> </Validations>

2
modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/TimeZoneSettingGroup/TimeZoneSettingGroupViewComponent.razor
View File

@ -9,7 +9,7 @@
<Column> <Column>
<Field> <Field>
<FieldLabel>@L["DisplayName:Timezone"] *</FieldLabel> <FieldLabel>@L["DisplayName:Timezone"] *</FieldLabel>
<Select TValue="string" SelectedValue="TimezoneSettings.Timezone" SelectedValueChanged="OnSelectedValueChangedAsync"> <Select TValue="string" Value="TimezoneSettings.Timezone" ValueChanged="OnSelectedValueChangedAsync">
@foreach (var item in TimezoneSettings.TimeZoneItems) @foreach (var item in TimezoneSettings.TimeZoneItems)
{ {
<SelectItem Value="item.Value">@item.Name</SelectItem> <SelectItem Value="item.Value">@item.Name</SelectItem>

24
modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor
View File

@ -38,8 +38,8 @@
@* ************************* CREATE MODAL ************************* *@ @* ************************* CREATE MODAL ************************* *@
@if ( HasCreatePermission ) @if ( HasCreatePermission )
{ {
<Modal @ref="CreateModal" Closing="@ClosingCreateModal"> <Modal @ref="CreateModal" Closing="@ClosingCreateModal" Centered="true">
<ModalContent Centered="true"> <ModalContent>
<Form id="CreateTenantForm"> <Form id="CreateTenantForm">
<ModalHeader> <ModalHeader>
<ModalTitle>@L["NewTenant"]</ModalTitle> <ModalTitle>@L["NewTenant"]</ModalTitle>
@ -50,21 +50,21 @@
<Validation MessageLocalizer="@LH.Localize"> <Validation MessageLocalizer="@LH.Localize">
<Field> <Field>
<FieldLabel>@L["TenantName"] *</FieldLabel> <FieldLabel>@L["TenantName"] *</FieldLabel>
<TextEdit @bind-Text="@NewEntity.Name" Autofocus="true"> <TextInput @bind-Value="@NewEntity.Name" Autofocus="true">
<Feedback> <Feedback>
<ValidationError/> <ValidationError/>
</Feedback> </Feedback>
</TextEdit> </TextInput>
</Field> </Field>
</Validation> </Validation>
<Validation MessageLocalizer="@LH.Localize"> <Validation MessageLocalizer="@LH.Localize">
<Field> <Field>
<FieldLabel>@L["DisplayName:AdminEmailAddress"] *</FieldLabel> <FieldLabel>@L["DisplayName:AdminEmailAddress"] *</FieldLabel>
<TextEdit Role="@TextRole.Email" @bind-Text="@NewEntity.AdminEmailAddress"> <TextInput Role="@TextRole.Email" @bind-Value="@NewEntity.AdminEmailAddress">
<Feedback> <Feedback>
<ValidationError/> <ValidationError/>
</Feedback> </Feedback>
</TextEdit> </TextInput>
</Field> </Field>
</Validation> </Validation>
<Validation MessageLocalizer="@LH.Localize"> <Validation MessageLocalizer="@LH.Localize">
@ -72,8 +72,8 @@
<FieldLabel>@L["DisplayName:AdminPassword"] *</FieldLabel> <FieldLabel>@L["DisplayName:AdminPassword"] *</FieldLabel>
<Addons> <Addons>
<Addon AddonType="AddonType.Body"> <Addon AddonType="AddonType.Body">
<TextEdit Role="ShowPassword ? TextRole.Text : TextRole.Password" @bind-Text="@NewEntity.AdminPassword"> <TextInput Role="ShowPassword ? TextRole.Text : TextRole.Password" @bind-Value="@NewEntity.AdminPassword">
</TextEdit> </TextInput>
</Addon> </Addon>
<Addon AddonType="AddonType.End"> <Addon AddonType="AddonType.End">
<Button Color="Color.Secondary" Clicked="@(() => TogglePasswordVisibility())"> <Button Color="Color.Secondary" Clicked="@(() => TogglePasswordVisibility())">
@ -99,8 +99,8 @@
@* ************************* EDIT MODAL ************************* *@ @* ************************* EDIT MODAL ************************* *@
@if ( HasUpdatePermission ) @if ( HasUpdatePermission )
{ {
<Modal @ref="EditModal" Closing="@ClosingEditModal"> <Modal @ref="EditModal" Closing="@ClosingEditModal" Centered="true">
<ModalContent Centered="true"> <ModalContent>
<Form id="EditTenantForm"> <Form id="EditTenantForm">
<ModalHeader> <ModalHeader>
<ModalTitle>@L["Edit"]</ModalTitle> <ModalTitle>@L["Edit"]</ModalTitle>
@ -111,11 +111,11 @@
<Validation MessageLocalizer="@LH.Localize"> <Validation MessageLocalizer="@LH.Localize">
<Field> <Field>
<FieldLabel>@L["TenantName"] *</FieldLabel> <FieldLabel>@L["TenantName"] *</FieldLabel>
<TextEdit @bind-Text="@EditingEntity.Name" Autofocus="true"> <TextInput @bind-Value="@EditingEntity.Name" Autofocus="true">
<Feedback> <Feedback>
<ValidationError/> <ValidationError/>
</Feedback> </Feedback>
</TextEdit> </TextInput>
</Field> </Field>
</Validation> </Validation>
</Validations> </Validations>

4
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj
View File

@ -8,8 +8,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Blazorise.Bootstrap5" Version="1.8.8" /> <PackageReference Include="Blazorise.Bootstrap5" Version="2.0.0" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.8.8" /> <PackageReference Include="Blazorise.Icons.FontAwesome" Version="2.0.0" />
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" /> <PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" /> <PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
</ItemGroup> </ItemGroup>

4
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
View File

@ -8,8 +8,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Blazorise.Bootstrap5" Version="1.8.8" /> <PackageReference Include="Blazorise.Bootstrap5" Version="2.0.0" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.8.8" /> <PackageReference Include="Blazorise.Icons.FontAwesome" Version="2.0.0" />
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" /> <PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" /> <PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
</ItemGroup> </ItemGroup>

4
templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/MyCompanyName.MyProjectName.Blazor.WebAssembly.Client.csproj
View File

@ -9,8 +9,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Blazorise.Bootstrap5" Version="1.8.8" /> <PackageReference Include="Blazorise.Bootstrap5" Version="2.0.0" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.8.8" /> <PackageReference Include="Blazorise.Icons.FontAwesome" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.2" /> <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.2" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.2" /> <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.2" />
</ItemGroup> </ItemGroup>

4
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/MyCompanyName.MyProjectName.Blazor.Client.csproj
View File

@ -12,8 +12,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Blazorise.Bootstrap5" Version="1.8.8" /> <PackageReference Include="Blazorise.Bootstrap5" Version="2.0.0" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.8.8" /> <PackageReference Include="Blazorise.Icons.FontAwesome" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.2" /> <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.2" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.2" /> <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.2" />
</ItemGroup> </ItemGroup>

4
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj
View File

@ -14,8 +14,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Blazorise.Bootstrap5" Version="1.8.8" /> <PackageReference Include="Blazorise.Bootstrap5" Version="2.0.0" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.8.8" /> <PackageReference Include="Blazorise.Icons.FontAwesome" Version="2.0.0" />
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" /> <PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" /> <PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="10.0.2" /> <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="10.0.2" />

4
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj
View File

@ -15,8 +15,8 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.2" /> <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.2" />
<PackageReference Include="Blazorise.Bootstrap5" Version="1.8.8" /> <PackageReference Include="Blazorise.Bootstrap5" Version="2.0.0" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.8.8" /> <PackageReference Include="Blazorise.Icons.FontAwesome" Version="2.0.0" />
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" /> <PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" /> <PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
</ItemGroup> </ItemGroup>

4
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Client/MyCompanyName.MyProjectName.Blazor.WebApp.Client.csproj
View File

@ -13,8 +13,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Blazorise.Bootstrap5" Version="1.8.8" /> <PackageReference Include="Blazorise.Bootstrap5" Version="2.0.0" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.8.8" /> <PackageReference Include="Blazorise.Icons.FontAwesome" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.2" /> <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.2" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.2" /> <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.2" />
</ItemGroup> </ItemGroup>

4
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client.csproj
View File

@ -13,8 +13,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Blazorise.Bootstrap5" Version="1.8.8" /> <PackageReference Include="Blazorise.Bootstrap5" Version="2.0.0" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.8.8" /> <PackageReference Include="Blazorise.Icons.FontAwesome" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.2" /> <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.2" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.2" /> <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.2" />
</ItemGroup> </ItemGroup>

4
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.csproj
View File

@ -16,8 +16,8 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.2" /> <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.2" />
<PackageReference Include="Blazorise.Bootstrap5" Version="1.8.8" /> <PackageReference Include="Blazorise.Bootstrap5" Version="2.0.0" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.8.8" /> <PackageReference Include="Blazorise.Icons.FontAwesome" Version="2.0.0" />
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" /> <PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" /> <PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="10.0.2" /> <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="10.0.2" />

4
templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/MyCompanyName.MyProjectName.Blazor.WebApp.csproj
View File

@ -16,8 +16,8 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.2" /> <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="10.0.2" />
<PackageReference Include="Blazorise.Bootstrap5" Version="1.8.8" /> <PackageReference Include="Blazorise.Bootstrap5" Version="2.0.0" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.8.8" /> <PackageReference Include="Blazorise.Icons.FontAwesome" Version="2.0.0" />
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" /> <PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" /> <PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
</ItemGroup> </ItemGroup>

4
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host.Client/MyCompanyName.MyProjectName.Blazor.Host.Client.csproj
View File

@ -10,8 +10,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Blazorise.Bootstrap5" Version="1.8.8" /> <PackageReference Include="Blazorise.Bootstrap5" Version="2.0.0" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.8.8" /> <PackageReference Include="Blazorise.Icons.FontAwesome" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.2" /> <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.2" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.2" /> <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.2" />
</ItemGroup> </ItemGroup>

4
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyCompanyName.MyProjectName.Blazor.Server.Host.csproj
View File

@ -13,8 +13,8 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Blazorise.Bootstrap5" Version="1.8.8" /> <PackageReference Include="Blazorise.Bootstrap5" Version="2.0.0" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.8.8" /> <PackageReference Include="Blazorise.Icons.FontAwesome" Version="2.0.0" />
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" /> <PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" /> <PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.2" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.2" />

Write Preview
Loading…
Cancel
Save