Skip to content

Commit 317382d

Browse files
committed
Merge branch 'master' into feat-ip
2 parents 5a68835 + da35f14 commit 317382d

28 files changed

Lines changed: 141 additions & 77 deletions
Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
22

33
<PropertyGroup>
4-
<Version>10.0.0</Version>
4+
<Version>10.0.2</Version>
55
</PropertyGroup>
66

77
<PropertyGroup>
@@ -10,15 +10,17 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="BootstrapBlazor" Version="$(BBVersion)" />
13+
<Content Remove="wwwroot\readme.txt" />
14+
<None Include="wwwroot\readme.txt" />
1415
</ItemGroup>
1516

1617
<ItemGroup>
17-
<Using Include="Microsoft.JSInterop" />
18+
<PackageReference Include="BootstrapBlazor" Version="$(BBVersion)" />
1819
</ItemGroup>
1920

2021
<ItemGroup>
2122
<Using Include="BootstrapBlazor.Components" />
23+
<Using Include="Microsoft.JSInterop" />
2224
</ItemGroup>
2325

2426
</Project>

src/components/BootstrapBlazor.EmbedPDF/EmbedPDF.razor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public partial class EmbedPDF
7878
/// <para lang="en">Gets or sets a value indicating whether to keep the current opened document when resetting the URL, default is false</para>
7979
/// </summary>
8080
[Parameter]
81-
public uint IsKeepCurrentDocument { get; set; }
81+
public bool IsKeepCurrentDocument { get; set; }
8282

8383
private string? StyleString => CssBuilder.Default()
8484
.AddClass("border: 1px solid var(--bs-border-color); border-radius: var(--bs-border-radius); overflow: hidden;", ShowBorder)

src/components/BootstrapBlazor.EmbedPDF/EmbedPDFScrollStrategy.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,21 @@
77
namespace BootstrapBlazor.Components;
88

99
/// <summary>
10-
/// 滚动方向枚举
10+
/// <para lang="zh">滚动方向枚举</para>
11+
/// <para lang="en">Scroll strategy enumeration</para>
1112
/// </summary>
1213
public enum EmbedPDFScrollStrategy
1314
{
1415
/// <summary>
15-
/// 垂直方向
16+
/// <para lang="zh">垂直方向</para>
17+
/// <para lang="en">Vertical</para>
1618
/// </summary>
1719
[Description("vertical")]
1820
Vertical,
1921

2022
/// <summary>
21-
/// 水平方向
23+
/// <para lang="zh">水平方向</para>
24+
/// <para lang="en">Horizontal</para>
2225
/// </summary>
2326
[Description("horizontal")]
2427
Horizontal

src/components/BootstrapBlazor.EmbedPDF/EmbedPDFTabBarMode.cs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,28 @@
77
namespace BootstrapBlazor.Components;
88

99
/// <summary>
10-
/// 标签模式
10+
/// <para lang="zh">标签模式枚举</para>
11+
/// <para lang="en">Tab bar mode enumeration</para>
1112
/// </summary>
1213
public enum EmbedPDFTabBarMode
1314
{
1415
/// <summary>
15-
/// 始终显示
16+
/// <para lang="zh">始终显示</para>
17+
/// <para lang="en">Always show</para>
1618
/// </summary>
1719
[Description("always")]
1820
Always,
1921

2022
/// <summary>
21-
/// 多标签模式
23+
/// <para lang="zh">多标签模式</para>
24+
/// <para lang="en">Multiple tabs mode</para>
2225
/// </summary>
2326
[Description("multiple")]
2427
Multiple,
2528

2629
/// <summary>
27-
/// 不显示
30+
/// <para lang="zh">不显示</para>
31+
/// <para lang="en">Never show</para>
2832
/// </summary>
2933
[Description("never")]
3034
Never

src/components/BootstrapBlazor.EmbedPDF/EmbedPDFTheme.cs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,28 @@
77
namespace BootstrapBlazor.Components;
88

99
/// <summary>
10-
/// 主题枚举
10+
/// <para lang="zh">主题枚举</para>
11+
/// <para lang="en">Theme enumeration</para>
1112
/// </summary>
1213
public enum EmbedPDFTheme
1314
{
1415
/// <summary>
15-
/// 跟随系统
16+
/// <para lang="zh">跟随系统</para>
17+
/// <para lang="en">Follow system</para>
1618
/// </summary>
1719
[Description("system")]
1820
System,
1921

2022
/// <summary>
21-
/// 明亮模式
23+
/// <para lang="zh">明亮模式</para>
24+
/// <para lang="en">Light mode</para>
2225
/// </summary>
2326
[Description("light")]
2427
Light,
2528

2629
/// <summary>
27-
/// 暗黑模式
30+
/// <para lang="zh">暗黑模式</para>
31+
/// <para lang="en">Dark mode</para>
2832
/// </summary>
2933
[Description("dark")]
3034
Dark

src/components/BootstrapBlazor.EmbedPDF/wwwroot/browser-BISJ9naB-DfsGA31F.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)