Skip to content

Feat(set culture api)url safe unescaped # 4436 #4439

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Feat(set culture api)url safe unescaped # 4436 #4439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75c673e
feat(Link): 添加 Rel 属性参数 #4437
densen2014 Oct 11, 2024
2c4900e
修正使用 UriFormat.Unescaped 局限性
densen2014 Oct 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/BootstrapBlazor.Server/Components/Components/CultureChooser.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/BootstrapBlazor.Server/Components/Layout/HomeLayout.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/BootstrapBlazor.Server/Components/Pages/Localization.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/BootstrapBlazor/Components/HtmlTag/Link.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@namespace BootstrapBlazor.Components
@inherits BootstrapComponentBase

<link @attributes="AdditionalAttributes" href="@GetHref()" rel="stylesheet" />
<link @attributes="AdditionalAttributes" href="@GetHref()" rel="@Rel" />
7 changes: 7 additions & 0 deletions src/BootstrapBlazor/Components/HtmlTag/Link.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@ public partial class Link
[EditorRequired]
public string? Href { get; set; }

/// <summary>
/// 获得/设置 Rel 属性值, 默认 stylesheet
/// </summary>
[Parameter]
[EditorRequired]
public string? Rel { get; set; }= "stylesheet";

/// <summary>
/// 获得/设置 版本号 默认 null 自动生成
/// </summary>
Expand Down