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
6 changes: 4 additions & 2 deletions src/BootstrapBlazor/Components/Layout/Layout.razor
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
}
else
{
<ErrorLogger EnableErrorLogger="@EnableErrorLogger" ShowToast="@ShowErrorLoggerToast" ToastTitle="@ErrorLoggerToastTitle"
<ErrorLogger EnableErrorLogger="@_enableErrorLogger" ShowToast="@_showToast" ToastTitle="@ErrorLoggerToastTitle"
OnErrorHandleAsync="OnErrorHandleAsync" OnInitializedCallback="OnErrorLoggerInitialized">
@HandlerMain()
</ErrorLogger>
Expand All @@ -147,7 +147,9 @@
RefreshToolbarButtonIcon="@RefreshToolbarButtonIcon" FullscreenToolbarButtonIcon="@FullscreenToolbarButtonIcon"
RefreshToolbarTooltipText="@RefreshToolbarTooltipText" FullscreenToolbarTooltipText="@FullscreenToolbarTooltipText"
OnToolbarRefreshCallback="OnToolbarRefreshCallback" TabHeader="TabHeader"
Body="@Main" NotAuthorized="NotAuthorized!" NotFound="NotFound!" NotFoundTabText="@NotFoundTabText">
Body="@Main" NotAuthorized="NotAuthorized!" NotFound="NotFound!" NotFoundTabText="@NotFoundTabText"
EnableErrorLogger="EnableErrorLogger" ShowErrorLoggerToast="ShowErrorLoggerToast"
ErrorLoggerToastTitle="@ErrorLoggerToastTitle">
</Tab>;

RenderFragment RenderFooter =>
Expand Down
8 changes: 8 additions & 0 deletions src/BootstrapBlazor/Components/Layout/Layout.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -490,11 +490,19 @@ public partial class Layout : IHandlerException, ITabHeader
[NotNull]
private IStringLocalizer<Layout>? Localizer { get; set; }

[Inject]
[NotNull]
private IOptionsMonitor<BootstrapBlazorOptions>? Options { get; set; }

private bool _init;
private LayoutHeader? _layoutHeader = null;

private ITabHeader? TabHeader => ShowTabInHeader ? this : null;

private bool _enableErrorLogger => EnableErrorLogger ?? Options.CurrentValue.EnableErrorLogger;

private bool _showToast => ShowErrorLoggerToast ?? Options.CurrentValue.ShowErrorLoggerToast;

/// <summary>
/// <inheritdoc/>
/// </summary>
Expand Down
18 changes: 18 additions & 0 deletions src/BootstrapBlazor/Components/Tab/Tab.razor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -431,6 +431,24 @@ public partial class Tab
[Parameter]
public ITabHeader? TabHeader { get; set; }

/// <summary>
/// 获得/设置 是否开启全局异常捕获 默认 null 读取配置文件 EnableErrorLogger 值
/// </summary>
[Parameter]
public bool? EnableErrorLogger { get; set; }

/// <summary>
/// 获得/设置 是否显示 Error 提示弹窗 默认 null 使用 <see cref="BootstrapBlazorOptions.ShowErrorLoggerToast"/> 设置值
/// </summary>
[Parameter]
public bool? ShowErrorLoggerToast { get; set; }

/// <summary>
/// 获得/设置 错误日志 <see cref="Toast"/> 弹窗标题 默认 null
/// </summary>
[Parameter]
public string? ErrorLoggerToastTitle { get; set; }

[CascadingParameter]
private Layout? Layout { get; set; }

Expand Down
11 changes: 6 additions & 5 deletions src/BootstrapBlazor/Components/Tab/TabItemContent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@

namespace BootstrapBlazor.Components;

internal class TabItemContent : IComponent
class TabItemContent : IComponent
{
/// <summary>
/// Gets or sets the component content. Default is null
/// </summary>
[Parameter, NotNull]
public TabItem? Item { get; set; }

[CascadingParameter]
private Layout? Layout { get; set; }
[CascadingParameter, NotNull]
private Tab? TabSet { get; set; }

private RenderHandle _renderHandle;

Expand Down Expand Up @@ -55,10 +55,11 @@ private RenderFragment RenderItemContent(RenderFragment? content) => builder =>
builder.OpenComponent<ErrorLogger>(0);
builder.AddAttribute(1, nameof(ErrorLogger.ChildContent), content);

var enableErrorLogger = Layout?.EnableErrorLogger;
var showToast = Layout?.ShowErrorLoggerToast;
var enableErrorLogger = TabSet.EnableErrorLogger;
var showToast = TabSet.ShowErrorLoggerToast;
builder.AddAttribute(2, nameof(ErrorLogger.EnableErrorLogger), enableErrorLogger);
builder.AddAttribute(3, nameof(ErrorLogger.ShowToast), showToast);
builder.AddAttribute(4, nameof(ErrorLogger.ToastTitle), TabSet.ErrorLoggerToastTitle);
builder.CloseComponent();
};

Expand Down