g82tt/KinginfoGateway
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 日志组件添加等级筛选

Browse Source
This commit is contained in:
Diego
2024-08-27 14:24:26 +08:00
parent 01e98ff10c
commit e9b943363d
5 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ThingsGateway.Gateway.Razor/Pages/Runtime/DeviceStatus/DeviceStatus.razor
View File

@@ -43,7 +43,7 @@
@if (_driverBaseItem != null && _driverBaseItem?.CurrentDevice != null && _driverBaseItem.CurrentDevice.Channel.LogEnable == true)
{
<LogConsole LogPath=@_driverBaseItem.LogPath HeaderText="@Localizer["LogConsole"]" HeightText="var(--logconsle-height)"></LogConsole>
<LogConsole Logger=@_driverBaseItem.LogMessage LogPath=@_driverBaseItem.LogPath HeaderText="@Localizer["LogConsole"]" HeightText="var(--logconsle-height)"></LogConsole>
}

4
src/tools/ThingsGateway.Foundation.Razor/DebugPages/AdapterDebugBase.cs
View File

@@ -75,7 +75,7 @@ public abstract class AdapterDebugBase : ComponentBase, IDisposable
var data = await Plc.ReadAsync(RegisterAddress, ArrayLength, DataType);
if (data.IsSuccess)
{
Plc.Logger?.Debug(data.Content.ToJsonNetString());
Plc.Logger?.LogInformation(data.Content.ToJsonNetString());
}
else
{
@@ -99,7 +99,7 @@ public abstract class AdapterDebugBase : ComponentBase, IDisposable
var data = await Plc.WriteAsync(RegisterAddress, WriteValue.GetJTokenFromString(), DataType);
if (data.IsSuccess)
{
Plc.Logger?.Debug($" {WriteValue.GetJTokenFromString()} {Localizer["WriteSuccess"]}");
Plc.Logger?.LogInformation($" {WriteValue.GetJTokenFromString()} {Localizer["WriteSuccess"]}");
}
else
{

5
src/tools/ThingsGateway.Foundation.Razor/DebugPages/AdapterDebugComponent.razor
View File

@@ -106,7 +106,10 @@
</div>
<div class="col-12 col-md-7 ">
<LogConsole LogPath=@LogPath HeaderText=@HeaderText></LogConsole>
@if (Plc!=null)
{
<LogConsole Logger=@Plc.Logger LogPath=@LogPath HeaderText=@HeaderText></LogConsole>
}
</div>
</div>

4
src/tools/ThingsGateway.Foundation.Razor/DebugPages/LogConsole.razor
View File

@@ -10,6 +10,10 @@
<HeaderTemplate>
<div class="flex-fill">
</div>
@if (Logger!=null)
{
<Select @bind-Value="@Logger.LogLevel" IsPopover></Select>
}
<Button Color="Color.None" style="color: var(--bs-card-title-color);" Icon=@(IsPause?"fa fa-play":"fa fa-pause") OnClick="Pause" />
<Button IsAsync Color="Color.None" style="color: var(--bs-card-title-color);" Icon=@("fa fa-sign-out") OnClick="HandleOnExportClick" />
<Button IsAsync Color="Color.None" style="color: var(--bs-card-title-color);" Icon=@("far fa-trash-alt") OnClick="Delete" />

8
src/tools/ThingsGateway.Foundation.Razor/DebugPages/LogConsole.razor.cs
View File

@@ -18,9 +18,10 @@ using System.Text.RegularExpressions;
using ThingsGateway.Core.Extension;
using ThingsGateway.Foundation;
using ThingsGateway.NewLife.X.Extension;
using ThingsGateway.Razor;
using TouchSocket.Core;
namespace ThingsGateway.Debug;
public partial class LogConsole : IDisposable
@@ -29,6 +30,9 @@ public partial class LogConsole : IDisposable
public bool Disposed { get; set; }
[Parameter, EditorRequired]
public ILog Logger { get; set; }
[Parameter]
public string HeaderText { get; set; } = "Log";
@@ -85,7 +89,7 @@ public partial class LogConsole : IDisposable
var result = TextFileReader.LastLog(files.FirstOrDefault().FullName, 0);
if (result.IsSuccess)
{
Messages = result.Content.Select(a => new LogMessage((int)a.LogLevel, $"{a.LogTime} - {a.Message}{(a.ExceptionString.IsNullOrWhiteSpace() ? null : $"{Environment.NewLine}{a.ExceptionString}")}")).ToList();
Messages = result.Content.Where(a => a.LogLevel >= Logger?.LogLevel).Select(a => new LogMessage((int)a.LogLevel, $"{a.LogTime} - {a.Message}{(a.ExceptionString.IsNullOrWhiteSpace() ? null : $"{Environment.NewLine}{a.ExceptionString}")}")).ToList();
}
else
{