remove old ui library try; add dev feature(ejection seat) for ReloadWebView(F5)

PCC.Gui/AppScaffold/HostHolder.cs

@@ -1,11 +1,7 @@
-using MudBlazor.Services;
-using MudExtensions.Services;
-using PCC.Common.AssemblyInject;
+using PCC.Common.AssemblyInject;
 using PCC.Common.EventBus;
 using PCC.Common.Init;
 using PCC.Common.Logging;
-using PCC.Gui.Ise;
-using PCC.Gui.Mud;
 using PCC.Gui.MudIse;
 using PCC.Logging;
 
@@ -28,8 +24,6 @@ public static class HostHolder
         services.AddWindowsFormsBlazorWebView();
 
         //界面框架
-        //services.AddMudOnPcc();
-        //services.AddBlazoriseOnPcc();
         services.AddMudIseOnPcc();
 
         // 日志配置

PCC.Gui/Gui/Ise/MainIse.razor

@@ -1,46 +0,0 @@
-@using Blazorise
-@inject IEventBus EventBus;
-
-<Layout>
-    <LayoutHeader>
-        Header
-    </LayoutHeader>
-    <LayoutContent>
-
-        <Splitter Direction="SplitterDirection.Horizontal">
-            <SplitterSection>
-                <div>Contacts!</div>
-            </SplitterSection>
-            <SplitterSection>
-                <Splitter Direction="SplitterDirection.Vertical">
-                    <SplitterSection>
-                        <div>Chat!</div>
-                    </SplitterSection>
-                    <SplitterSection>
-                        <div>Input!</div>
-                    </SplitterSection>
-                </Splitter>
-
-            </SplitterSection>
-        </Splitter>
-
-
-    </LayoutContent>
-    <LayoutFooter>
-        Footer
-    </LayoutFooter>
-</Layout>
-
-@code {
-
-    private bool _isUiShown = false;
-
-    protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-        await base.OnAfterRenderAsync(firstRender);
-
-        if (_isUiShown) return;
-        _isUiShown = true;
-        EventBus.Publish<UiShownEvent>();
-    }
-}

PCC.Gui/Gui/Ise/Scaffold.cs

@@ -1,15 +0,0 @@
-using Blazorise;
-using Blazorise.Bootstrap5;
-using Blazorise.Icons.FontAwesome;
-
-namespace PCC.Gui.Ise;
-
-internal static class Scaffold
-{
-    public static void AddBlazoriseOnPcc(this IServiceCollection services)
-    {
-        services.AddBlazorise(options => options.Immediate = true)
-            .AddBootstrap5Providers()
-            .AddFontAwesomeIcons();
-    }
-}

PCC.Gui/Gui/Ise/_Imports.razor

@@ -1,3 +0,0 @@
-@using Microsoft.AspNetCore.Components.Web
-@using PCC.Common.EventBus
-@using Blazorise.Splitter

PCC.Gui/Gui/Mud/MainMud.razor

