From 014fb2a44ddebef51aa15844bb35c9dc74a74f7f Mon Sep 17 00:00:00 2001 From: jackfiled Date: Wed, 1 Nov 2023 16:49:52 +0800 Subject: [PATCH] =?UTF-8?q?refact:=20=E9=87=8D=E6=9E=84=E5=9B=9EServer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Frontend/Frontend.csproj | 5 +---- Frontend/Pages/Editor.razor | 19 +++++++++++++++++++ Frontend/Pages/Index.razor | 16 ++++++++++------ Frontend/Pages/_Host.cshtml | 37 +++++++++++++++++++++++++++++++++++++ Frontend/Program.cs | 21 +++++++++++---------- Frontend/_Imports.razor | 1 - Frontend/wwwroot/index.html | 36 ------------------------------------ 7 files changed, 78 insertions(+), 57 deletions(-) create mode 100644 Frontend/Pages/_Host.cshtml delete mode 100644 Frontend/wwwroot/index.html diff --git a/Frontend/Frontend.csproj b/Frontend/Frontend.csproj index 53a992c..4fbc6c6 100644 --- a/Frontend/Frontend.csproj +++ b/Frontend/Frontend.csproj @@ -1,18 +1,15 @@ - + net7.0 enable enable - true - - diff --git a/Frontend/Pages/Editor.razor b/Frontend/Pages/Editor.razor index 0877b9f..3f68975 100644 --- a/Frontend/Pages/Editor.razor +++ b/Frontend/Pages/Editor.razor @@ -84,6 +84,25 @@ await base.OnInitializedAsync(); } + protected override async Task OnAfterRenderAsync(bool firstRender) + { + if (firstRender) + { + Log("编辑器加载完成"); + if (await GrammarStorage.RestoreGrammar()) + { + await _editor.SetValue(RobotFactory.GrammarText); + Log("从浏览器中恢复成功"); + } + else + { + Log("尚未设置语法"); + } + } + + await base.OnAfterRenderAsync(firstRender); + } + private StandaloneEditorConstructionOptions GetEditorConstructionOptions(StandaloneCodeEditor editor) { return new StandaloneEditorConstructionOptions diff --git a/Frontend/Pages/Index.razor b/Frontend/Pages/Index.razor index ec0b3fc..18cf231 100644 --- a/Frontend/Pages/Index.razor +++ b/Frontend/Pages/Index.razor @@ -53,13 +53,17 @@ private Guid _currentGuid; - protected override async Task OnInitializedAsync() + protected override async Task OnAfterRenderAsync(bool firstRender) { - await GrammarStorage.RestoreGrammar(); - - Chat chat = GetInitChat(); - _chatDictionary.Add(chat.Guid, chat); - _currentGuid = chat.Guid; + if (firstRender) + { + await GrammarStorage.RestoreGrammar(); + + Chat chat = GetInitChat(); + _chatDictionary.Add(chat.Guid, chat); + _currentGuid = chat.Guid; + StateHasChanged(); + } await base.OnInitializedAsync(); } diff --git a/Frontend/Pages/_Host.cshtml b/Frontend/Pages/_Host.cshtml new file mode 100644 index 0000000..b1bedca --- /dev/null +++ b/Frontend/Pages/_Host.cshtml @@ -0,0 +1,37 @@ +@page "/" +@using Microsoft.AspNetCore.Components.Web +@namespace Frontend.Pages +@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers + + + + + + + + + + + + + + +
+ + An error has occurred. This application may no longer respond until reloaded. + + + An unhandled exception has occurred. See browser dev tools for details. + + Reload + 🗙 +
+ + + + + + + + + \ No newline at end of file diff --git a/Frontend/Program.cs b/Frontend/Program.cs index 203b4ad..10ffe88 100644 --- a/Frontend/Program.cs +++ b/Frontend/Program.cs @@ -1,21 +1,22 @@ using Blazored.LocalStorage; -using Microsoft.AspNetCore.Components.Web; -using Microsoft.AspNetCore.Components.WebAssembly.Hosting; using Katheryne; -using Frontend; using Frontend.Services; -var builder = WebAssemblyHostBuilder.CreateDefault(args); -builder.RootComponents.Add("#app"); -builder.RootComponents.Add("head::after"); +WebApplicationBuilder builder = WebApplication.CreateBuilder(args); + +builder.Services.AddRazorPages(); +builder.Services.AddServerSideBlazor(); + builder.Services.AddAntDesign(); builder.Services.AddBlazoredLocalStorage(); - -builder.Logging.SetMinimumLevel(LogLevel.Debug); - builder.Services.AddKatheryne(); builder.Services.AddScoped(); -WebAssemblyHost app = builder.Build(); +WebApplication app = builder.Build(); + +app.UseStaticFiles(); +app.UseRouting(); +app.MapBlazorHub(); +app.MapFallbackToPage("/_Host"); await app.RunAsync(); \ No newline at end of file diff --git a/Frontend/_Imports.razor b/Frontend/_Imports.razor index 1b80408..dee7fe5 100644 --- a/Frontend/_Imports.razor +++ b/Frontend/_Imports.razor @@ -2,7 +2,6 @@ @using System.Net.Http.Json @using Microsoft.AspNetCore.Components.Routing @using Microsoft.AspNetCore.Components.Web -@using Microsoft.AspNetCore.Components.WebAssembly.Http @using Microsoft.JSInterop @using AntDesign @using BlazorMonaco diff --git a/Frontend/wwwroot/index.html b/Frontend/wwwroot/index.html deleted file mode 100644 index 69757d9..0000000 --- a/Frontend/wwwroot/index.html +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - 凯瑟琳 - - - - - - - -
-
-

凯瑟琳

-
- 提瓦特有着他自己的法则。。。 -
-
-
- -
- An unhandled error has occurred. - Reload - 🗙 -
- - - - - - - - - \ No newline at end of file