diff --git a/Directory.Packages.props b/Directory.Packages.props index e89f989794..d0ab5e52a1 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -19,10 +19,10 @@ - - - - + + + + diff --git a/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/Extensibility/TableColumns/TableColumn.cs b/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/Extensibility/TableColumns/TableColumn.cs index 000e4e7703..5152ce2a22 100644 --- a/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/Extensibility/TableColumns/TableColumn.cs +++ b/framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/Extensibility/TableColumns/TableColumn.cs @@ -11,7 +11,10 @@ public class TableColumn public string Data { get; set; } = default!; - public string Width { get; set; } = default!; + /// + /// px + /// + public double Width { get; set; } = default!; public string PropertyName { get; set; } = default!; diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor b/framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor index 44b8aa46e4..47315154a5 100644 --- a/framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor +++ b/framework/src/Volo.Abp.BlazoriseUI/Components/AbpExtensibleDataGrid.razor @@ -7,7 +7,7 @@ ReadData="@ReadData" TotalItems="@TotalItems" ShowPager="@ShowPager" - CurrentPage="@CurrentPage" + Page="@CurrentPage" PageSize="@PageSize" Responsive="@Responsive" Striped @@ -44,9 +44,9 @@ @@ -54,10 +54,10 @@ else { @@ -73,17 +73,17 @@ { @if (column.ValueConverter == null) { - + - @RenderCustomTableColumnComponent(column.Component, context!) + @RenderCustomTableColumnComponent(column.Component, context.Item!) } else { - + - @RenderCustomTableColumnComponent(column.Component, context!) + @RenderCustomTableColumnComponent(column.Component, context.Item!) } @@ -96,7 +96,7 @@ { - @((MarkupString)GetConvertedFieldValue(context, column)) + @((MarkupString)GetConvertedFieldValue(context.Item, column)) } } else { - + @{ var entity = context as IHasExtraProperties; @@ -140,7 +140,7 @@ { if (column.ValueConverter != null) { - @((MarkupString)GetConvertedFieldValue(context, column)) + @((MarkupString)GetConvertedFieldValue(context.Item, column)) } else { diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/DataGridEntityActionsColumn.razor.cs b/framework/src/Volo.Abp.BlazoriseUI/Components/DataGridEntityActionsColumn.razor.cs index 0180833054..b48a3744fc 100644 --- a/framework/src/Volo.Abp.BlazoriseUI/Components/DataGridEntityActionsColumn.razor.cs +++ b/framework/src/Volo.Abp.BlazoriseUI/Components/DataGridEntityActionsColumn.razor.cs @@ -1,5 +1,6 @@ using System.Linq; using System.Threading.Tasks; +using Blazorise; using Blazorise.DataGrid; using Localization.Resources.AbpUi; using Microsoft.AspNetCore.Components; @@ -21,13 +22,13 @@ public partial class DataGridEntityActionsColumn : DataGridColumn protected virtual ValueTask SetDefaultValuesAsync() { Caption = UiLocalizer["Actions"]; - Width = "150px"; + Width = Blazorise.Width.Px(150); Sortable = false; Field = ResolveFieldName(); - + return ValueTask.CompletedTask; } - + protected virtual string ResolveFieldName() { var props = typeof(TItem).GetProperties(); diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/CheckExtensionProperty.razor b/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/CheckExtensionProperty.razor index eaea3c844a..4ec9b868e0 100644 --- a/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/CheckExtensionProperty.razor +++ b/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/CheckExtensionProperty.razor @@ -7,7 +7,7 @@ { - + @PropertyInfo.GetLocalizedDisplayName(StringLocalizerFactory) diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/DateTimeExtensionProperty.razor b/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/DateTimeExtensionProperty.razor index 0500d29c32..5c54a95112 100644 --- a/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/DateTimeExtensionProperty.razor +++ b/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/DateTimeExtensionProperty.razor @@ -10,15 +10,15 @@ @PropertyInfo.GetLocalizedDisplayName(StringLocalizerFactory) - + @bind-Value="@Value"> - + } diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/LookupExtensionProperty.razor b/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/LookupExtensionProperty.razor index 6217a75543..76ac784061 100644 --- a/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/LookupExtensionProperty.razor +++ b/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/LookupExtensionProperty.razor @@ -15,7 +15,7 @@ SelectedValueChanged="@SelectedValueChanged" SearchChanged="@SearchFilterChangedAsync" Validator="@Validate" - MinLength="0" + MinSearchLength="0" Disabled="IsReadonlyField"> diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/SelectExtensionProperty.razor b/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/SelectExtensionProperty.razor index 605158aec0..79d2f06bc5 100644 --- a/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/SelectExtensionProperty.razor +++ b/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/SelectExtensionProperty.razor @@ -6,7 +6,7 @@ @PropertyInfo.GetLocalizedDisplayName(StringLocalizerFactory) - @foreach (var item in SelectItems) { diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/TextAreaExtensionProperty.razor b/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/TextAreaExtensionProperty.razor index 6acf7ba69d..515869efea 100644 --- a/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/TextAreaExtensionProperty.razor +++ b/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/TextAreaExtensionProperty.razor @@ -1,4 +1,4 @@ -@typeparam TEntity +@typeparam TEntity @typeparam TResourceType @using Volo.Abp.BlazoriseUI @using Volo.Abp.Localization @@ -9,11 +9,11 @@ @PropertyInfo.GetLocalizedDisplayName(StringLocalizerFactory) - + - + } diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/TextExtensionProperty.razor b/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/TextExtensionProperty.razor index e9d3d7031e..0dfd4a19d2 100644 --- a/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/TextExtensionProperty.razor +++ b/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/TextExtensionProperty.razor @@ -9,11 +9,11 @@ @PropertyInfo.GetLocalizedDisplayName(StringLocalizerFactory) - + - + } diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/TimeExtensionProperty.razor b/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/TimeExtensionProperty.razor index 03be9f438a..1ee93159d5 100644 --- a/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/TimeExtensionProperty.razor +++ b/framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/TimeExtensionProperty.razor @@ -8,11 +8,11 @@ @PropertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)--> - + - + } diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor b/framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor index 9e0d86c112..c480711a93 100644 --- a/framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor +++ b/framework/src/Volo.Abp.BlazoriseUI/Components/UiMessageAlert.razor @@ -1,5 +1,5 @@ - - + + @if (!Title.IsNullOrEmpty()) { diff --git a/modules/account/src/Volo.Abp.Account.Blazor/Pages/Account/AccountManage.razor b/modules/account/src/Volo.Abp.Account.Blazor/Pages/Account/AccountManage.razor index 47ffa4cc48..2341b9dc5b 100644 --- a/modules/account/src/Volo.Abp.Account.Blazor/Pages/Account/AccountManage.razor +++ b/modules/account/src/Volo.Abp.Account.Blazor/Pages/Account/AccountManage.razor @@ -23,15 +23,15 @@ @L["DisplayName:CurrentPassword"] - + @L["DisplayName:NewPassword"] - + @L["DisplayName:NewPasswordConfirm"] - + @@ -45,25 +45,25 @@ @L["DisplayName:UserName"] - + @L["DisplayName:Name"] - + @L["DisplayName:Surname"] - + @L["DisplayName:Email"] - + @L["DisplayName:PhoneNumber"] - + // TODO: Move this logic to 'ExtensionProperties' component. diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Themes/Basic/LoginDisplay.razor b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Themes/Basic/LoginDisplay.razor index b2af7c2e1d..973912af30 100644 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Themes/Basic/LoginDisplay.razor +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Themes/Basic/LoginDisplay.razor @@ -10,7 +10,7 @@ @inject IStringLocalizer L - + @if (CurrentTenant.Name != null) { diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor index 995dd0ba7f..6c02e4ffc0 100644 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LoginDisplay.razor @@ -10,7 +10,7 @@ @inject IOptions AbpAspNetCoreComponentsWebOptions - + @if (CurrentTenant.Name != null) { diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor index 321a4774b8..c7e6961ea3 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor @@ -2,8 +2,8 @@ @using Microsoft.Extensions.Localization @inherits AbpFeatureManagementComponentBase - - + + @L["Features"]@ProviderKeyDisplayName @@ -41,9 +41,9 @@ { @GetShownName(feature) - + @if (feature.Description != null) {
@feature.Description
@@ -57,7 +57,7 @@ var selectedValue = SelectionStringValues[feature.Name]; @GetShownName(feature) - @foreach (var item in items) { @@ -75,7 +75,7 @@ if (feature.ValueType is ToggleStringValueType) { - + @GetShownName(feature) @if (feature.Description != null) diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor index 9c4c22a3a0..2dcaea5eac 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor +++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor @@ -39,8 +39,8 @@ @* ************************* CREATE MODAL ************************* *@ @if (HasCreatePermission) { - - + +
@L["NewRole"] @@ -51,17 +51,17 @@ @L["DisplayName:RoleName"] * - + - + - @L["DisplayName:IsDefault"] - @L["DisplayName:IsPublic"] + @L["DisplayName:IsDefault"] + @L["DisplayName:IsPublic"] @@ -76,8 +76,8 @@ @* ************************* EDIT MODAL ************************* *@ @if (HasUpdatePermission) { - - + + @L["Edit"] @@ -89,17 +89,17 @@ @L["DisplayName:RoleName"] * - + - + - @L["DisplayName:IsDefault"] - @L["DisplayName:IsPublic"] + @L["DisplayName:IsDefault"] + @L["DisplayName:IsPublic"] diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor index f146ab644f..28cb7f0bed 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor +++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor @@ -26,7 +26,7 @@
- +
@@ -46,8 +46,8 @@ @* ************************* CREATE MODAL ************************* *@ @if (HasCreatePermission) { - - + + @L["NewUser"] @@ -65,31 +65,31 @@ @L["DisplayName:UserName"] * - + - + @L["DisplayName:Name"] - + - + @L["DisplayName:Surname"] - + - + @@ -97,8 +97,8 @@ @L["DisplayName:Password"] * - - + +