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
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
</div>
<div class="footer-info">
<div class="d-flex">
<div>Powered by .NET @Version on @OS</div>
<div>SDK .NET @Version on @OS</div>
<div class="ms-1">BB @VersionService.Version</div>
<FooterCounter></FooterCounter>
<CacheCounter></CacheCounter>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
@GetKey(v.Row)
</Template>
</TableTemplateColumn>
<TableTemplateColumn Text="@Localizer["CacheListValue"]" TextWrap="true" Width="220">
<TableTemplateColumn Text="@Localizer["CacheListValue"]" TextWrap="true" Width="220" CssClass="table-cache-value scroll">
<Template Context="v">
@GetValue(v.Row)
</Template>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
.table-cache-list {
height: calc(100vh - 180px);
}

::deep .table-cache-value {
max-height: 80px;
overflow: auto;
align-items: flex-start;
}
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,9 @@ private async Task DownloadFolderAsync()
{
await DownloadService.DownloadFolderAsync("test.zip", WebsiteOption.CurrentValue.WebRootPath);
}
catch (FileNotFoundException msg)
catch (Exception ex)
{

await ToastService.Error("下载", msg.Message);
await ToastService.Error("下载", ex.Message);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@
OS: Microsoft Windows 10.0.17763
OSArchitecture: X64
ProcessArchitecture: X64
Framework: .NET 5.0.9
Framework: .NET 9.0.0
UserName: Argo
EnvironmentName: Development
IISRootPath: D:\Argo\src\BB\BootstrapBlazor\src\BootstrapBlazor.Server\
VSIDE: Microsoft Visual Studio Enterprise 2019 16.0
Exception:: Attempted to divide by zero.
*********************************************
System.DivideByZeroException: Attempted to divide by zero.
at BootstrapBlazor.Server.Components.Samples.GlobalException.OnClick() in D:\Argo\src\BB\BootstrapBlazor\src\BootstrapBlazor.Server\Components\Samples\GlobalException.razor.cs:line 30</Pre>
at BootstrapBlazor.Server.Components.Samples.GlobalException.OnClick() in D:\Argo\src\BB\BootstrapBlazor\src\BootstrapBlazor.Server\Components\Samples\GlobalException.razor.cs:line 24</Pre>

<p>@((MarkupString)Localizer["Step5"].Value)</p>

Expand Down
4 changes: 2 additions & 2 deletions src/BootstrapBlazor/Utils/Utility.cs
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ public static void CreateDisplayByFieldType(this RenderTreeBuilder builder, IEdi
{
var fieldType = item.PropertyType;
var fieldName = item.GetFieldName();
var displayName = item.GetDisplayName() ?? GetDisplayName(model, fieldName);
var displayName = item.GetDisplayName();
var fieldValue = GenerateValue(model, fieldName);
var type = (Nullable.GetUnderlyingType(fieldType) ?? fieldType);
if (type == typeof(bool) || fieldValue?.GetType() == typeof(bool))
Expand Down Expand Up @@ -474,7 +474,7 @@ public static void CreateComponentByFieldType(this RenderTreeBuilder builder, Co
{
var fieldType = item.PropertyType;
var fieldName = item.GetFieldName();
var displayName = item.GetDisplayName() ?? GetDisplayName(model, fieldName);
var displayName = item.GetDisplayName();

var fieldValue = GenerateValue(model, fieldName);
var fieldValueChanged = GenerateValueChanged(component, model, fieldName, fieldType);
Expand Down
Loading