Skip to content

Commit 2c37961

Browse files
malimingmaliming
committed
Upgrade to Blazorise 2.0.
1 parent 8b057f0 commit 2c37961

35 files changed

Lines changed: 198 additions & 194 deletions

File tree

‎Directory.Packages.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
<PackageVersion Include="Azure.Identity" Version="1.14.2" />
2020
<PackageVersion Include="Azure.Messaging.ServiceBus" Version="7.20.1" />
2121
<PackageVersion Include="Azure.Storage.Blobs" Version="12.25.0" />
22-
<PackageVersion Include="Blazorise" Version="1.8.8" />
23-
<PackageVersion Include="Blazorise.Components" Version="1.8.8" />
24-
<PackageVersion Include="Blazorise.DataGrid" Version="1.8.8" />
25-
<PackageVersion Include="Blazorise.Snackbar" Version="1.8.8" />
22+
<PackageVersion Include="Blazorise" Version="2.0.0" />
23+
<PackageVersion Include="Blazorise.Components" Version="2.0.0" />
24+
<PackageVersion Include="Blazorise.DataGrid" Version="2.0.0" />
25+
<PackageVersion Include="Blazorise.Snackbar" Version="2.0.0" />
2626
<PackageVersion Include="Castle.Core" Version="5.2.1" />
2727
<PackageVersion Include="Castle.Core.AsyncInterceptor" Version="2.1.0" />
2828
<PackageVersion Include="CommonMark.NET" Version="0.15.1" />

‎framework/src/Volo.Abp.AspNetCore.Components.Web/Volo/Abp/AspNetCore/Components/Web/Extensibility/TableColumns/TableColumn.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@ public class TableColumn
1111

1212
public string Data { get; set; } = default!;
1313

14-
public string Width { get; set; } = default!;
14+
/// <summary>
15+
/// px
16+
/// </summary>
17+
public double Width { get; set; } = default!;
1518

