feat: 更改结构

1 year ago · 268a919e48
parent d4b88cf515
commit 268a919e48
30 changed files with 82 additions and 13 deletions
--- a/BlazorSharedDemo.ServerApp/App.razor
+++ b/BlazorSharedDemo.ServerApp/App.razor
@ -1,4 +1,4 @@
-<Router AppAssembly="@typeof(App).Assembly">
+<Router AppAssembly="@typeof(BlazorSharedDemo.ServerApp.App).Assembly">
    <Found Context="routeData">
        <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
        <FocusOnNavigate RouteData="@routeData" Selector="h1" />
@ -10,3 +10,6 @@
        </LayoutView>
    </NotFound>
 </Router>
+@{
+     
+}
--- a/BlazorSharedDemo.ServerApp/Pages/Index.razor
+++ b/BlazorSharedDemo.ServerApp/Pages/Index.razor
@ -1,3 +1,4 @@
-@page "/"
+@*如果组件的路由与共享Razor类库中组件的路由相同，则会覆盖(替换)共享类库的路由*@
+@page "/"

 <h1>ServerApp Hello!</h1>
--- a/BlazorSharedDemo.ServerApp/Pages/_Host.cshtml
+++ b/BlazorSharedDemo.ServerApp/Pages/_Host.cshtml
@ -5,10 +5,11 @@
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers

 <!DOCTYPE html>
-<html lang="en">
+<html lang="zh-cn">
 <head>
    <meta charset="utf-8" />
    <base href="~/" />
+    <link rel="shortcut icon" href="favicon.ico">
    <link href="css/site.css" rel="stylesheet" />
    <component type="typeof(HeadOutlet)" render-mode="ServerPrerendered" />
 </head>
@ -22,7 +23,7 @@
        <environment include="Development">
            An unhandled exception has occurred. See browser dev tools for details.
        </environment>
-        <a href="" class="reload">Reload</a>
+        <a href="" class="reload">重新加载</a>
        <a class="dismiss">🗙</a>
    </div>

--- a/BlazorSharedDemo.ServerApp/Program.cs
+++ b/BlazorSharedDemo.ServerApp/Program.cs
@ -2,6 +2,13 @@ using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Web;

 var builder = WebApplication.CreateBuilder(args);
+
+//非开发模式也启用静态资产
+if (!builder.Environment.IsDevelopment())
+{ 
+    builder.WebHost.UseStaticWebAssets();
+}
+builder.WebHost.UseStaticWebAssets();
 builder.Services.AddRazorPages();
 builder.Services.AddServerSideBlazor();

--- a/BlazorSharedDemo.ServerApp/Properties/launchSettings.json
+++ b/BlazorSharedDemo.ServerApp/Properties/launchSettings.json
@ -6,20 +6,20 @@
    }
  },
  "profiles": {
-    "http": {
+    "ServerApp": {
      "commandName": "Project",
      "dotnetRunMessages": true,
      "launchBrowser": true,
      "applicationUrl": "http://localhost:5037",
      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
+        "ASPNETCORE_ENVIRONMENT": "Production"
      }
    },
    "IIS Express": {
      "commandName": "IISExpress",
      "launchBrowser": true,
      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
+        "ASPNETCORE_ENVIRONMENT": "Production"
      }
    }
  }
--- a/BlazorSharedDemo.ServerApp/wwwroot/favicon.ico
+++ b/BlazorSharedDemo.ServerApp/wwwroot/favicon.ico
--- a/BlazorSharedDemo.SharedUI/BlazorSharedDemo.SharedUI.csproj
+++ b/BlazorSharedDemo.SharedUI/BlazorSharedDemo.SharedUI.csproj
@ -17,7 +17,6 @@

  <ItemGroup>
    <Folder Include="Services\" />
-    <Folder Include="Shared\" />
    <Folder Include="Models\" />
  </ItemGroup>

--- a/BlazorSharedDemo.SharedUI/MainLayout.razor
+++ b/BlazorSharedDemo.SharedUI/MainLayout.razor
@ -1,5 +1,14 @@
@inherits LayoutComponentBase
-
+<HeadContent>
+    <link rel="stylesheet" href="_content/BlazorSharedDemo.SharedUI/css/SharedUI.css" />
+    <link rel="apple-touch-icon" sizes="180x180" href="_content/BlazorSharedDemo.SharedUI/favicon/apple-touch-icon.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="_content/BlazorSharedDemo.SharedUI/favicon/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="_content/BlazorSharedDemo.SharedUI/favicon/favicon-16x16.png">
+    <link rel="manifest" href="_content/BlazorSharedDemo.SharedUI/favicon/site.webmanifest">
+    <link rel="shortcut icon" href="_content/BlazorSharedDemo.SharedUI/favicon/favicon.ico">
+</HeadContent>
 <main>
    @Body
 </main>
+
+
--- a/BlazorSharedDemo.SharedUI/Pages/Index.razor
+++ b/BlazorSharedDemo.SharedUI/Pages/Index.razor
@ -1,7 +1,9 @@

@page "/"
-<h3>SharedUI Hello!</h3>
-
+<h1>SharedUI Hello!</h1>
+<div>
+    <MyImage></MyImage>
+</div>
@code {

 }
