diff --git a/Directory.Packages.props b/Directory.Packages.props
index 036abb4fa..c69c57ffa 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -42,6 +42,7 @@
+
diff --git a/aspnet-core/modules/elsa/LINGYUN.Abp.ElsaNext.Studio.Blazor/AbpElsaNextStudioBlazorModule.cs b/aspnet-core/modules/elsa/LINGYUN.Abp.ElsaNext.Studio.Blazor/AbpElsaNextStudioBlazorModule.cs
index 97afcca36..fc797a596 100644
--- a/aspnet-core/modules/elsa/LINGYUN.Abp.ElsaNext.Studio.Blazor/AbpElsaNextStudioBlazorModule.cs
+++ b/aspnet-core/modules/elsa/LINGYUN.Abp.ElsaNext.Studio.Blazor/AbpElsaNextStudioBlazorModule.cs
@@ -15,6 +15,7 @@ using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor;
using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Routing;
+using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
using Volo.Abp.Localization;
using Volo.Abp.Modularity;
using Volo.Abp.UI.Navigation;
@@ -28,7 +29,8 @@ namespace LINGYUN.Abp.ElsaNext.Studio.Blazor;
typeof(AbpLocalizationModule),
typeof(AbpUiNavigationModule),
typeof(AbpVirtualFileSystemModule),
- typeof(AbpAspNetCoreComponentsWebThemingMudBlazorModule))]
+ typeof(AbpAspNetCoreComponentsWebThemingMudBlazorModule),
+ typeof(AbpAspNetCoreMvcUiBundlingAbstractionsModule))]
public class AbpElsaNextStudioBlazorModule : AbpModule
{
public override void PreConfigureServices(ServiceConfigurationContext context)
diff --git a/aspnet-core/modules/elsa/LINGYUN.Abp.ElsaNext.Studio.Blazor/LINGYUN.Abp.ElsaNext.Studio.Blazor.csproj b/aspnet-core/modules/elsa/LINGYUN.Abp.ElsaNext.Studio.Blazor/LINGYUN.Abp.ElsaNext.Studio.Blazor.csproj
index d5469c201..2e4f70206 100644
--- a/aspnet-core/modules/elsa/LINGYUN.Abp.ElsaNext.Studio.Blazor/LINGYUN.Abp.ElsaNext.Studio.Blazor.csproj
+++ b/aspnet-core/modules/elsa/LINGYUN.Abp.ElsaNext.Studio.Blazor/LINGYUN.Abp.ElsaNext.Studio.Blazor.csproj
@@ -16,6 +16,7 @@
+
diff --git a/aspnet-core/modules/elsa/LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor/AbpElsaNextStudioDiagnosticsStructuredLogsBlazorModule.cs b/aspnet-core/modules/elsa/LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor/AbpElsaNextStudioDiagnosticsStructuredLogsBlazorModule.cs
index 31d7a6b56..9f408df3c 100644
--- a/aspnet-core/modules/elsa/LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor/AbpElsaNextStudioDiagnosticsStructuredLogsBlazorModule.cs
+++ b/aspnet-core/modules/elsa/LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor/AbpElsaNextStudioDiagnosticsStructuredLogsBlazorModule.cs
@@ -4,6 +4,7 @@ using Elsa.Features.Services;
using Elsa.Studio.Diagnostics.StructuredLogs.Dashboard.Extensions;
using Elsa.Studio.Diagnostics.StructuredLogs.Extensions;
using LINGYUN.Abp.ElsaNext.Studio.Blazor;
+using LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor.Bundling;
using LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor.Extensions;
using LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor.Navigation;
using LINGYUN.Abp.ElsaNext.Studio.Translations.Localization;
@@ -11,6 +12,7 @@ using Microsoft.AspNetCore.Routing;
using Microsoft.Extensions.DependencyInjection;
using Volo.Abp.AspNetCore;
using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Routing;
+using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
using Volo.Abp.Localization;
using Volo.Abp.Modularity;
using Volo.Abp.UI.Navigation;
@@ -28,6 +30,7 @@ public class AbpElsaNextStudioDiagnosticsStructuredLogsBlazorModule : AbpModule
PreConfigure(elsa =>
{
elsa.UseStructuredLogs();
+ elsa.UseStructuredLogsDashboard();
});
}
@@ -35,6 +38,16 @@ public class AbpElsaNextStudioDiagnosticsStructuredLogsBlazorModule : AbpModule
{
var configuration = context.Configuration.GetSection("Elsa:Studio");
+ Configure(options =>
+ {
+ options
+ .StyleBundles
+ .Add(typeof(Elsa.Studio.Diagnostics.StructuredLogs.UI.Pages.StructuredLogs).FullName!, bundle =>
+ {
+ bundle.AddContributors(typeof(StructuredLogsStyleContributor));
+ });
+ });
+
Configure(options =>
{
// options.AdditionalAssemblies.Add(typeof(Elsa.Studio.Diagnostics.StructuredLogs.Feature).Assembly);
@@ -50,6 +63,7 @@ public class AbpElsaNextStudioDiagnosticsStructuredLogsBlazorModule : AbpModule
{
options.FileSets.AddEmbedded("LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor");
});
+
Configure(options =>
{
options.Resources
diff --git a/aspnet-core/modules/elsa/LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor/Bundling/StructuredLogsStyleContributor.cs b/aspnet-core/modules/elsa/LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor/Bundling/StructuredLogsStyleContributor.cs
new file mode 100644
index 000000000..4c28bbf33
--- /dev/null
+++ b/aspnet-core/modules/elsa/LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor/Bundling/StructuredLogsStyleContributor.cs
@@ -0,0 +1,12 @@
+using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
+
+namespace LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor.Bundling;
+
+public class StructuredLogsStyleContributor : BundleContributor
+{
+ public override void ConfigureBundle(BundleConfigurationContext context)
+ {
+ context.Files.AddIfNotContains("/_content/Elsa.Studio.Diagnostics.StructuredLogs/structuredLogs.css");
+ context.Files.AddIfNotContains("/_content/LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor/structuredLogs-overrides.css");
+ }
+}
diff --git a/aspnet-core/modules/elsa/LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor/LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor.csproj b/aspnet-core/modules/elsa/LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor/LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor.csproj
index e402b4ebe..21f2344d9 100644
--- a/aspnet-core/modules/elsa/LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor/LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor.csproj
+++ b/aspnet-core/modules/elsa/LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor/LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor.csproj
@@ -19,6 +19,7 @@
+
@@ -27,7 +28,7 @@
+
-
diff --git a/aspnet-core/modules/elsa/LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor/Pages/Logs.razor b/aspnet-core/modules/elsa/LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor/Pages/Logs.razor
index e3508a41f..299d927a3 100644
--- a/aspnet-core/modules/elsa/LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor/Pages/Logs.razor
+++ b/aspnet-core/modules/elsa/LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor/Pages/Logs.razor
@@ -4,10 +4,12 @@
@inject ILocalizer Localizer
@using Elsa.Studio.Diagnostics.StructuredLogs.UI.Pages
+@using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Bundling
-
-
+@*
+ *@
+
@Localizer["Logs"]
diff --git a/aspnet-core/modules/elsa/LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor/_Imports.razor b/aspnet-core/modules/elsa/LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor/_Imports.razor
index 6a4064616..35625bdfb 100644
--- a/aspnet-core/modules/elsa/LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor/_Imports.razor
+++ b/aspnet-core/modules/elsa/LINGYUN.Abp.ElsaNext.Studio.Diagnostics.StructuredLogs.Blazor/_Imports.razor
@@ -3,3 +3,4 @@
@using Elsa.Studio.Components
@using Elsa.Studio.Localization
@using MudBlazor
+@using Volo.Abp.AspNetCore.Components.Web.Theming
\ No newline at end of file