From 850bb8005e0e8a9c6e2b4a1ce6a6e567e96fe9b9 Mon Sep 17 00:00:00 2001
From: bicijinlian <bicijinlian@163.com>
Date: Fri, 21 Jul 2023 21:59:59 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E8=B0=83=E6=95=B4=E9=A1=B9?=
=?UTF-8?q?=E7=9B=AE=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
BootstrapBlazorStudy.Server/App.razor | 5 ++++-
BootstrapBlazorStudy.Server/Pages/_Host.cshtml | 1 +
BootstrapBlazorStudy.Server/_Imports.razor | 10 ++++++++++
.../BootstrapBlazorStudy.Shared.csproj | 7 +++++++
BootstrapBlazorStudy.Shared/Components/Test.razor | 5 +++++
.../Components/Test.razor.css | 3 +++
BootstrapBlazorStudy.Shared/Components/Test.razor.js | 1 +
BootstrapBlazorStudy.Shared/GlobalUsing.cs | 5 +++++
BootstrapBlazorStudy.Shared/Pages/Home.razor | 8 ++++++++
BootstrapBlazorStudy.Shared/Pages/UseCard.razor | 6 ++++++
.../Shared}/MainLayout.razor | 0
BootstrapBlazorStudy.Shared/_Imports.razor | 12 ++++++++++++
BootstrapBlazorStudy.WASM/App.razor | 5 ++++-
BootstrapBlazorStudy.WASM/MainLayout.razor | 5 -----
BootstrapBlazorStudy.WASM/Program.cs | 1 +
BootstrapBlazorStudy.WASM/_Imports.razor | 10 ++++++++++
BootstrapBlazorStudy.sln | 6 +++---
17 files changed, 80 insertions(+), 10 deletions(-)
create mode 100644 BootstrapBlazorStudy.Shared/Components/Test.razor
create mode 100644 BootstrapBlazorStudy.Shared/Components/Test.razor.css
create mode 100644 BootstrapBlazorStudy.Shared/Components/Test.razor.js
create mode 100644 BootstrapBlazorStudy.Shared/GlobalUsing.cs
create mode 100644 BootstrapBlazorStudy.Shared/Pages/Home.razor
create mode 100644 BootstrapBlazorStudy.Shared/Pages/UseCard.razor
rename {BootstrapBlazorStudy.Server => BootstrapBlazorStudy.Shared/Shared}/MainLayout.razor (100%)
delete mode 100644 BootstrapBlazorStudy.WASM/MainLayout.razor
diff --git a/BootstrapBlazorStudy.Server/App.razor b/BootstrapBlazorStudy.Server/App.razor
index 6fd3ed1..a673474 100644
--- a/BootstrapBlazorStudy.Server/App.razor
+++ b/BootstrapBlazorStudy.Server/App.razor
@@ -1,4 +1,7 @@
-<Router AppAssembly="@typeof(App).Assembly">
+<Router
+ AppAssembly="@typeof(App).Assembly"
+ AdditionalAssemblies="@(new []{ typeof(BootstrapBlazorStudy.Shared.Shared.MainLayout).Assembly})"
+>
<Found Context="routeData">
<RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
<FocusOnNavigate RouteData="@routeData" Selector="h1" />
diff --git a/BootstrapBlazorStudy.Server/Pages/_Host.cshtml b/BootstrapBlazorStudy.Server/Pages/_Host.cshtml
index 8080380..011ba91 100644
--- a/BootstrapBlazorStudy.Server/Pages/_Host.cshtml
+++ b/BootstrapBlazorStudy.Server/Pages/_Host.cshtml
@@ -1,4 +1,5 @@
@page "/"
+@using BootstrapBlazorStudy.Shared;
@using Microsoft.AspNetCore.Components.Web
@namespace BootstrapBlazorStudy.Server.Pages
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/BootstrapBlazorStudy.Server/_Imports.razor b/BootstrapBlazorStudy.Server/_Imports.razor
index 54b85a1..b968910 100644
--- a/BootstrapBlazorStudy.Server/_Imports.razor
+++ b/BootstrapBlazorStudy.Server/_Imports.razor
@@ -1,4 +1,14 @@
@using Microsoft.AspNetCore.Components.Routing
@using Microsoft.AspNetCore.Components.Web
@using Microsoft.JSInterop
+
+@using BootstrapBlazor;
+@using BootstrapBlazor.Components;
+@using BootstrapBlazor.Localization;
+
+@using BootstrapBlazorStudy.Shared;
+@using BootstrapBlazorStudy.Shared.Pages;
+@using BootstrapBlazorStudy.Shared.Shared;
+@using BootstrapBlazorStudy.Shared.Components;
+
@using BootstrapBlazorStudy.Server
diff --git a/BootstrapBlazorStudy.Shared/BootstrapBlazorStudy.Shared.csproj b/BootstrapBlazorStudy.Shared/BootstrapBlazorStudy.Shared.csproj
index cc98b29..3c42196 100644
--- a/BootstrapBlazorStudy.Shared/BootstrapBlazorStudy.Shared.csproj
+++ b/BootstrapBlazorStudy.Shared/BootstrapBlazorStudy.Shared.csproj
@@ -18,4 +18,11 @@
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.9" />
</ItemGroup>
+ <ItemGroup>
+ <PackageReference Update="BootstrapBlazor.Analyzers" Version="1.0.0">
+ <PrivateAssets>all</PrivateAssets>
+ <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+ </PackageReference>
+ </ItemGroup>
+
</Project>
diff --git a/BootstrapBlazorStudy.Shared/Components/Test.razor b/BootstrapBlazorStudy.Shared/Components/Test.razor
new file mode 100644
index 0000000..634d8f9
--- /dev/null
+++ b/BootstrapBlazorStudy.Shared/Components/Test.razor
@@ -0,0 +1,5 @@
+<h3>Test</h3>
+
+@code {
+
+}
diff --git a/BootstrapBlazorStudy.Shared/Components/Test.razor.css b/BootstrapBlazorStudy.Shared/Components/Test.razor.css
new file mode 100644
index 0000000..4e89867
--- /dev/null
+++ b/BootstrapBlazorStudy.Shared/Components/Test.razor.css
@@ -0,0 +1,3 @@
+.test {
+ background-color:peru;
+}
diff --git a/BootstrapBlazorStudy.Shared/Components/Test.razor.js b/BootstrapBlazorStudy.Shared/Components/Test.razor.js
new file mode 100644
index 0000000..85a4c29
--- /dev/null
+++ b/BootstrapBlazorStudy.Shared/Components/Test.razor.js
@@ -0,0 +1 @@
+console.log("BootstrapBlazorStudy.Shared项目,Test.razor组件Test.razor.js文件日志");
\ No newline at end of file
diff --git a/BootstrapBlazorStudy.Shared/GlobalUsing.cs b/BootstrapBlazorStudy.Shared/GlobalUsing.cs
new file mode 100644
index 0000000..7c984e7
--- /dev/null
+++ b/BootstrapBlazorStudy.Shared/GlobalUsing.cs
@@ -0,0 +1,5 @@
+global using BootstrapBlazor;
+global using BootstrapBlazor.Components;
+global using BootstrapBlazor.Localization;
+
+global using BootstrapBlazorStudy.Shared;
\ No newline at end of file
diff --git a/BootstrapBlazorStudy.Shared/Pages/Home.razor b/BootstrapBlazorStudy.Shared/Pages/Home.razor
new file mode 100644
index 0000000..327c5f4
--- /dev/null
+++ b/BootstrapBlazorStudy.Shared/Pages/Home.razor
@@ -0,0 +1,8 @@
+@page "/"
+@page "/home"
+@page "/index"
+<h3>Home</h3>
+
+@code {
+
+}
diff --git a/BootstrapBlazorStudy.Shared/Pages/UseCard.razor b/BootstrapBlazorStudy.Shared/Pages/UseCard.razor
new file mode 100644
index 0000000..86ecbfe
--- /dev/null
+++ b/BootstrapBlazorStudy.Shared/Pages/UseCard.razor
@@ -0,0 +1,6 @@
+@page "/use-card"
+<Card>ccc</Card>
+
+@code {
+
+}
diff --git a/BootstrapBlazorStudy.Server/MainLayout.razor b/BootstrapBlazorStudy.Shared/Shared/MainLayout.razor
similarity index 100%
rename from BootstrapBlazorStudy.Server/MainLayout.razor
rename to BootstrapBlazorStudy.Shared/Shared/MainLayout.razor
diff --git a/BootstrapBlazorStudy.Shared/_Imports.razor b/BootstrapBlazorStudy.Shared/_Imports.razor
index 7728512..9aba65d 100644
--- a/BootstrapBlazorStudy.Shared/_Imports.razor
+++ b/BootstrapBlazorStudy.Shared/_Imports.razor
@@ -1 +1,13 @@
@using Microsoft.AspNetCore.Components.Web
+@using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.JSInterop
+
+@using BootstrapBlazor;
+@using BootstrapBlazor.Localization;
+@using BootstrapBlazor.Components;
+
+@using BootstrapBlazorStudy.Shared;
+@using BootstrapBlazorStudy.Shared.Pages;
+@using BootstrapBlazorStudy.Shared.Shared;
+
+
diff --git a/BootstrapBlazorStudy.WASM/App.razor b/BootstrapBlazorStudy.WASM/App.razor
index 6fd3ed1..a673474 100644
--- a/BootstrapBlazorStudy.WASM/App.razor
+++ b/BootstrapBlazorStudy.WASM/App.razor
@@ -1,4 +1,7 @@
-<Router AppAssembly="@typeof(App).Assembly">
+<Router
+ AppAssembly="@typeof(App).Assembly"
+ AdditionalAssemblies="@(new []{ typeof(BootstrapBlazorStudy.Shared.Shared.MainLayout).Assembly})"
+>
<Found Context="routeData">
<RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
<FocusOnNavigate RouteData="@routeData" Selector="h1" />
diff --git a/BootstrapBlazorStudy.WASM/MainLayout.razor b/BootstrapBlazorStudy.WASM/MainLayout.razor
deleted file mode 100644
index de2be6c..0000000
--- a/BootstrapBlazorStudy.WASM/MainLayout.razor
+++ /dev/null
@@ -1,5 +0,0 @@
-@inherits LayoutComponentBase
-
-<main>
- @Body
-</main>
diff --git a/BootstrapBlazorStudy.WASM/Program.cs b/BootstrapBlazorStudy.WASM/Program.cs
index 2935c7c..a415812 100644
--- a/BootstrapBlazorStudy.WASM/Program.cs
+++ b/BootstrapBlazorStudy.WASM/Program.cs
@@ -1,3 +1,4 @@
+using BootstrapBlazorStudy.Shared;
using BootstrapBlazorStudy.WASM;
using Microsoft.AspNetCore.Components.Web;
diff --git a/BootstrapBlazorStudy.WASM/_Imports.razor b/BootstrapBlazorStudy.WASM/_Imports.razor
index 8a2a9f2..d27bbb2 100644
--- a/BootstrapBlazorStudy.WASM/_Imports.razor
+++ b/BootstrapBlazorStudy.WASM/_Imports.razor
@@ -4,4 +4,14 @@
@using Microsoft.AspNetCore.Components.Web
@using Microsoft.AspNetCore.Components.WebAssembly.Http
@using Microsoft.JSInterop
+
+@using BootstrapBlazor;
+@using BootstrapBlazor.Components;
+@using BootstrapBlazor.Localization;
+
+@using BootstrapBlazorStudy.Shared;
+@using BootstrapBlazorStudy.Shared.Pages;
+@using BootstrapBlazorStudy.Shared.Shared;
+@using BootstrapBlazorStudy.Shared.Components;
+
@using BootstrapBlazorStudy.WASM
diff --git a/BootstrapBlazorStudy.sln b/BootstrapBlazorStudy.sln
index 1eff27d..371bb3e 100644
--- a/BootstrapBlazorStudy.sln
+++ b/BootstrapBlazorStudy.sln
@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.5.33530.505
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BootstrapBlazorStudy.Shared", "BootstrapBlazorStudy.Shared\BootstrapBlazorStudy.Shared.csproj", "{BB71D86B-A872-4873-81DA-6FA130A401F4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BootstrapBlazorStudy.Shared", "BootstrapBlazorStudy.Shared\BootstrapBlazorStudy.Shared.csproj", "{BB71D86B-A872-4873-81DA-6FA130A401F4}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BootstrapBlazorStudy.WASM", "BootstrapBlazorStudy.WASM\BootstrapBlazorStudy.WASM.csproj", "{8B943532-7E1E-4F41-908C-3AEE19B15EE9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BootstrapBlazorStudy.WASM", "BootstrapBlazorStudy.WASM\BootstrapBlazorStudy.WASM.csproj", "{8B943532-7E1E-4F41-908C-3AEE19B15EE9}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BootstrapBlazorStudy.Server", "BootstrapBlazorStudy.Server\BootstrapBlazorStudy.Server.csproj", "{CE59C4FD-57EB-4403-8C1B-90939956A343}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BootstrapBlazorStudy.Server", "BootstrapBlazorStudy.Server\BootstrapBlazorStudy.Server.csproj", "{CE59C4FD-57EB-4403-8C1B-90939956A343}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{58BDDFA1-CF68-43C4-A8EF-C29ED02F3D03}"
ProjectSection(SolutionItems) = preProject