1619
public string PropertyName { get; set; } = default!;
1720

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
ReadData="@ReadData"
88
TotalItems="@TotalItems"
99
ShowPager="@ShowPager"
10-
CurrentPage="@CurrentPage"
10+
Page="@CurrentPage"
1111
PageSize="@PageSize"
1212
Responsive="@Responsive"
1313
Striped
@@ -44,20 +44,20 @@
4444
<EntityAction TItem="TItem"
4545
Color="@(action.Color != null ? (Blazorise.Color)action.Color : Blazorise.Color.Primary)"
4646
Icon="@action.Icon"
47-
Clicked="async () => await action.Clicked(context!)"
48-
ConfirmationMessage="() => action.ConfirmationMessage.Invoke(context!)"
49-
Visible="@(action.Visible != null ? action.Visible(context!) : true)"
47+
Clicked="async () => await action.Clicked(context.Item!)"
48+
ConfirmationMessage="() => action.ConfirmationMessage.Invoke(context.Item!)"
49+
Visible="@(action.Visible != null ? action.Visible(context.Item!) : true)"
5050
Text="@action.Text"
5151
Disabled="@action.Disabled">
5252
</EntityAction>
5353
}
5454
else
5555
{
5656
<EntityAction TItem="TItem"
57-
Clicked="async () => await action.Clicked(context!)"
57+
Clicked="async () => await action.Clicked(context.Item!)"
5858
Color="@(action.Color != null ? (Blazorise.Color)action.Color : Blazorise.Color.Primary)"
5959
Icon="@action.Icon"
60-
Visible="@(action.Visible != null ? action.Visible(context!) : true)"
60+
Visible="@(action.Visible != null ? action.Visible(context.Item!) : true)"
6161
Text="@action.Text"
6262
Disabled="@action.Disabled">
6363
</EntityAction>
@@ -73,17 +73,17 @@
7373
{
7474
@if (column.ValueConverter == null)
7575
{
76-
<DataGridColumn TItem="TItem" Field="@column.Data" Width="@column.Width" Caption="@column.Title" Sortable="@column.Sortable" DisplayFormat="@column.DisplayFormat" DisplayFormatProvider="@column.DisplayFormatProvider" Displayable="column.Visible" >
76+
<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" >
7777
<DisplayTemplate>
78-
@RenderCustomTableColumnComponent(column.Component, context!)
78+
@RenderCustomTableColumnComponent(column.Component, context.Item!)
7979
</DisplayTemplate>
8080
</DataGridColumn>
8181
}
8282
else
8383
{
84-
<DataGridColumn TItem="TItem" Field="@column.Data" Width="@column.Width" Caption="@column.Title" Sortable="@column.Sortable" Displayable="column.Visible">
84+
<DataGridColumn TItem="TItem" Field="@column.Data" Width="@Width.Px(column.Width)" Caption="@column.Title" Sortable="@column.Sortable" Displayable="column.Visible">
8585
<DisplayTemplate>
86-
@RenderCustomTableColumnComponent(column.Component, context!)
86+
@RenderCustomTableColumnComponent(column.Component, context.Item!)
8787
</DisplayTemplate>
8888
</DataGridColumn>
8989
}
@@ -96,7 +96,7 @@
9696
{
9797
<DataGridColumn TItem="TItem"
9898
Field="@column.Data"
99-
Width="@column.Width"
99+
Width="@Width.Px(column.Width)"
100100
Caption="@column.Title"
101101
Sortable="@column.Sortable"
102102
DisplayFormat="@column.DisplayFormat"
@@ -107,19 +107,19 @@
107107
{
108108
<DataGridColumn TItem="TItem"
109109
Field="@column.Data"
110-
Width="@column.Width"
110+
Width="@Width.Px(column.Width)"
111111
Caption="@column.Title"
112112
Sortable="@column.Sortable"
113113
Displayable="column.Visible">
114114
<DisplayTemplate>
115-
@((MarkupString)GetConvertedFieldValue(context, column))
115+
@((MarkupString)GetConvertedFieldValue(context.Item, column))
116116
</DisplayTemplate>
117117
</DataGridColumn>
118118
}
119119
}
120120
else
121121
{
122-
<DataGridColumn TItem="TItem" Field="@nameof(IHasExtraProperties.ExtraProperties)" SortField="@column.PropertyName" Width="@column.Width" Caption="@column.Title" Displayable="column.Visible" Sortable="@column.Sortable">
122+
<DataGridColumn TItem="TItem" Field="@nameof(IHasExtraProperties.ExtraProperties)" SortField="@column.PropertyName" Width="@Width.Px(column.Width)" Caption="@column.Title" Displayable="column.Visible" Sortable="@column.Sortable">
123123
<DisplayTemplate>
124124
@{
125125
var entity = context as IHasExtraProperties;
@@ -140,7 +140,7 @@
140140
{
141141
if (column.ValueConverter != null)
142142
{
143-
@((MarkupString)GetConvertedFieldValue(context, column))
143+
@((MarkupString)GetConvertedFieldValue(context.Item, column))
144144
}
145145
else
146146
{

‎framework/src/Volo.Abp.BlazoriseUI/Components/DataGridEntityActionsColumn.razor.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System.Linq;
22
using System.Threading.Tasks;
3+
using Blazorise;
34
using Blazorise.DataGrid;
45
using Localization.Resources.AbpUi;
56
using Microsoft.AspNetCore.Components;
@@ -21,13 +22,13 @@ protected override async Task OnInitializedAsync()
2122
protected virtual ValueTask SetDefaultValuesAsync()
2223
{
2324
Caption = UiLocalizer["Actions"];
24-
Width = "150px";
25+
Width = Blazorise.Width.Px(150);
2526
Sortable = false;
2627
Field = ResolveFieldName();
27-
28+
2829
return ValueTask.CompletedTask;
2930
}
30-
31+
3132
protected virtual string ResolveFieldName()
3233
{
3334
var props = typeof(TItem).GetProperties();

‎framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/CheckExtensionProperty.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
{
88
<Validation Validator="@Validate" MessageLocalizer="@LH.Localize">
99
<Field>
10-
<Check TValue="bool" @bind-Checked="@Value" Disabled="IsReadonlyField">
10+
<Check TValue="bool" @bind-Value="@Value" Disabled="IsReadonlyField">
1111
<ChildContent>
1212
@PropertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)
1313
</ChildContent>

‎framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/DateTimeExtensionProperty.razor‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
<Validation Validator="@Validate" MessageLocalizer="@LH.Localize">
1111
<Field>
1212
<FieldLabel>@PropertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)</FieldLabel>
13-
<DateEdit TValue="DateTime?"
13+
<DateInput TValue="DateTime?"
1414
InputMode="@(PropertyInfo.IsDate() ? DateInputMode.Date : DateInputMode.DateTime)"
1515
Pattern="@PropertyInfo.GetDateEditInputFormatOrNull()"
1616
Disabled="IsReadonlyField"
17-
@bind-Date="@Value">
17+
@bind-Value="@Value">
1818
<Feedback>
1919
<ValidationError/>
2020
</Feedback>
21-
</DateEdit>
21+
</DateInput>
2222
</Field>
2323
</Validation>
2424
}

‎framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/LookupExtensionProperty.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
SelectedValueChanged="@SelectedValueChanged"
1616
SearchChanged="@SearchFilterChangedAsync"
1717
Validator="@Validate"
18-
MinLength="0"
18+
MinSearchLength="0"
1919
Disabled="IsReadonlyField">
2020
</Autocomplete>
2121
</Field>

‎framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/SelectExtensionProperty.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<Validation Validator="@Validate" MessageLocalizer="@LH.Localize">
77
<Field>
88
<FieldLabel>@PropertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)</FieldLabel>
9-
<Select @bind-SelectedValue="@SelectedValue">
9+
<Select @bind-Value="@SelectedValue">
1010
<ChildContent>
1111
@foreach (var item in SelectItems)
1212
{

‎framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/TextAreaExtensionProperty.razor‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@typeparam TEntity
1+
@typeparam TEntity
22
@typeparam TResourceType
33
@using Volo.Abp.BlazoriseUI
44
@using Volo.Abp.Localization
@@ -9,11 +9,11 @@
99
<Validation Validator="@Validate" MessageLocalizer="@LH.Localize">
1010
<Field>
1111
<FieldLabel>@PropertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)</FieldLabel>
12-
<MemoEdit @bind-Text="@Value" AutoSize Disabled="IsReadonlyField">
12+
<MemoInput @bind-Value="@Value" AutoSize Disabled="IsReadonlyField">
1313
<Feedback>
1414
<ValidationError/>
1515
</Feedback>
16-
</MemoEdit>
16+
</MemoInput>
1717
</Field>
1818
</Validation>
1919
}

‎framework/src/Volo.Abp.BlazoriseUI/Components/ObjectExtending/TextExtensionProperty.razor‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
<Validation Validator="@Validate" MessageLocalizer="@LH.Localize">
1010
<Field>
1111
<FieldLabel>@PropertyInfo.GetLocalizedDisplayName(StringLocalizerFactory)</FieldLabel>
12-
<TextEdit @bind-Text="@Value" Role="@PropertyInfo.GetTextRole()" InputMode="@PropertyInfo.GetTextInputMode()" Disabled="IsReadonlyField">
12+
<TextInput @bind-Value="@Value" Role="@PropertyInfo.GetTextRole()" InputMode="@PropertyInfo.GetTextInputMode()" Disabled="IsReadonlyField">
1313
<Feedback>
1414
<ValidationError/>
1515
</Feedback>
16-
</TextEdit>
16+
</TextInput>
1717
</Field>
1818
</Validation>
1919
}

0 commit comments

Comments
 (0)