Skip to content

Commit 55412a9

Browse files
ArgoZhangArgoZhang
authored
Merge branch 'main' into fix-json-string-localizer
2 parents e3d3c75 + 4b33dae commit 55412a9

File tree

13 files changed

+67
-67
lines changed

13 files changed

+67
-67
lines changed

‎src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -21,52 +21,52 @@
2121
</ItemGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="BootstrapBlazor.AntDesignIcon" Version="9.0.0-beta*" />
25-
<PackageReference Include="BootstrapBlazor.AzureOpenAI" Version="9.0.0-beta*" />
26-
<PackageReference Include="BootstrapBlazor.AzureTranslator" Version="9.0.0-beta*" />
27-
<PackageReference Include="BootstrapBlazor.BaiduSpeech" Version="9.0.0-beta*" />
28-
<PackageReference Include="BootstrapBlazor.BaiduOcr" Version="9.0.0-beta*" />
29-
<PackageReference Include="BootstrapBlazor.BarCode" Version="9.0.0-beta*" />
30-
<PackageReference Include="BootstrapBlazor.BarcodeGenerator" Version="9.0.0-beta*" />
31-
<PackageReference Include="BootstrapBlazor.BootstrapIcon" Version="9.0.0-beta*" />
32-
<PackageReference Include="BootstrapBlazor.BootstrapIcon.Extensions" Version="9.0.0-beta*" />
33-
<PackageReference Include="BootstrapBlazor.Chart" Version="9.0.0-beta*" />
34-
<PackageReference Include="BootstrapBlazor.CherryMarkdown" Version="9.0.0-beta*" />
35-
<PackageReference Include="BootstrapBlazor.CodeEditor" Version="9.0.0-beta*" />
36-
<PackageReference Include="BootstrapBlazor.Dock" Version="9.0.0-beta*" />
37-
<PackageReference Include="BootstrapBlazor.DockView" Version="9.0.0-beta*" />
38-
<PackageReference Include="BootstrapBlazor.DriverJs" Version="9.0.0-beta*" />
39-
<PackageReference Include="BootstrapBlazor.ElementIcon" Version="9.0.0-beta*" />
40-
<PackageReference Include="BootstrapBlazor.FileViewer" Version="9.0.0-beta*" />
41-
<PackageReference Include="BootstrapBlazor.FontAwesome" Version="9.0.0-beta*" />
42-
<PackageReference Include="BootstrapBlazor.Gantt" Version="9.0.0-beta*" />
43-
<PackageReference Include="BootstrapBlazor.Holiday" Version="9.0.0-beta*" />
44-
<PackageReference Include="BootstrapBlazor.Html2Pdf" Version="9.0.0-beta*" />
45-
<PackageReference Include="BootstrapBlazor.IconPark" Version="9.0.0-beta*" />
46-
<PackageReference Include="BootstrapBlazor.ImageCropper" Version="9.0.0-beta*" />
47-
<PackageReference Include="BootstrapBlazor.Live2DDisplay" Version="9.0.0-beta*" />
48-
<PackageReference Include="BootstrapBlazor.Markdown" Version="9.0.0-beta*" />
49-
<PackageReference Include="BootstrapBlazor.MaterialDesign" Version="9.0.0-beta*" />
50-
<PackageReference Include="BootstrapBlazor.MaterialDesign.Extensions" Version="9.0.0-beta*" />
24+
<PackageReference Include="BootstrapBlazor.AntDesignIcon" Version="9.0.0" />
25+
<PackageReference Include="BootstrapBlazor.AzureOpenAI" Version="9.0.0" />
26+
<PackageReference Include="BootstrapBlazor.AzureTranslator" Version="9.0.0" />
27+
<PackageReference Include="BootstrapBlazor.BaiduSpeech" Version="9.0.0" />
28+
<PackageReference Include="BootstrapBlazor.BaiduOcr" Version="9.0.0" />
29+
<PackageReference Include="BootstrapBlazor.BarCode" Version="9.0.0" />
30+
<PackageReference Include="BootstrapBlazor.BarcodeGenerator" Version="9.0.0" />
31+
<PackageReference Include="BootstrapBlazor.BootstrapIcon" Version="9.0.0" />
32+
<PackageReference Include="BootstrapBlazor.BootstrapIcon.Extensions" Version="9.0.0" />
33+
<PackageReference Include="BootstrapBlazor.Chart" Version="9.0.0" />
34+
<PackageReference Include="BootstrapBlazor.CherryMarkdown" Version="9.0.0" />
35+
<PackageReference Include="BootstrapBlazor.CodeEditor" Version="9.0.0" />
36+
<PackageReference Include="BootstrapBlazor.Dock" Version="9.0.0" />
37+
<PackageReference Include="BootstrapBlazor.DockView" Version="9.0.0" />
38+
<PackageReference Include="BootstrapBlazor.DriverJs" Version="9.0.0" />
39+
<PackageReference Include="BootstrapBlazor.ElementIcon" Version="9.0.0" />
40+
<PackageReference Include="BootstrapBlazor.FileViewer" Version="9.0.0" />
41+
<PackageReference Include="BootstrapBlazor.FontAwesome" Version="9.0.0" />
42+
<PackageReference Include="BootstrapBlazor.Gantt" Version="9.0.0" />
43+
<PackageReference Include="BootstrapBlazor.Holiday" Version="9.0.0" />
44+
<PackageReference Include="BootstrapBlazor.Html2Pdf" Version="9.0.0" />
45+
<PackageReference Include="BootstrapBlazor.IconPark" Version="9.0.0" />
46+
<PackageReference Include="BootstrapBlazor.ImageCropper" Version="9.0.0" />
47+
<PackageReference Include="BootstrapBlazor.Live2DDisplay" Version="9.0.0" />
48+
<PackageReference Include="BootstrapBlazor.Markdown" Version="9.0.0" />
49+
<PackageReference Include="BootstrapBlazor.MaterialDesign" Version="9.0.0" />
50+
<PackageReference Include="BootstrapBlazor.MaterialDesign.Extensions" Version="9.0.0" />
5151
<PackageReference Include="BootstrapBlazor.MeiliSearch" Version="9.0.0-beta*" />
52-
<PackageReference Include="BootstrapBlazor.Middleware" Version="9.0.0-beta*" />
53-
<PackageReference Include="BootstrapBlazor.MindMap" Version="9.0.0-beta*" />
54-
<PackageReference Include="BootstrapBlazor.MouseFollower" Version="9.0.0-beta*" />
55-
<PackageReference Include="BootstrapBlazor.OnScreenKeyboard" Version="9.0.0-beta*" />
56-
<PackageReference Include="BootstrapBlazor.PdfReader" Version="9.0.0-beta*" />
57-
<PackageReference Include="BootstrapBlazor.Player" Version="9.0.0-beta*" />
58-
<PackageReference Include="BootstrapBlazor.SignaturePad" Version="9.0.0-beta*" />
59-
<PackageReference Include="BootstrapBlazor.Sortable" Version="9.0.0-beta*" />
60-
<PackageReference Include="BootstrapBlazor.Splitting" Version="9.0.0-beta*" />
61-
<PackageReference Include="BootstrapBlazor.SvgEditor" Version="9.0.0-beta*" />
62-
<PackageReference Include="BootstrapBlazor.SummerNote" Version="9.0.0-beta*" />
63-
<PackageReference Include="BootstrapBlazor.TableExport" Version="9.0.0-beta*" />
64-
<PackageReference Include="BootstrapBlazor.TagHelper" Version="9.0.0-beta*" />
65-
<PackageReference Include="BootstrapBlazor.Topology" Version="9.0.0-beta*" />
66-
<PackageReference Include="BootstrapBlazor.VideoPlayer" Version="9.0.0-beta*" />
67-
<PackageReference Include="BootstrapBlazor.WinBox" Version="9.0.0-beta*" />
68-
<PackageReference Include="Longbow.Logging" Version="9.0.0-beta*" />
69-
<PackageReference Include="Longbow.Tasks" Version="9.0.0-beta*" />
52+
<PackageReference Include="BootstrapBlazor.Middleware" Version="9.0.0" />
53+
<PackageReference Include="BootstrapBlazor.MindMap" Version="9.0.0" />
54+
<PackageReference Include="BootstrapBlazor.MouseFollower" Version="9.0.0" />
55+
<PackageReference Include="BootstrapBlazor.OnScreenKeyboard" Version="9.0.0" />
56+
<PackageReference Include="BootstrapBlazor.PdfReader" Version="9.0.0" />
57+
<PackageReference Include="BootstrapBlazor.Player" Version="9.0.0" />
58+
<PackageReference Include="BootstrapBlazor.SignaturePad" Version="9.0.0" />
59+
<PackageReference Include="BootstrapBlazor.Sortable" Version="9.0.0" />
60+
<PackageReference Include="BootstrapBlazor.Splitting" Version="9.0.0" />
61+
<PackageReference Include="BootstrapBlazor.SvgEditor" Version="9.0.0" />
62+
<PackageReference Include="BootstrapBlazor.SummerNote" Version="9.0.0" />
63+
<PackageReference Include="BootstrapBlazor.TableExport" Version="9.0.0" />
64+
<PackageReference Include="BootstrapBlazor.TagHelper" Version="9.0.0" />
65+
<PackageReference Include="BootstrapBlazor.Topology" Version="9.0.0" />
66+
<PackageReference Include="BootstrapBlazor.VideoPlayer" Version="9.0.0" />
67+
<PackageReference Include="BootstrapBlazor.WinBox" Version="9.0.0" />
68+
<PackageReference Include="Longbow.Logging" Version="9.0.0" />
69+
<PackageReference Include="Longbow.Tasks" Version="9.0.0" />
7070
</ItemGroup>
7171

