fix: fix breadcumb text display for url decoded paramter (#686)

datetimepicker add class d-flex
masastack · Mar 21, 2024 · 2255823 · 2255823
1 parent caf6f64
commit 2255823
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/src/Masa.Stack.Components/Masa.Stack.Components.csproj b/src/Masa.Stack.Components/Masa.Stack.Components.csproj
@@ -22,10 +22,10 @@
 		<PackageReference Include="Masa.Utils.Extensions.Enums" Version="1.0.1-preview.1" />
 		<PackageReference Include="Masa.Contrib.Configuration.ConfigurationApi.Dcc" Version="1.0.1-preview.1" />
 		<PackageReference Include="Masa.Contrib.Storage.ObjectStorage.Aliyun" Version="1.0.1-preview.1" />
-		<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.15" />
-		<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="6.0.6" />
 		<PackageReference Include="Masa.Contrib.Configuration" Version="1.0.1-preview.1" />
 		<PackageReference Include="Masa.Contrib.StackSdks.Isolation" Version="1.0.1-preview.1" />
+		<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.15" />
+		<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="6.0.6" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/Masa.Stack.Components/Shared/IntegrationComponents/DateTime/SDateTimeRangePicker.razor b/src/Masa.Stack.Components/Shared/IntegrationComponents/DateTime/SDateTimeRangePicker.razor
@@ -12,7 +12,7 @@
                      Style="@DateTimeButtonStyle"
                      @attributes="@context.Attrs">
                 <MIcon Size="20" Class="mx-2">mdi-calendar-month</MIcon>
-                <div style="width: calc(100% - 28px)">
+                <div style="width: calc(100% - 28px)" class="d-flex">
                     <div class="datetimetext">@FormatDateTime(StartDateTime, T("Start time"))</div>
                     <MDivider Vertical Class="mx-2" Style="align-self: auto; height: 14px;"/>
                     <div class="datetimetext">@FormatDateTime(EndDateTime, T("End time"))</div>

diff --git a/src/Masa.Stack.Components/Shared/IntegrationComponents/DateTime/STimeSelector.razor b/src/Masa.Stack.Components/Shared/IntegrationComponents/DateTime/STimeSelector.razor
@@ -1,7 +1,7 @@
 @namespace Masa.Stack.Components
 @inherits MasaComponentBase
 
-<div class="time-selector">
+<div class="time-selector d-flex">
     <MAutocomplete Value="hour"
                    ValueChanged="OnHourSelect"
                    Items="ValidHours"

diff --git a/src/Masa.Stack.Components/Shared/Layouts/Components/Breadcrumbs.razor.cs b/src/Masa.Stack.Components/Shared/Layouts/Components/Breadcrumbs.razor.cs
@@ -1,4 +1,6 @@
-namespace Masa.Stack.Components.Layouts
+using System.Web;
+
+namespace Masa.Stack.Components.Layouts
 {
     public partial class Breadcrumbs : MasaComponentBase
     {
@@ -131,7 +133,7 @@ string GetIntersection(string left, string right)
             {
                 Items.Add(new BreadcrumbItem()
                 {
-                    Text = extra
+                    Text = HttpUtility.UrlDecode(extra)
                 });
             }