From 75c673ef76b6d53b4ad4dd782bc4a7041c5b0f3f Mon Sep 17 00:00:00 2001 From: Alex chow Date: Fri, 11 Oct 2024 22:17:52 +0200 Subject: [PATCH 1/2] =?UTF-8?q?feat(Link):=20=E6=B7=BB=E5=8A=A0=20Rel=20?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=8F=82=E6=95=B0=20#4437?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/HtmlTag/Link.razor | 2 +- src/BootstrapBlazor/Components/HtmlTag/Link.razor.cs | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/Components/HtmlTag/Link.razor b/src/BootstrapBlazor/Components/HtmlTag/Link.razor index 466a90f4f4e..2ad08e9304c 100644 --- a/src/BootstrapBlazor/Components/HtmlTag/Link.razor +++ b/src/BootstrapBlazor/Components/HtmlTag/Link.razor @@ -1,4 +1,4 @@ @namespace BootstrapBlazor.Components @inherits BootstrapComponentBase - + diff --git a/src/BootstrapBlazor/Components/HtmlTag/Link.razor.cs b/src/BootstrapBlazor/Components/HtmlTag/Link.razor.cs index 1556d4770e4..fda2e19f2e8 100644 --- a/src/BootstrapBlazor/Components/HtmlTag/Link.razor.cs +++ b/src/BootstrapBlazor/Components/HtmlTag/Link.razor.cs @@ -16,6 +16,13 @@ public partial class Link [EditorRequired] public string? Href { get; set; } + /// + /// 获得/设置 Rel 属性值, 默认 stylesheet + /// + [Parameter] + [EditorRequired] + public string? Rel { get; set; }= "stylesheet"; + /// /// 获得/设置 版本号 默认 null 自动生成 /// From 2c4900ee3df5c0675ea5ce8bea8c794e3f61a3d5 Mon Sep 17 00:00:00 2001 From: Alex chow Date: Fri, 11 Oct 2024 22:46:52 +0200 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BD=BF=E7=94=A8=20UriF?= =?UTF-8?q?ormat.Unescaped=20=E5=B1=80=E9=99=90=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Components/CultureChooser.razor.cs | 2 +- .../Components/Layout/HomeLayout.razor.cs | 2 +- src/BootstrapBlazor.Server/Components/Pages/Localization.razor | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/BootstrapBlazor.Server/Components/Components/CultureChooser.razor.cs b/src/BootstrapBlazor.Server/Components/Components/CultureChooser.razor.cs index 9569f95ff37..09fcfa9dc3a 100644 --- a/src/BootstrapBlazor.Server/Components/Components/CultureChooser.razor.cs +++ b/src/BootstrapBlazor.Server/Components/Components/CultureChooser.razor.cs @@ -68,7 +68,7 @@ private async Task SetCulture(SelectedItem item) if (SelectedCulture != item.Value) { var culture = item.Value; - var uri = new Uri(NavigationManager.Uri).GetComponents(UriComponents.PathAndQuery, UriFormat.Unescaped); + var uri = new Uri(NavigationManager.Uri).GetComponents(UriComponents.PathAndQuery, UriFormat.SafeUnescaped); var query = $"?culture={Uri.EscapeDataString(culture)}&redirectUri={Uri.EscapeDataString(uri)}"; // use a path that matches your culture redirect controller from the previous steps diff --git a/src/BootstrapBlazor.Server/Components/Layout/HomeLayout.razor.cs b/src/BootstrapBlazor.Server/Components/Layout/HomeLayout.razor.cs index 429a07260ad..8d8834185c7 100644 --- a/src/BootstrapBlazor.Server/Components/Layout/HomeLayout.razor.cs +++ b/src/BootstrapBlazor.Server/Components/Layout/HomeLayout.razor.cs @@ -96,7 +96,7 @@ private Task SetLang(string cultureName) // 使用 api 方式 适用于 Server-Side 模式 if (SelectedCulture != cultureName) { - var uri = new Uri(NavigationManager.Uri).GetComponents(UriComponents.PathAndQuery, UriFormat.Unescaped); + var uri = new Uri(NavigationManager.Uri).GetComponents(UriComponents.PathAndQuery, UriFormat.SafeUnescaped); var query = $"?culture={Uri.EscapeDataString(cultureName)}&redirectUri={Uri.EscapeDataString(uri)}"; // use a path that matches your culture redirect controller from the previous steps diff --git a/src/BootstrapBlazor.Server/Components/Pages/Localization.razor b/src/BootstrapBlazor.Server/Components/Pages/Localization.razor index 2e66b96f35f..b18a0e88c7d 100644 --- a/src/BootstrapBlazor.Server/Components/Pages/Localization.razor +++ b/src/BootstrapBlazor.Server/Components/Pages/Localization.razor @@ -184,7 +184,7 @@ public class CultureController : Controller if (SelectedCulture != item.Value) { var culture = item.Value; - var uri = new Uri(NavigationManager.Uri).GetComponents(UriComponents.PathAndQuery, UriFormat.Unescaped); + var uri = new Uri(NavigationManager.Uri).GetComponents(UriComponents.PathAndQuery, UriFormat.SafeUnescaped); var query = $"?culture={Uri.EscapeDataString(culture)}&redirectUri={Uri.EscapeDataString(uri)}"; // use a path that matches your culture redirect controller from the previous steps