7272
<ItemGroup>

‎src/BootstrapBlazor/BootstrapBlazor.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
22

33
<PropertyGroup>
4-
<Version>9.0.0-rc.2.11.11.0</Version>
4+
<Version>9.0.0</Version>
55
</PropertyGroup>
66

77
<ItemGroup>

‎src/BootstrapBlazor/Components/Checkbox/CheckboxList.razor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ private async Task<bool> OnBeforeStateChanged(CheckboxState state)
188188
/// </summary>
189189
/// <param name="value"></param>
190190
/// <returns></returns>
191-
protected override string? FormatValueAsString(TValue value)
191+
protected override string? FormatValueAsString(TValue? value)
192192
{
193193
string? ret = null;
194194
if (ValueType == typeof(string))

‎src/BootstrapBlazor/Components/DateTimePicker/DateTimePicker.razor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ protected override async Task OnParametersSetAsync()
355355
/// <summary>
356356
/// 格式化数值方法
357357
/// </summary>
358-
protected override string FormatValueAsString(TValue value)
358+
protected override string FormatValueAsString(TValue? value)
359359
{
360360
var ret = "";
361361
DateTime? d = value switch

‎src/BootstrapBlazor/Components/Display/DisplayBase.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ public abstract class DisplayBase<TValue> : BootstrapModuleComponentBase
4848
/// Gets or sets a callback that updates the bound value.
4949
/// </summary>
5050
[Parameter]
51-
public EventCallback<TValue> ValueChanged { get; set; }
51+
public EventCallback<TValue?> ValueChanged { get; set; }
5252

5353
/// <summary>
5454
/// Gets or sets an expression that identifies the bound value.
5555
/// </summary>
5656
[Parameter]
57-
public Expression<Func<TValue>>? ValueExpression { get; set; }
57+
public Expression<Func<TValue?>>? ValueExpression { get; set; }
5858

5959
/// <summary>
6060
/// 获得/设置 是否显示前置标签 默认值为 null 为空时默认不显示标签
@@ -164,7 +164,7 @@ protected override void OnParametersSet()
164164
/// </summary>
165165
/// <param name="value">The value to format.</param>
166166
/// <returns>A string representation of the value.</returns>
167-
protected virtual string? FormatValueAsString(TValue value)
167+
protected virtual string? FormatValueAsString(TValue? value)
168168
{
169169
string? ret;
170170
if (value is SelectedItem item)

‎src/BootstrapBlazor/Components/Input/BootstrapInputBase.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public abstract class BootstrapInputBase<TValue> : ValidateBase<TValue>
5252
/// 获得/设置 格式化字符串
5353
/// </summary>
5454
[Parameter]
55-
public Func<TValue, string>? Formatter { get; set; }
55+
public Func<TValue?, string>? Formatter { get; set; }
5656

5757
/// <summary>
5858
/// 获得/设置 格式化字符串 如时间类型设置 yyyy-MM-dd
@@ -182,7 +182,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
182182
/// </summary>
183183
/// <param name="value"></param>
184184
/// <returns></returns>
185-
protected override string? FormatValueAsString(TValue value) => Formatter != null
185+
protected override string? FormatValueAsString(TValue? value) => Formatter != null
186186
? Formatter.Invoke(value)
187187
: (!string.IsNullOrEmpty(FormatString) && value != null
188188
? Utility.Format(value, FormatString)

‎src/BootstrapBlazor/Components/InputNumber/BootstrapInputNumber.razor.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ public partial class BootstrapInputNumber<TValue>
3939
/// 获得/设置 数值增加时回调委托
4040
/// </summary>
4141
[Parameter]
42-
public Func<TValue, Task>? OnIncrement { get; set; }
42+
public Func<TValue?, Task>? OnIncrement { get; set; }
4343

4444
/// <summary>
4545
/// 获得/设置 数值减少时回调委托
4646
/// </summary>
4747
[Parameter]
48-
public Func<TValue, Task>? OnDecrement { get; set; }
48+
public Func<TValue?, Task>? OnDecrement { get; set; }
4949

5050
/// <summary>
5151
/// 获得/设置 最小值
@@ -161,9 +161,9 @@ protected override void OnAfterRender(bool firstRender)
161161
/// </summary>
162162
/// <param name="value">The value to format.</param>
163163
/// <returns>A string representation of the value.</returns>
164-
protected override string? FormatValueAsString(TValue value) => UseInputEvent ? _lastInputValueString : GetFormatString(value);
164+
protected override string? FormatValueAsString(TValue? value) => UseInputEvent ? _lastInputValueString : GetFormatString(value);
165165

166-
private string? GetFormatString(TValue value) => Formatter != null
166+
private string? GetFormatString(TValue? value) => Formatter != null
167167
? Formatter.Invoke(value)
168168
: (!string.IsNullOrEmpty(FormatString) && value != null
169169
? Utility.Format(value, FormatString)
@@ -175,7 +175,7 @@ protected override void OnAfterRender(bool firstRender)
175175
/// <param name="value"></param>
176176
/// <returns></returns>
177177
/// <exception cref="InvalidOperationException"></exception>
178-
protected virtual string? InternalFormat(TValue value) => value switch
178+
protected virtual string? InternalFormat(TValue? value) => value switch
179179
{
180180
null => null,
181181
int @int => BindConverter.FormatValue(@int, CultureInfo.InvariantCulture),
@@ -288,7 +288,7 @@ protected override async Task OnBlur()
288288
}
289289
}
290290

291-
private TValue SetMin(TValue val)
291+
private TValue? SetMin(TValue? val)
292292
{
293293
if (!string.IsNullOrEmpty(Min))
294294
{
@@ -317,7 +317,7 @@ private TValue SetMin(TValue val)
317317
return val;
318318
}
319319

320-
private TValue SetMax(TValue val)
320+
private TValue? SetMax(TValue? val)
321321
{
322322
if (!string.IsNullOrEmpty(Max))
323323
{

‎src/BootstrapBlazor/Components/Radio/RadioList.razor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ protected override void OnParametersSet()
8181
/// </summary>
8282
/// <param name="value"></param>
8383
/// <returns></returns>
84-
protected override string? FormatValueAsString(TValue value) => value is SelectedItem v ? v.Value : value?.ToString();
84+
protected override string? FormatValueAsString(TValue? value) => value is SelectedItem v ? v.Value : value?.ToString();
8585

8686
/// <summary>
8787
/// <inheritdoc/>

‎src/BootstrapBlazor/Components/Select/MultiSelect.razor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ protected override void OnAfterRender(bool firstRender)
211211
/// </summary>
212212
/// <param name="value"></param>
213213
/// <returns></returns>
214-
protected override string? FormatValueAsString(TValue value) => value == null
214+
protected override string? FormatValueAsString(TValue? value) => value == null
215215
? null
216216
: Utility.ConvertValueToString(value);
217217

‎src/BootstrapBlazor/Components/Transfer/Transfer.razor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ protected override bool TryParseValueFromString(string value, out TValue result,
364364
/// </summary>
365365
/// <param name="value"></param>
366366
/// <returns></returns>
367-
protected override string? FormatValueAsString(TValue value) => value == null
367+
protected override string? FormatValueAsString(TValue? value) => value == null
368368
? null
369369
: Utility.ConvertValueToString(value);
370370

0 commit comments

Comments
 (0)