--- a/BlazorSharedDemo.SharedUI/Shared/MyImage.razor
+++ b/BlazorSharedDemo.SharedUI/Shared/MyImage.razor
@ -0,0 +1,24 @@
+<div>
+    <ul>
+        <li>
+            <img src="_content/BlazorSharedDemo.SharedUI/images/01.jpg" alt="" />
+        </li>
+        <li>
+            <img src="_content/BlazorSharedDemo.SharedUI/images/02.jpg" alt="" />
+        </li>
+        <li>
+            <img src="_content/BlazorSharedDemo.SharedUI/images/03.jpg" alt="" />
+        </li>
+        <li>
+            <img src="_content/BlazorSharedDemo.SharedUI/images/04.jpg" alt="" />
+        </li>
+        <li>
+            <img src="_content/BlazorSharedDemo.SharedUI/images/05.jpg" alt="" />
+        </li>
+    </ul>
+
+</div>
+
+@code {
+
+}
--- a/BlazorSharedDemo.SharedUI/_Imports.razor
+++ b/BlazorSharedDemo.SharedUI/_Imports.razor
@ -1,2 +1,6 @@
@using Microsoft.AspNetCore.Components.Web
@using Microsoft.AspNetCore.Components.Routing
+
+@using BlazorSharedDemo.SharedUI
+@using BlazorSharedDemo.SharedUI.Pages
+@using BlazorSharedDemo.SharedUI.Shared
--- a/BlazorSharedDemo.SharedUI/wwwroot/css/SharedUI.css
+++ b/BlazorSharedDemo.SharedUI/wwwroot/css/SharedUI.css
@ -0,0 +1,3 @@
+.SharedUI {
+    border:2px groove red;
+}
--- a/BlazorSharedDemo.SharedUI/wwwroot/images/01.jpg
+++ b/BlazorSharedDemo.SharedUI/wwwroot/images/01.jpg
--- a/BlazorSharedDemo.SharedUI/wwwroot/images/02.jpg
+++ b/BlazorSharedDemo.SharedUI/wwwroot/images/02.jpg
--- a/BlazorSharedDemo.SharedUI/wwwroot/images/03.jpg
+++ b/BlazorSharedDemo.SharedUI/wwwroot/images/03.jpg
--- a/BlazorSharedDemo.SharedUI/wwwroot/images/04.jpg
+++ b/BlazorSharedDemo.SharedUI/wwwroot/images/04.jpg
--- a/BlazorSharedDemo.SharedUI/wwwroot/images/05.jpg
+++ b/BlazorSharedDemo.SharedUI/wwwroot/images/05.jpg
--- a/BlazorSharedDemo.SharedUI/wwwroot/images/06.jpg
+++ b/BlazorSharedDemo.SharedUI/wwwroot/images/06.jpg
--- a/BlazorSharedDemo.SharedUI/wwwroot/images/07.jpg
+++ b/BlazorSharedDemo.SharedUI/wwwroot/images/07.jpg
--- a/BlazorSharedDemo.SharedUI/wwwroot/images/08.jpg
+++ b/BlazorSharedDemo.SharedUI/wwwroot/images/08.jpg
--- a/BlazorSharedDemo.SharedUI/wwwroot/images/09.jpg
+++ b/BlazorSharedDemo.SharedUI/wwwroot/images/09.jpg
--- a/BlazorSharedDemo.SharedUI/wwwroot/images/10.jpg
+++ b/BlazorSharedDemo.SharedUI/wwwroot/images/10.jpg
--- a/BlazorSharedDemo.SharedUI/wwwroot/images/background.png
+++ b/BlazorSharedDemo.SharedUI/wwwroot/images/background.png
--- a/BlazorSharedDemo.SharedUI/wwwroot/images/favicon.ico
+++ b/BlazorSharedDemo.SharedUI/wwwroot/images/favicon.ico
--- a/BlazorSharedDemo.SharedUI/wwwroot/js/exampleJsInterop.js
+++ b/BlazorSharedDemo.SharedUI/wwwroot/js/exampleJsInterop.js
--- a/BlazorSharedDemo.WaslApp/App.razor
+++ b/BlazorSharedDemo.WaslApp/App.razor
@ -0,0 +1,12 @@
+<Router AppAssembly="@typeof(App).Assembly" AdditionalAssemblies="new[] { typeof(BlazorSharedDemo.SharedUI.MainLayout).Assembly }">
+    <Found Context="routeData">
+        <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
+        <FocusOnNavigate RouteData="@routeData" Selector="h1" />
+    </Found>
+    <NotFound>
+        <PageTitle>未找到路由</PageTitle>
+        <LayoutView Layout="@typeof(MainLayout)">
+            <p role="alert">抱歉,此路由地址不存在！</p>
+        </LayoutView>
+    </NotFound>
+</Router>
--- a/BlazorSharedDemo.WaslApp/Pages/Index.razor
+++ b/BlazorSharedDemo.WaslApp/Pages/Index.razor
@ -1,3 +1,4 @@
-@page "/"
+@*路由不能与共享Razor类库的路由重复*@
+@page "/app-index"

-<h1>Hello, world!</h1>
+<h1>Wasl Hello</h1>
--- a/BlazorSharedDemo.WaslApp/_Imports.razor
+++ b/BlazorSharedDemo.WaslApp/_Imports.razor
@ -4,4 +4,6 @@
@using Microsoft.AspNetCore.Components.Web
@using Microsoft.AspNetCore.Components.WebAssembly.Http
@using Microsoft.JSInterop
+
+@using BlazorSharedDemo.SharedUI
@using BlazorSharedDemo.WaslApp
--- a/BlazorSharedDemo.WaslApp/wwwroot/favicon.ico
+++ b/BlazorSharedDemo.WaslApp/wwwroot/favicon.ico
--- a/BlazorSharedDemo.WaslApp/wwwroot/index.html
+++ b/BlazorSharedDemo.WaslApp/wwwroot/index.html
@ -5,6 +5,7 @@
    <meta charset="utf-8" />
    <title>WaslApp</title>
    <base href="/" />
+    <link rel="shortcut icon" href="favicon.ico">
    <link href="css/app.css" rel="stylesheet" />
    
    <!-- If you add any scoped CSS files, uncomment the following to load them