Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/BootstrapBlazor/BootstrapBlazor.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<Version>9.2.0-beta01</Version>
<Version>9.2.0-beta02</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions src/BootstrapBlazor/Components/Display/Display.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ private async Task<string> FormatText([DisallowNull] TValue value)

private async Task<string> FormatValueString()
{
string? ret = Value?.ToString() ?? string.Empty;
var ret = Value?.ToString();
var lookup = await GetLookup();
if (lookup != null)
{
Expand All @@ -137,11 +137,11 @@ private async Task<string> FormatValueString()
return ret ?? string.Empty;
}

private Func<TValue, string>? _arrayConvertoString;
private Func<TValue, string>? _arrayConvertToString;
private string ArrayConvertToString(TValue value)
{
_arrayConvertoString ??= LambdaExtensions.ArrayConvertToStringLambda<TValue>(TypeResolver).Compile();
return _arrayConvertoString(value);
_arrayConvertToString ??= LambdaExtensions.ArrayConvertToStringLambda<TValue>(TypeResolver).Compile();
return _arrayConvertToString(value);
}

private static Func<TValue, string>? _enumerableConvertToString;
Expand Down
8 changes: 8 additions & 0 deletions test/UnitTest/Components/DisplayTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,14 @@ public async Task LookupService_Ok()
});
await Task.Delay(20);
Assert.Contains("Test1,Test2", cut.Markup);

cut.SetParametersAndRender(pb =>
{
pb.Add(a => a.LookupServiceKey, null);
pb.Add(a => a.Lookup, new List<SelectedItem> { new("v1", "Test3"), new("v2", "Test4") });
});
await Task.Delay(20);
Assert.Contains("Test3,Test4", cut.Markup);
}

[Fact]
Expand Down
24 changes: 24 additions & 0 deletions test/UnitTest/Components/EditorFormTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -480,6 +480,30 @@ public async Task LookupService_Ok()
Assert.Equal("LookupService-Test-1-async", select.Instance.Items.First().Text);
}

[Fact]
public void Lookup_Ok()
{
var foo = new Foo();
var lookup = new List<SelectedItem>() { new("v1", "test1"), new("v2", "test2") };
var cut = Context.RenderComponent<EditorForm<Foo>>(pb =>
{
pb.Add(a => a.Model, foo);
pb.Add(a => a.AutoGenerateAllItem, false);
pb.Add(a => a.FieldItems, f => builder =>
{
var index = 0;
builder.OpenComponent<EditorItem<Foo, string>>(index++);
builder.AddAttribute(index++, nameof(EditorItem<Foo, string>.Field), f.Name);
builder.AddAttribute(index++, nameof(EditorItem<Foo, string>.FieldExpression), Utility.GenerateValueExpression(foo, nameof(Foo.Name), typeof(string)));
builder.AddAttribute(index++, nameof(EditorItem<Foo, string>.Text), "Test-Text");
builder.AddAttribute(index++, nameof(EditorItem<Foo, string>.Lookup), lookup);
builder.CloseComponent();
});
});
var select = cut.FindComponent<Select<string>>();
Assert.Equal(2, select.Instance.Items.Count());
}

[Theory]
[InlineData(true)]
[InlineData(false)]
Expand Down
Loading