diff --git a/Masa.Blazor.Pro.Client/Layout/Navigation.razor b/Masa.Blazor.Pro.Client/Layout/Navigation.razor index 1fbb780..30674a2 100644 --- a/Masa.Blazor.Pro.Client/Layout/Navigation.razor +++ b/Masa.Blazor.Pro.Client/Layout/Navigation.razor @@ -12,7 +12,7 @@ MiniVariant="@GlobalConfig.ExpandOnHover" App> @@ -21,39 +21,39 @@ { if (nav.Children is null) { - - - + + + @nav.Icon -
@T(nav.Title)
+
@T(nav.Title)
-
-
-
+ + + } else { -
@T(nav.Title)
+
@T(nav.Title)
@foreach (var navChild in nav.Children) { - - - + + +
@T(navChild.Title)
-
-
-
+ + + }
@@ -73,8 +73,7 @@ @code { - [Inject] - public MasaBlazor Masa { get; set; } = default!; + [Inject] public MasaBlazor Masa { get; set; } = default!; private CancellationTokenSource? _cancellationTokenSource; @@ -125,4 +124,4 @@ GlobalConfig.ExpandOnHoverChanged -= GlobalConfigChanged; } -} +} \ No newline at end of file diff --git a/Masa.Blazor.Pro.Client/Masa.Blazor.Pro.Client.csproj b/Masa.Blazor.Pro.Client/Masa.Blazor.Pro.Client.csproj index 297406c..6bc9ee3 100644 --- a/Masa.Blazor.Pro.Client/Masa.Blazor.Pro.Client.csproj +++ b/Masa.Blazor.Pro.Client/Masa.Blazor.Pro.Client.csproj @@ -9,8 +9,8 @@ - - + + - + diff --git a/Masa.Blazor.Pro/Dockerfile b/Masa.Blazor.Pro/Dockerfile index 2842b7f..9769e9f 100644 --- a/Masa.Blazor.Pro/Dockerfile +++ b/Masa.Blazor.Pro/Dockerfile @@ -1,12 +1,12 @@ #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging. -FROM registry.cn-hangzhou.aliyuncs.com/masa/dotnet_aspnet:8.0-1 AS base +FROM registry.cn-hangzhou.aliyuncs.com/masa/dotnet_aspnet:8.0.3 AS base WORKDIR /app ENV ASPNETCORE_URLS=http://0.0.0.0:80 EXPOSE 80 EXPOSE 443 -FROM registry.cn-hangzhou.aliyuncs.com/masa/dotnet_sdk:8.0.100-1 AS build +FROM registry.cn-hangzhou.aliyuncs.com/masa/sdk:8.0.203 AS build WORKDIR /src COPY ["Masa.Blazor.Pro/Masa.Blazor.Pro.csproj", "Masa.Blazor.Pro/"] RUN dotnet restore "Masa.Blazor.Pro/Masa.Blazor.Pro.csproj" diff --git a/Masa.Blazor.Pro/Masa.Blazor.Pro.csproj b/Masa.Blazor.Pro/Masa.Blazor.Pro.csproj index 360cede..62efe03 100644 --- a/Masa.Blazor.Pro/Masa.Blazor.Pro.csproj +++ b/Masa.Blazor.Pro/Masa.Blazor.Pro.csproj @@ -8,7 +8,7 @@ - +