@@ -1,135 +0,0 @@
-@inject IEventBus EventBus;
-
-@* Required *@
-<MudThemeProvider />
-<MudPopoverProvider />
-
-@* Needed for dialogs *@
-<MudDialogProvider />
-
-@* Needed for snackbars *@
-<MudSnackbarProvider />
-
-<MudLayout>
-    <MudSplitter Class="mud-height-full" StartContentStyle="overflow:hidden">
-        <StartContent>
-            <MudStack StretchItems="StretchItems.End" AlignItems="AlignItems.Stretch" Style="width:100%">
-                <MudStack Row AlignItems="AlignItems.Center" Justify="Justify.SpaceBetween" Class="mud-paper mud-paper-square stack-adorner">
-                    <MudButton Color="Color.Inherit" Class="pa-3 rounded-0 hideable" Style="min-width: 0;"><MudIcon Icon="@Icons.Material.Outlined.Add" /></MudButton>
-                    <MudText Class="hideable">Contacts</MudText>
-                    <MudButton Color="Color.Inherit" Class="pa-3 rounded-0 hideable" Style="min-width: 0;"><MudIcon Icon="@Icons.Material.Outlined.Delete" /></MudButton>
-                </MudStack>
-                <MudStack Row Class="mud-background-gray stack-adorner" Style="overflow-x: auto;">
-                    <MudDropContainer T="DropZoneItem" Items="_items" ItemsSelector="@((item, dropzone) => item.Zone == dropzone)" ItemDropped="ItemUpdated" Class="4 flex-grow-1">
-                        <ChildContent>
-                            <MudDropContainer T="DropZone" Items="_zones" ItemsSelector="@((item, dropzone) => true)" Class="5">
-                                <ChildContent>
-                                    <MudDropZone T="DropZone" AllowReorder Class="6 rounded mud-background-gray px-1 py-1 ma-1"/>
-                                </ChildContent>
-                                <ItemRenderer>
-                                    <MudPaper Class="pa-1 my-1">
-                                        <MudText Typo="Typo.h6">@context.Name</MudText>
-                                        <MudDropZone T="DropZoneItem" Identifier="@context.Name" AllowReorder Class="rounded mud-background-gray px-4 py-1 ma-4"/>
-                                    </MudPaper>
-                                </ItemRenderer>
-                            </MudDropContainer>
-                        </ChildContent>
-                        <ItemRenderer>
-                            <MudPaper Class="pa-4 my-4">
-                                <MudText>@context.Name</MudText>
-                            </MudPaper>
-                        </ItemRenderer>
-                    </MudDropContainer>
-                </MudStack>
-
-            </MudStack>
-            
-        </StartContent>
-        <EndContent>
-            <MudMainContent>
-                <h1>Counter3</h1>
-                <p>Current count: @currentCount</p>
-                <MudButton Variant="Variant.Filled" @onclick="IncrementCount">Click me</MudButton>
-                <MudGrid>
-                    <MudItem xs="12" sm="6" md="4">
-                        <MudPaper Elevation="2" Class="pa-4" Style="height: 200px;"></MudPaper>
-                    </MudItem>
-                    <MudItem xs="12" sm="6" md="4">
-                        <MudPaper Elevation="2" Class="pa-4" Style="height: 200px;"></MudPaper>
-                    </MudItem>
-                    <MudItem xs="12" sm="12" md="4">
-                        <MudPaper Elevation="2" Class="pa-4" Style="height: 200px;"></MudPaper>
-                    </MudItem>
-                    <MudItem xs="12" sm="6">
-                        <MudGrid>
-                            <MudItem xs="12">
-                                <MudPaper Elevation="2" Class="pa-4" Style="height: 200px;"></MudPaper>
-                            </MudItem>
-                            <MudItem xs="12">
-                                <MudPaper Elevation="2" Class="pa-4" Style="height: 200px;"></MudPaper>
-                            </MudItem>
-                        </MudGrid>
-                    </MudItem>
-                    <MudItem xs="12" sm="6">
-                        <MudPaper Elevation="2" Class="pa-4" Style="height: 100%"></MudPaper>
-                    </MudItem>
-                    <MudItem xs="12" sm="6" md="4">
-                        <MudPaper Elevation="2" Class="pa-4" Style="height: 200px;"></MudPaper>
-                    </MudItem>
-                    <MudItem xs="12" sm="6" md="4">
-                        <MudPaper Elevation="2" Class="pa-4" Style="height: 200px;"></MudPaper>
-                    </MudItem>
-                    <MudItem xs="12" sm="12" md="4">
-                        <MudPaper Elevation="2" Class="pa-4" Style="height: 200px;"></MudPaper>
-                    </MudItem>
-                </MudGrid>
-            </MudMainContent>
-        </EndContent>
-    </MudSplitter>
-</MudLayout>
-
-
-@code {
-    private int currentCount = 0;
-    private bool _isUiShown = false;
-
-    private void IncrementCount()
-    {
-        currentCount++;
-    }
-
-    protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-        await base.OnAfterRenderAsync(firstRender);
-
-        if (_isUiShown) return;
-        _isUiShown = true;
-        EventBus.Publish<UiShownEvent>();
-    }
-
-    private void ItemUpdated(MudItemDropInfo<DropZoneItem> dropItem) => dropItem.Item.Zone = dropItem.DropzoneIdentifier;
-
-    private List<DropZone> _zones = new()
-    {
-        new() { Name = "Drop Zone 1" },
-        new() { Name = "Drop Zone 2" }
-    };
-
-    private List<DropZoneItem> _items = new()
-    {
-        new() { Zone = "Drop Zone 1", Name = "Item 1" },
-        new() { Zone = "Drop Zone 1", Name = "Item 2" },
-        new() { Zone = "Drop Zone 2", Name = "Item 3" },
-    };
-
-    private class DropZone
-    {
-        public string Name { get; init; }
-    }
-
-    private class DropZoneItem
-    {
-        public string Zone { get; set; }
-        public string Name { get; init; }
-    }
-}

