diff --git a/BootstrapAdmin-Blazor.slnf b/BootstrapAdmin-Blazor.slnf index 3f60c404..57d683ee 100644 --- a/BootstrapAdmin-Blazor.slnf +++ b/BootstrapAdmin-Blazor.slnf @@ -2,13 +2,18 @@ "solution": { "path": "BootstrapAdmin.sln", "projects": [ + "src\\blazor\\admin\\BootstrapAdmin.Caching\\BootstrapAdmin.Caching.csproj", "src\\blazor\\admin\\BootstrapAdmin.DataAccess.Models\\BootstrapAdmin.DataAccess.Models.csproj", "src\\blazor\\admin\\BootstrapAdmin.DataAccess.PetaPoco\\BootstrapAdmin.DataAccess.PetaPoco.csproj", "src\\blazor\\admin\\BootstrapAdmin.Web.Core\\BootstrapAdmin.Web.Core.csproj", "src\\blazor\\admin\\BootstrapAdmin.Web\\BootstrapAdmin.Web.csproj", - "src\\blazor\\client\\BootstrapClient.DataAccess\\BootstrapClient.Web.DataAccess.csproj", + "src\\blazor\\client\\BootstrapClient.DataAccess\\BootstrapClient.DataAccess.PetaPoco.csproj", "src\\blazor\\client\\BootstrapClient.Shared\\BootstrapClient.Web.Shared.csproj", + "src\\blazor\\client\\BootstrapClient.Web.Core\\BootstrapClient.Web.Core.csproj", + "src\\blazor\\client\\BootstrapClient.Web.Models\\BootstrapClient.DataAccess.Models.csproj", "src\\blazor\\client\\BootstrapClient.Web\\BootstrapClient.Web.csproj", + "src\\mvc\\admin\\Bootstrap.Admin\\Bootstrap.Admin.csproj", + "src\\mvc\\admin\\Bootstrap.DataAccess\\Bootstrap.DataAccess.csproj", "test\\UnitTest\\UnitTest.csproj" ] } diff --git a/src/blazor/admin/BootstrapAdmin.Web/BootstrapAdmin.db b/src/blazor/admin/BootstrapAdmin.Web/BootstrapAdmin.db index a3aede92..71c4a65b 100644 Binary files a/src/blazor/admin/BootstrapAdmin.Web/BootstrapAdmin.db and b/src/blazor/admin/BootstrapAdmin.Web/BootstrapAdmin.db differ diff --git a/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Healths.razor.cs b/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Healths.razor.cs index d518ae03..7064beb6 100644 --- a/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Healths.razor.cs +++ b/src/blazor/admin/BootstrapAdmin.Web/Pages/Admin/Healths.razor.cs @@ -71,6 +71,7 @@ public partial class Healths private async Task OnCheck() { IsRunning = true; + Duration = TimeSpan.Zero; StateHasChanged(); await HealthTable.ToggleLoading(true); await HealthTable.QueryAsync(); @@ -86,14 +87,14 @@ public partial class Healths _ => "不健康" }; - private Color GetTagColor(HealthStatus? status = null) => (status ?? Status) switch + private Color GetTagColor(HealthStatus? status = null) => IsRunning ? Color.Success : (status ?? Status) switch { HealthStatus.Healthy => Color.Success, HealthStatus.Degraded => Color.Warning, _ => Color.Danger }; - private string? GetTagIcon(HealthStatus? status = null) => (status ?? Status) switch + private string? GetTagIcon(HealthStatus? status = null) => IsRunning ? "fa fa-fw fa-spin fa-spinner" : (status ?? Status) switch { HealthStatus.Healthy => "fa fa-check-circle", HealthStatus.Degraded => "fa fa-exclamation-circle",