fix: build error without full pages (#193)

* fix: build error without full pages * fix using
ant-design-blazor · Aug 23, 2024 · 6710442 · 6710442
1 parent 808be9a
commit 6710442
Show file tree

Hide file tree

Showing 13 changed files with 98 additions and 73 deletions.
diff --git a/.template.config/templates/server/AntDesign.Pro.Template.csproj b/.template.config/templates/server/AntDesign.Pro.Template.csproj
@@ -10,6 +10,7 @@
     <PackageReference Include="AntDesign.Charts" Version="0.4.0" />
     <PackageReference Include="AntDesign.Extensions.Localization" Version="0.20.2.1" />
     <PackageReference Include="AntDesign.ProLayout" Version="0.20.2.1" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
     <PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
   </ItemGroup>
 

diff --git a/.template.config/templates/server/_Imports.razor b/.template.config/templates/server/_Imports.razor
@@ -8,6 +8,7 @@
 @using Microsoft.AspNetCore.Components.Web
 @using Microsoft.JSInterop
 @using AntDesign.Pro.Template
+@using AntDesign.Pro.Template.Layouts
 @using AntDesign.Extensions.Localization
 @using System.Globalization
 //#if (full)

diff --git a/.template.config/templates/wasm/AntDesign.Pro.Template.csproj b/.template.config/templates/wasm/AntDesign.Pro.Template.csproj
@@ -3,6 +3,8 @@
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <RazorLangVersion>3.0</RazorLangVersion>
+    <ImplicitUsings>enable</ImplicitUsings>
+	  <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
@@ -11,6 +13,7 @@
     <PackageReference Include="AntDesign.ProLayout" Version="0.20.2.1" />
     <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.Http" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
     <PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
   </ItemGroup>

diff --git a/.template.config/templates/wasm/_Imports.razor b/.template.config/templates/wasm/_Imports.razor
@@ -9,6 +9,7 @@
 @using Microsoft.AspNetCore.Components.WebAssembly.Http
 @using Microsoft.JSInterop
 @using AntDesign.Pro.Template
+@using AntDesign.Pro.Template.Layouts
 @using AntDesign.Extensions.Localization
 @using System.Globalization
 //#if (full)

diff --git a/...g/templates/webapp/src/AntDesign.Pro.Template.Client/AntDesign.Pro.Template.Client.csproj b/...g/templates/webapp/src/AntDesign.Pro.Template.Client/AntDesign.Pro.Template.Client.csproj
@@ -14,6 +14,7 @@
     <PackageReference Include="AntDesign.ProLayout" Version="0.20.2.1" />
     <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.Http" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
     <PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
   </ItemGroup>

diff --git a/src/AntDesign.Pro/AntDesign.Pro.csproj b/src/AntDesign.Pro/AntDesign.Pro.csproj
@@ -2,12 +2,12 @@
 
   <PropertyGroup>
     <TargetFramework>net8</TargetFramework>
-	<ImplicitUsings>enable</ImplicitUsings>
-	<Nullable>enable</Nullable>
+	  <ImplicitUsings>enable</ImplicitUsings>
+	  <Nullable>enable</Nullable>
     <AssemblyName>AntDesign.Pro.Template</AssemblyName>
     <RootNamespace>AntDesign.Pro.Template</RootNamespace>
-	<NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
-	<StaticWebAssetProjectMode>Default</StaticWebAssetProjectMode>
+	  <NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
+	  <StaticWebAssetProjectMode>Default</StaticWebAssetProjectMode>
   </PropertyGroup>
 
   <ItemGroup>
@@ -16,6 +16,7 @@
     <PackageReference Include="AntDesign.ProLayout" Version="0.20.2.1" />
     <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.Http" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
     <PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
   </ItemGroup>

diff --git a/src/AntDesign.Pro/GlobalUsings.cs b/src/AntDesign.Pro/GlobalUsings.cs
@@ -5,3 +5,5 @@
 #else 
 global using AntDesign.Pro.Resources;
 #endif
+
+global using AntDesign;
diff --git a/src/AntDesign.Pro/Layouts/BasicLayout.razor b/src/AntDesign.Pro/Layouts/BasicLayout.razor
@@ -1,8 +1,5 @@
-@namespace AntDesign.Pro.Template
+@namespace AntDesign.Pro.Template.Layouts
 @inherits LayoutComponentBase
-@* //#if (full)*@
-@implements IDisposable
-@*#//#endif*@
 
 <AntDesign.ProLayout.BasicLayout 
     Logo="@("https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg")"
@@ -31,80 +28,40 @@
         <FooterView Copyright="2021 Ant Design Blazor" Links="Links"></FooterView>
     </FooterRender>
 </AntDesign.ProLayout.BasicLayout>
+
 <SettingDrawer />
 
-@code
-{
+@code{
     bool collapsed;
-    private MenuDataItem[] _menuData = { };
-
-    [Inject] private ReuseTabsService TabService { get; set; }
-    //#if (full)
-
-    [Inject] private HttpClient HttpClient { get; set; }
-
-    [Inject] private ILocalizationService LocalizationService { get; set; }
-
-    private EventHandler<CultureInfo> _localizationChanged;
-
-    public void Dispose()
-    {
-        LocalizationService.LanguageChanged -= _localizationChanged;
-    }
 
-    //#endif
-
-    protected override async Task OnInitializedAsync()
+    public LinkItem[] Links =
     {
-#if IsNotFull
-        _menuData = new[]{
-            new MenuDataItem
+            new LinkItem
+            {
+                Key = "Ant Design Blazor",
+                Title = "Ant Design Blazor",
+                Href = "https://antblazor.com",
+                BlankTarget = true,
+            },
+            new LinkItem
             {
-                Path = "/",
-                Name = "welcome",
-                Key = "welcome",
-                Icon = "smile",
+                Key = "github",
+                Title = (RenderFragment)(@<Icon Type="github" />),
+                Href = "https://github.com/ant-design-blazor/ant-design-pro-blazor",
+                BlankTarget = true,
+            },
+            new LinkItem
+            {
+                Key = "Blazor",
+                Title = "Blazor",
+                Href = "https://dotnet.microsoft.com/apps/aspnet/web-apps/blazor?WT.mc_id=DT-MVP-5003987",
+                BlankTarget = true,
             }
-        };
-#else
-        _localizationChanged = (sender, args) => InvokeAsync(StateHasChanged);
-        LocalizationService.LanguageChanged += _localizationChanged;
-        _menuData = await HttpClient.GetFromJsonAsync<MenuDataItem[]>("data/menu.json");
-#endif
-    }
-
-    public LinkItem[] Links { get; set; } =
-    {
-        new LinkItem
-        {
-            Key = "Ant Design Blazor",
-            Title = "Ant Design Blazor",
-            Href = "https://antblazor.com",
-            BlankTarget = true,
-        },
-        new LinkItem
-        {
-            Key = "github",
-            Title = (RenderFragment)(@<Icon Type="github" />),
-            Href = "https://github.com/ant-design-blazor/ant-design-pro-blazor",
-            BlankTarget = true,
-        },
-        new LinkItem
-        {
-            Key = "Blazor",
-            Title = "Blazor",
-            Href = "https://dotnet.microsoft.com/apps/aspnet/web-apps/blazor?WT.mc_id=DT-MVP-5003987",
-            BlankTarget = true,
-        }
     };
 
     void Toggle()
     {
         collapsed = !collapsed;
     }
 
-    void Reload()
-    {
-        TabService.ReloadPage();
-    }
 }
diff --git a/src/AntDesign.Pro/Layouts/BasicLayout.razor.cs b/src/AntDesign.Pro/Layouts/BasicLayout.razor.cs
@@ -0,0 +1,58 @@
+using AntDesign.Extensions.Localization;
+using AntDesign.ProLayout;
+using Microsoft.AspNetCore.Components;
+using System.Globalization;
+using System.Net.Http.Json;
+
+namespace AntDesign.Pro.Template.Layouts
+{
+    public partial class BasicLayout : LayoutComponentBase, IDisposable
+    {
+        private MenuDataItem[] _menuData;
+
+        [Inject] private ReuseTabsService TabService { get; set; }
+        //#if (full)
+
+        [Inject] private HttpClient HttpClient { get; set; }
+
+        [Inject] private ILocalizationService LocalizationService { get; set; }
+
+        private EventHandler<CultureInfo> _localizationChanged;
+
+        //#endif
+
+        protected override async Task OnInitializedAsync()
+        {
+#if IsNotFull
+            _menuData = new[] {
+                new MenuDataItem
+                {
+                    Path = "/",
+                    Name = "welcome",
+                    Key = "welcome",
+                    Icon = "smile",
+                }
+            };
+#else
+            _localizationChanged = (sender, args) => InvokeAsync(StateHasChanged);
+            LocalizationService.LanguageChanged += _localizationChanged;
+            _menuData = await HttpClient.GetFromJsonAsync<MenuDataItem[]>("data/menu.json");
+#endif
+        }
+
+        void Reload()
+        {
+            TabService.ReloadPage();
+        }
+
+        public void Dispose()
+        {
+#if IsNotFull
+
+#else
+            LocalizationService.LanguageChanged -= _localizationChanged;
+#endif
+        }
+
+    }
+}
diff --git a/src/AntDesign.Pro/Layouts/UserLayout.razor b/src/AntDesign.Pro/Layouts/UserLayout.razor
@@ -1,4 +1,4 @@
-@namespace AntDesign.Pro.Template
+@namespace AntDesign.Pro.Template.Layouts
 @using OneOf
 @inherits LayoutComponentBase
 

diff --git a/src/AntDesign.Pro/Pages/List/Search/SearchList.razor b/src/AntDesign.Pro/Pages/List/Search/SearchList.razor
@@ -1,6 +1,5 @@
 @namespace AntDesign.Pro.Template.Pages.List
 @inherits LayoutComponentBase
-@layout AntDesign.Pro.Template.BasicLayout
 
 <PageContainer Title="Search"
                TabList="_tabList"

diff --git a/src/AntDesign.Pro/Routes.razor b/src/AntDesign.Pro/Routes.razor
@@ -1,7 +1,7 @@
 <Router AppAssembly="typeof(Program).Assembly">
     <Found Context="routeData">
         <CascadingValue Value="routeData">
-            <RouteView RouteData="routeData" DefaultLayout="typeof(AntDesign.Pro.Template.BasicLayout)" />
+            <RouteView RouteData="routeData" DefaultLayout="typeof(AntDesign.Pro.Template.Layouts.BasicLayout)" />
         </CascadingValue>
         <FocusOnNavigate RouteData="routeData" Selector="h1" />
     </Found>

diff --git a/src/AntDesign.Pro/_Imports.razor b/src/AntDesign.Pro/_Imports.razor
@@ -11,6 +11,7 @@
 @using AntDesign.Charts
 @using AntDesign.ProLayout
 @using AntDesign.Pro.Template
+@using AntDesign.Pro.Template.Layouts
 @using AntDesign.Pro.Template.Models
 @using AntDesign.Pro.Template.Services
 @using AntDesign.Extensions.Localization
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,3 +5,5 @@ @@
     #else
     global using AntDesign.Pro.Resources;
     #endif
+    global using AntDesign;