PCC.Gui/Gui/Mud/Scaffold.cs

@@ -1,13 +0,0 @@
-using MudBlazor.Services;
-using MudExtensions.Services;
-
-namespace PCC.Gui.Mud;
-
-internal static class Scaffold
-{
-    public static void AddMudOnPcc(this IServiceCollection services)
-    {
-        services.AddMudServices();
-        services.AddMudExtensions();
-    }
-}

PCC.Gui/Gui/Mud/_Imports.razor

@@ -1,4 +0,0 @@
-@using Microsoft.AspNetCore.Components.Web
-@using PCC.Common.EventBus
-@using MudBlazor
-@using MudExtensions

PCC.Gui/Gui/MudIse/DevEjectionSeat.razor

@@ -0,0 +1,37 @@
+@inject IJSRuntime JS
+
+@code
+{
+    private bool _isRunning = true;
+    private IJSObjectReference? module;
+
+    [Parameter]
+    public RenderFragment? ChildContent { get; set; }
+
+    protected override async Task OnAfterRenderAsync(bool firstRender)
+    {
+        await base.OnAfterRenderAsync(firstRender);
+        if (firstRender)
+        {
+            module = await JS.InvokeAsync<IJSObjectReference>("import", "./Gui/MudIse/DevEjectionSeat.razor.js");
+            await module.InvokeVoidAsync("SetBeforeUnloadEventHandler", DotNetObjectReference.Create(this), nameof(BeforeUnloadEventHandler));
+        }
+    }
+
+    [JSInvokable]
+    public void BeforeUnloadEventHandler()
+    {
+        _isRunning = false;
+        StateHasChanged();
+    }
+
+}
+
+@if (_isRunning)
+{
+    @ChildContent
+}
+else
+{
+    <h1>Dev Ejection Seat Working</h1>
+}

PCC.Gui/Gui/MudIse/DevEjectionSeat.razor.css

@@ -0,0 +1,7 @@
+h1 {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    margin: 0;
+}

PCC.Gui/Gui/MudIse/DevEjectionSeat.razor.js

@@ -0,0 +1,6 @@
+export function SetBeforeUnloadEventHandler(esInstance,metohdName) {
+    window.addEventListener("beforeunload", function () {
+        esInstance.invokeMethodAsync(metohdName);
+    });
+}
+

PCC.Gui/Gui/MudIse/MainMudIse.razor

@@ -1,6 +1,8 @@
-@using Color = MudBlazor.Color
+@layout DevEjectionSeat
+
+@using Color = MudBlazor.Color
 @using Size = MudBlazor.Size
-@using Microsoft.JSInterop
+
 @inject IEventBus EventBus;
 @inject IJSRuntime JSRuntime;
 
@@ -89,8 +91,7 @@
     };
 }
 
-@if (_isReloadingUI == false)
-{
+<DevEjectionSeat>
     <Splitter Direction="SplitterDirection.Horizontal">
         <SplitterSection>
             @RenderContacts
@@ -106,25 +107,22 @@
             </Splitter>
         </SplitterSection>
     </Splitter>
-}
+</DevEjectionSeat>
 
 @code {
-    private bool _isUiShown = false;
-    private bool _isReloadingUI = false;
+ 
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
-        await base.OnAfterRenderAsync(firstRender);
-
-        if (_isUiShown) return;
-        _isUiShown = true;
-        EventBus.Publish<UiShownEvent>();
+        if (firstRender)
+        {
+            EventBus.Publish<UiShownEvent>();
+        }
     }
 
 
     private void ReloadUI()
     {
-        _isReloadingUI = true;
         StateHasChanged();
         JSRuntime.InvokeVoidAsync("window.location.reload");
     }

