use base url for sceond app

ant-design-blazor · Dec 10, 2023 · 72cfffa · 72cfffa
1 parent 18ecb15
commit 72cfffa
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 50 deletions.
diff --git a/src/layout/src/AntDesign.ProLayout.csproj b/src/layout/src/AntDesign.ProLayout.csproj
@@ -24,31 +24,17 @@
  </ItemGroup>
 
  <ItemGroup>
- <PackageReference Include="AntDesign" Version="0.16.2" />
+ <!--<PackageReference Include="AntDesign" Version="0.16.2" />-->
  </ItemGroup>
 
  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' And '$(SolutionDir)'==''">
  <SolutionDir>../../../</SolutionDir>
  </PropertyGroup>
 
- <Target Name="DebugEnsureNodeEnv" BeforeTargets="Build" Condition=" '$(Configuration)' == 'Debug' And !Exists('$(SolutionDir)node_modules') ">
- <!-- Ensure Node.js is installed -->
- <Exec Command="node --version" ContinueOnError="true">
- <Output TaskParameter="ExitCode" PropertyName="ErrorCode" />
- </Exec>
- <Error Condition="'$(ErrorCode)' != '0'" Text="Node.js is required to build and run this project. To continue, please install Node.js from https://nodejs.org/, and then restart your command prompt or IDE." />
- <Message Importance="high" Text="Restoring dependencies using 'npm'. This may take several minutes..." />
- <Exec WorkingDirectory="$(SolutionDir)" Command="npm install" />
- </Target>
 
- <Target Name="DebugRunGulp" BeforeTargets="DebugEnsureNodeEnv" Condition=" '$(Configuration)' == 'Debug' And Exists('$(SolutionDir)node_modules') ">
- <Exec WorkingDirectory="$(SolutionDir)" Command="npm run gulp:layout" />
- </Target>
-
- <Target Name="PublishRunGulp" AfterTargets="ComputeFilesToPublish">
- <Exec WorkingDirectory="$(SolutionDir)" Command="npm install" />
- <Exec WorkingDirectory="$(SolutionDir)" Command="npm run gulp:layout" />
- </Target>
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\..\ant-design-blazor\components\AntDesign.csproj" />
+ </ItemGroup>
 
  <ItemGroup>
  <Content Update="**\*.razor">

diff --git a/src/layout/src/SiderMenu/BaseMenu.razor b/src/layout/src/SiderMenu/BaseMenu.razor
@@ -1,44 +1,58 @@
 @namespace AntDesign.ProLayout
+@using Microsoft.AspNetCore.Components.Routing
 @inherits AntProComponentBase
 
-<Menu
- Mode="Mode"
- DefaultOpenKeys="OpenKeys"
- Theme="NavTheme"
- Style="@Style"
- Accordion="@Accordion"
- Class="@ClassMapper.Class"
- OnOpenChange="SetOpenKeys">
- @menuItemTemplate((MenuData, false))
+<Menu Mode="Mode"
+ DefaultOpenKeys="OpenKeys"
+ Theme="NavTheme"
+ Style="@Style"
+ Accordion="@Accordion"
+ Class="@ClassMapper.Class"
+ OnOpenChange="SetOpenKeys">
+ @menuItemTemplate(MenuData, false)
 </Menu>
 
 @code
 {
- static readonly RenderFragment<MenuDataItem> title= menuItem => @<span>
- @if (!string.IsNullOrEmpty(menuItem.Icon))
- {
- <Icon Type="@menuItem.Icon" Theme="outline" />
- }
- <span>@menuItem.Name</span>
- </span>;
+ RenderFragment title(MenuDataItem menuItem) {
+
+ return @<span>
+ @if (!string.IsNullOrEmpty(menuItem.Icon))
+ {
+ <Icon Type="@menuItem.Icon" Theme="outline" />
+ }
+ <span>@menuItem.Name</span>
+ </span>
+ ;
+ }
+
+ RenderFragment menuItemTemplate(MenuDataItem[] items, bool isChildren)
+ {
+ @if (items == null)
+ {
+ return builder => { };
+ }
 
- static readonly RenderFragment<(MenuDataItem[] items, bool isChildren)> menuItemTemplate = context =>
- @<Template>
- @if (context.items != null)
+ return builder =>
+ {
+
+ @foreach (var menuItem in items)
  {
- @foreach (var menuItem in context.items)
+ if (menuItem.Children != null && !menuItem.HideChildrenInMenu)
+ {
+ builder.AddContent(1,
+ @<SubMenu TitleTemplate="@title(menuItem)" Key="@menuItem.Key">
+ @menuItemTemplate(menuItem.Children, true)
+ </SubMenu>);
+ }
+ else if (!menuItem.HideInMenu)
  {
- if (menuItem.Children != null && !menuItem.HideChildrenInMenu)
- {
- <SubMenu TitleTemplate="@title(menuItem)" Key="@menuItem.Key">
- @menuItemTemplate((menuItem.Children, true))
- </SubMenu>
- }
- else if (!menuItem.HideInMenu)
- {
- <MenuItem Key="@menuItem.Key" RouterLink="@menuItem.Path" RouterMatch="@menuItem.Match">@title(menuItem)</MenuItem>
- }
+ builder.AddContent(1,
+ @<MenuItem Key="@menuItem.Key" RouterLink="@menuItem.Path" RouterMatch="@menuItem.Match">
+ @title(menuItem)
+ </MenuItem>);
  }
  }
- </Template>;
+ };
+ }
 }
diff --git a/src/layout/src/SiderMenu/MenuDataItem.cs b/src/layout/src/SiderMenu/MenuDataItem.cs
@@ -14,6 +14,6 @@ public class MenuDataItem
  public string Key { get; set; }
  public string Path { get; set; }
  public string[] ParentKeys { get; set; }
- public NavLinkMatch Match { get; set; }
+ public NavLinkMatch Match { get; set; } = NavLinkMatch.All;
  }
 }