Fix missing layout (#183)

* fix: missing layout for not full tempalte * fix condition * Update AntDesign 0.19.3 * fix resources
ant-design-blazor · Jun 29, 2024 · 6aff196 · 6aff196
1 parent 9b86055
commit 6aff196
Show file tree

Hide file tree

Showing 24 changed files with 132 additions and 24 deletions.
diff --git a/.template.config/template.json b/.template.config/template.json
@@ -103,7 +103,7 @@
                     "exclude": [
                         "Components/**/*",
                         "Extensions/**/*",
-                        "Layouts/**/*",
+                        "Layouts/UserLayout.*",
                         "Models/**/*",
                         "Pages/**/*",
                         "Services/**/*",
@@ -116,13 +116,14 @@
         {
             "condition": "(host == 'webapp')",
             "source": "./src/AntDesign.Pro",
-            "target": "./AntDesign.Pro.Template/AntDesign.Pro.Template.Client/",
+            "target": "./src/AntDesign.Pro.Template.Client/",
             "modifiers": [
                 {
                     "exclude": [
                         "AntDesign.Pro.csproj",
                         "AntDesign.Pro.csproj.DotSettings",
-                        "gulpfile.js"
+                        "gulpfile.js",
+                        "App.razor"
                     ]
                 },
                 {
@@ -144,7 +145,7 @@
                     "exclude": [
                         "Components/**/*",
                         "Extensions/**/*",
-                        "Layouts/**/*",
+                        "Layouts/UserLayout.*",
                         "Models/**/*",
                         "Pages/**/*",
                         "Services/**/*",
@@ -232,12 +233,12 @@
         {
             "condition": "(host == 'webapp')",
             "source": "./.template.config/templates/wasm",
-            "target": "./AntDesign.Pro.Template/AntDesign.Pro.Template.Client/",
+            "target": "./src/AntDesign.Pro.Template.Client/",
             "modifiers": [
                  {
                     "exclude": [
                         "AntDesign.Pro.Template.csproj",
-                         "Program.cs"
+                        "Program.cs"
                     ]
                 },
                 {

diff --git a/.template.config/templates/server/AntDesign.Pro.Template.csproj b/.template.config/templates/server/AntDesign.Pro.Template.csproj
@@ -8,8 +8,8 @@
 
   <ItemGroup>
     <PackageReference Include="AntDesign.Charts" Version="0.4.0" />
-    <PackageReference Include="AntDesign.Extensions.Localization" Version="0.19.2" />
-    <PackageReference Include="AntDesign.ProLayout" Version="0.19.2" />
+    <PackageReference Include="AntDesign.Extensions.Localization" Version="0.19.3" />
+    <PackageReference Include="AntDesign.ProLayout" Version="0.19.3" />
     <PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
   </ItemGroup>
 

diff --git a/.template.config/templates/wasm/AntDesign.Pro.Template.csproj b/.template.config/templates/wasm/AntDesign.Pro.Template.csproj
@@ -7,8 +7,8 @@
 
   <ItemGroup>
     <PackageReference Include="AntDesign.Charts" Version="0.4.0" />
-    <PackageReference Include="AntDesign.Extensions.Localization" Version="0.19.2" />
-    <PackageReference Include="AntDesign.ProLayout" Version="0.19.2" />
+    <PackageReference Include="AntDesign.Extensions.Localization" Version="0.19.3" />
+    <PackageReference Include="AntDesign.ProLayout" Version="0.19.3" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />

diff --git a/.template.config/templates/webapp/AntDesign.Pro.Template.sln b/.template.config/templates/webapp/AntDesign.Pro.Template.sln
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.11.35005.142
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AntDesign.Pro.Template", "AntDesign.Pro.Template\AntDesign.Pro.Template\AntDesign.Pro.Template.csproj", "{B5934F21-93C6-46BA-B25D-C2D3B62EDCFC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AntDesign.Pro.Template", "src\AntDesign.Pro.Template\AntDesign.Pro.Template.csproj", "{B5934F21-93C6-46BA-B25D-C2D3B62EDCFC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AntDesign.Pro.Template.Client", "AntDesign.Pro.Template\AntDesign.Pro.Template.Client\AntDesign.Pro.Template.Client.csproj", "{21B555E8-4868-4C61-A487-269C436022FF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AntDesign.Pro.Template.Client", "src\AntDesign.Pro.Template.Client\AntDesign.Pro.Template.Client.csproj", "{21B555E8-4868-4C61-A487-269C436022FF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/...ient/AntDesign.Pro.Template.Client.csproj → ...ient/AntDesign.Pro.Template.Client.csproj b/...ient/AntDesign.Pro.Template.Client.csproj → ...ient/AntDesign.Pro.Template.Client.csproj
@@ -10,8 +10,8 @@
 
   <ItemGroup>
     <PackageReference Include="AntDesign.Charts" Version="0.4.0" />
-    <PackageReference Include="AntDesign.Extensions.Localization" Version="0.19.2" />
-    <PackageReference Include="AntDesign.ProLayout" Version="0.19.2" />
+    <PackageReference Include="AntDesign.Extensions.Localization" Version="0.19.3" />
+    <PackageReference Include="AntDesign.ProLayout" Version="0.19.3" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />

diff --git a/...ient/wwwroot/appsettings.Development.json → ...ient/wwwroot/appsettings.Development.json b/...ient/wwwroot/appsettings.Development.json → ...ient/wwwroot/appsettings.Development.json
diff --git a/....Template.Client/wwwroot/appsettings.json → ....Template.Client/wwwroot/appsettings.json b/....Template.Client/wwwroot/appsettings.json → ....Template.Client/wwwroot/appsettings.json
diff --git a/...ro.Template/AntDesign.Pro.Template.csproj → ...ro.Template/AntDesign.Pro.Template.csproj b/...ro.Template/AntDesign.Pro.Template.csproj → ...ro.Template/AntDesign.Pro.Template.csproj
diff --git a/...tDesign.Pro.Template/Components/App.razor → ...tDesign.Pro.Template/Components/App.razor b/...tDesign.Pro.Template/Components/App.razor → ...tDesign.Pro.Template/Components/App.razor
diff --git a/...Pro.Template/Components/Pages/Error.razor → ...Pro.Template/Components/Pages/Error.razor b/...Pro.Template/Components/Pages/Error.razor → ...Pro.Template/Components/Pages/Error.razor
diff --git a/...gn.Pro.Template/Components/_Imports.razor → ...gn.Pro.Template/Components/_Imports.razor b/...gn.Pro.Template/Components/_Imports.razor → ...gn.Pro.Template/Components/_Imports.razor
diff --git a/...emplate/AntDesign.Pro.Template/Program.cs → ...app/src/AntDesign.Pro.Template/Program.cs b/...emplate/AntDesign.Pro.Template/Program.cs → ...app/src/AntDesign.Pro.Template/Program.cs
diff --git a/...o.Template/Properties/launchSettings.json → ...o.Template/Properties/launchSettings.json b/...o.Template/Properties/launchSettings.json → ...o.Template/Properties/launchSettings.json
diff --git a/...Pro.Template/appsettings.Development.json → ...Pro.Template/appsettings.Development.json b/...Pro.Template/appsettings.Development.json → ...Pro.Template/appsettings.Development.json
diff --git a/...e/AntDesign.Pro.Template/appsettings.json → ...c/AntDesign.Pro.Template/appsettings.json b/...e/AntDesign.Pro.Template/appsettings.json → ...c/AntDesign.Pro.Template/appsettings.json
diff --git a/...te/AntDesign.Pro.Template/wwwroot/app.css → ...rc/AntDesign.Pro.Template/wwwroot/app.css b/...te/AntDesign.Pro.Template/wwwroot/app.css → ...rc/AntDesign.Pro.Template/wwwroot/app.css
diff --git a/src/AntDesign.Pro.WebApp/AntDesign.Pro.WebApp.csproj b/src/AntDesign.Pro.WebApp/AntDesign.Pro.WebApp.csproj
@@ -14,8 +14,4 @@
     <ProjectReference Include="..\AntDesign.Pro\AntDesign.Pro.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="wwwroot\" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/AntDesign.Pro/AntDesign.Pro.csproj b/src/AntDesign.Pro/AntDesign.Pro.csproj
@@ -12,8 +12,8 @@
 
   <ItemGroup>
     <PackageReference Include="AntDesign.Charts" Version="0.5.1" />
-    <PackageReference Include="AntDesign.Extensions.Localization" Version="0.19.2" />
-    <PackageReference Include="AntDesign.ProLayout" Version="0.19.2" />
+    <PackageReference Include="AntDesign.Extensions.Localization" Version="0.19.3" />
+    <PackageReference Include="AntDesign.ProLayout" Version="0.19.3" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
@@ -48,4 +48,20 @@
     <Watch Include="**\*.less" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Update="Resources\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Resources\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <CustomToolNamespace>AntDesign.Pro.Template</CustomToolNamespace>
+    </EmbeddedResource>
+  </ItemGroup>
+
 </Project>
diff --git a/src/AntDesign.Pro/Components/GlobalHeader/RightContent.razor.cs b/src/AntDesign.Pro/Components/GlobalHeader/RightContent.razor.cs
@@ -54,7 +54,7 @@ public partial class RightContent
         [Inject] protected IProjectService ProjectService { get; set; }
         [Inject] protected MessageService MessageService { get; set; }
 
-        [Inject] private IStringLocalizer<App> L { get; set; }
+        [Inject] private IStringLocalizer<Resources> L { get; set; }
         [Inject] private ILocalizationService LocalizationService { get; set; }
 
         protected override async Task OnInitializedAsync()

diff --git a/src/AntDesign.Pro/Layouts/BasicLayout.razor b/src/AntDesign.Pro/Layouts/BasicLayout.razor
@@ -1,6 +1,8 @@
 @namespace AntDesign.Pro.Template
 @inherits LayoutComponentBase
+@* //#if (full)*@
 @implements IDisposable
+@*#//#endif*@
 
 <AntDesign.ProLayout.BasicLayout 
     Logo="@("https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg")"
@@ -18,9 +20,9 @@
         </Space>
     </HeaderContentRender>
     <RightContentRender>
-        //#if (full)
+        @*//#if (full)*@
         <AntDesign.Pro.Template.Components.RightContent />
-        //#endif
+        @*//#endif*@
     </RightContentRender>
     <ChildContent>
         <ReuseTabs></ReuseTabs>

diff --git a/src/AntDesign.Pro/Program.cs b/src/AntDesign.Pro/Program.cs
@@ -2,7 +2,9 @@
 using System.Net.Http;
 using System.Threading.Tasks;
 using AntDesign.ProLayout;
+//#if (full)
 using AntDesign.Pro.Template.Services;
+//#endif
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 
@@ -28,7 +30,7 @@ public static async Task Main(string[] args)
         public static void AddClientServices(IServiceCollection services)
         {
             services.AddAntDesign();
-
+            //#if (full)
             services.AddInteractiveStringLocalizer();
             services.AddLocalization(options => options.ResourcesPath = "Resources");
 
@@ -37,6 +39,7 @@ public static void AddClientServices(IServiceCollection services)
             services.AddScoped<IUserService, UserService>();
             services.AddScoped<IAccountService, AccountService>();
             services.AddScoped<IProfileService, ProfileService>();
+            //#endif
         }
     }
 }
diff --git a/src/AntDesign.Pro/Resources/Resources.Designer.cs b/src/AntDesign.Pro/Resources/Resources.Designer.cs
diff --git a/src/AntDesign.Pro/Resources/App.resx → src/AntDesign.Pro/Resources/Resources.resx b/src/AntDesign.Pro/Resources/App.resx → src/AntDesign.Pro/Resources/Resources.resx
diff --git a/src/AntDesign.Pro/Resources/App.zh-CN.resx → ...Design.Pro/Resources/Resources.zh-CN.resx b/src/AntDesign.Pro/Resources/App.zh-CN.resx → ...Design.Pro/Resources/Resources.zh-CN.resx