PCC.Gui/Gui/MudIse/MainMudIse.razor.css

@@ -1,3 +0,0 @@
-body {
-    asdf:ffff;
-}

PCC.Gui/Gui/MudIse/Scaffold.cs

@@ -1,5 +1,8 @@
-using PCC.Gui.Ise;
-using PCC.Gui.Mud;
+using Blazorise;
+using Blazorise.Bootstrap5;
+using Blazorise.Icons.FontAwesome;
+using MudBlazor.Services;
+using MudExtensions.Services;
 
 namespace PCC.Gui.MudIse;
 
@@ -7,7 +10,11 @@ internal static class Scaffold
 {
     public static void AddMudIseOnPcc(this IServiceCollection services)
     {
-        services.AddMudOnPcc();
-        services.AddBlazoriseOnPcc();
+        services.AddMudServices();
+        services.AddMudExtensions();
+
+        services.AddBlazorise(options => options.Immediate = true)
+            .AddBootstrap5Providers()
+            .AddFontAwesomeIcons();
     }
 }

PCC.Gui/Gui/MudIse/_Imports.razor

@@ -1,6 +1,7 @@
 @using Microsoft.AspNetCore.Components.Web
+@using Microsoft.JSInterop
 @using PCC.Common.EventBus
 @using MudBlazor
 @using MudExtensions
 @using Blazorise
-@using Blazorise.Splitter
+@using Blazorise.Splitter

PCC.Gui/Gui/PccMainForm.Designer.cs

@@ -44,7 +44,7 @@
             ApplicationInitializationTitleLabel.Font = new Font("Microsoft YaHei UI", 40F);
             ApplicationInitializationTitleLabel.Location = new Point(0, 0);
             ApplicationInitializationTitleLabel.Name = "ApplicationInitializationTitleLabel";
-            ApplicationInitializationTitleLabel.Size = new Size(800, 225);
+            ApplicationInitializationTitleLabel.Size = new Size(946, 225);
             ApplicationInitializationTitleLabel.TabIndex = 0;
             ApplicationInitializationTitleLabel.Text = "Application Initialization...";
             ApplicationInitializationTitleLabel.TextAlign = ContentAlignment.MiddleCenter;
@@ -64,7 +64,7 @@
             // ApplicationInitializationPanel.Panel2
             // 
             ApplicationInitializationPanel.Panel2.Controls.Add(ApplicationInitializationStatusLabel);
-            ApplicationInitializationPanel.Size = new Size(800, 450);
+            ApplicationInitializationPanel.Size = new Size(946, 450);
             ApplicationInitializationPanel.SplitterDistance = 225;
             ApplicationInitializationPanel.TabIndex = 0;
             // 
@@ -74,7 +74,7 @@
             ApplicationInitializationStatusLabel.Font = new Font("Microsoft YaHei UI", 10F);
             ApplicationInitializationStatusLabel.Location = new Point(0, 0);
             ApplicationInitializationStatusLabel.Name = "ApplicationInitializationStatusLabel";
-            ApplicationInitializationStatusLabel.Size = new Size(800, 221);
+            ApplicationInitializationStatusLabel.Size = new Size(946, 221);
             ApplicationInitializationStatusLabel.TabIndex = 1;
             ApplicationInitializationStatusLabel.Text = "...";
             ApplicationInitializationStatusLabel.TextAlign = ContentAlignment.MiddleCenter;
@@ -84,7 +84,7 @@
             MainBlazorWebView.Dock = DockStyle.Fill;
             MainBlazorWebView.Location = new Point(0, 0);
             MainBlazorWebView.Name = "MainBlazorWebView";
-            MainBlazorWebView.Size = new Size(800, 450);
+            MainBlazorWebView.Size = new Size(946, 450);
             MainBlazorWebView.StartPath = "/";
             MainBlazorWebView.TabIndex = 1;
             MainBlazorWebView.Text = "blazorWebView1";
@@ -93,7 +93,7 @@
             // 
             AutoScaleDimensions = new SizeF(7F, 17F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(800, 450);
+            ClientSize = new Size(946, 450);
             Controls.Add(ApplicationInitializationPanel);
             Controls.Add(MainBlazorWebView);
             Name = "PccMainForm";