Merge branch 'main' into feat-rtl

Author: ArgoZhang

src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj

@@ -64,7 +64,7 @@
     <PackageReference Include="BootstrapBlazor.TagHelper" Version="9.0.0-beta01" />
     <PackageReference Include="BootstrapBlazor.Topology" Version="9.0.0-beta01" />
     <PackageReference Include="BootstrapBlazor.VideoPlayer" Version="9.0.0-beta01" />
-    <PackageReference Include="BootstrapBlazor.WinBox" Version="9.0.0-beta01" />
+    <PackageReference Include="BootstrapBlazor.WinBox" Version="9.0.0-beta02" />
     <PackageReference Include="Longbow.Logging" Version="9.0.0-beta01" />
     <PackageReference Include="Longbow.Tasks" Version="9.0.0-beta01" />
   </ItemGroup>

src/BootstrapBlazor.Server/Components/Samples/Handwrittens.razor

@@ -5,9 +5,8 @@
 
 <h4>@Localizer["SubTitle"]</h4>
 
-<DemoBlock Title="@Localizer["BaseUsageText"]" Introduction="@Localizer["IntroText1"]" Name="Normal">
-    <Handwritten HandwrittenBase64="e => DrawBase64 = e" />
-    <textarea type="text" class="form-control mt-3" readonly rows="5" @bind="DrawBase64" />
-</DemoBlock>
+<Tips>
+    <div>@((MarkupString)Localizer["Tips"].Value)</div>
+</Tips>
 
 <AttributeTable Items="@GetAttributes()" />

src/BootstrapBlazor.Server/Components/Samples/Handwrittens.razor.cs

@@ -6,7 +6,7 @@
 namespace BootstrapBlazor.Server.Components.Samples;
 
 /// <summary>
-/// HandwrittenPage
+/// Handwritten 组件示例代码
 /// </summary>
 public sealed partial class Handwrittens
 {

src/BootstrapBlazor.Server/Locales/en-US.json

@@ -5730,6 +5730,7 @@
   "BootstrapBlazor.Server.Components.Samples.Handwrittens": {
     "Title": "Handwritten",
     "SubTitle": "Used to save the mobile terminal signature as Base64 encoded string",
+    "Tips": "Deprecated, please use the <a href=\"signature-pad\">BootstrapBlazor.SignaturePad</a> component",
     "BaseUsageText": "Basic usage",
     "IntroText1": "Touch device handwritten signature as Base64.",
     "IntroText2": "For desktop browser testing, please use F12 to simulate a touch device.",

src/BootstrapBlazor.Server/Locales/zh-CN.json

@@ -5730,6 +5730,7 @@
   "BootstrapBlazor.Server.Components.Samples.Handwrittens": {
     "Title": "Handwritten 手写签名",
     "SubTitle": "用于移动终端签名保存为 Base64 编码字符串",
+    "Tips": "已弃用，请使用 <a href=\"signature-pad\">BootstrapBlazor.SignaturePad</a> 组件，已知问题在弹窗中无法签名",
     "BaseUsageText": "基础用法",
     "IntroText1": "触摸设备直接手写签名保存为 Base64",
     "IntroText2": "桌面浏览器测试请用F12模拟为触摸设备",

src/BootstrapBlazor/Components/Handwritten/Handwritten.razor.cs

@@ -10,6 +10,8 @@ namespace BootstrapBlazor.Components;
 /// <summary>
 /// Handwritten 手写签名
 /// </summary>
+[Obsolete("已弃用，请使用 BootstrapBlazor.SignaturePad 代替；Deprecated, use BootstrapBlazor.SignaturePad instead")]
+[ExcludeFromCodeCoverage]
 public partial class Handwritten
 {
     /// <summary>

src/BootstrapBlazor/Components/Table/Table.razor

@@ -226,7 +226,7 @@
                         if (RowTemplate != null)
                         {
                             var columns = GetVisibleColumns();
-                            @RowTemplate(new(item, columns))
+                            @RowTemplate(new(item, columns, ActiveRenderMode))
                         }
                         else
                         {
@@ -259,7 +259,7 @@
                                 @if (RowContentTemplate != null)
                                 {
                                     var columns = GetVisibleColumns();
-                                    @RowContentTemplate(new(item, columns))
+                                    @RowContentTemplate(new(item, columns, ActiveRenderMode))
                                 }
                                 else
                                 {
@@ -393,7 +393,7 @@
                     if (RowTemplate != null)
                     {
                         var columns = GetVisibleColumns();
-                        @RowTemplate(new(item, columns))
+                        @RowTemplate(new(item, columns, ActiveRenderMode))
                     }
                     else
                     {
@@ -728,7 +728,7 @@
         @if (RowContentTemplate != null)
         {
             var columns = GetVisibleColumns();
-            @RowContentTemplate(new (item, columns));
+            @RowContentTemplate(new (item, columns, ActiveRenderMode));
         }
         else
         {

src/BootstrapBlazor/Components/Table/TableRowContext.cs

@@ -10,8 +10,14 @@ namespace BootstrapBlazor.Components;
 /// </summary>
 /// <param name="model"></param>
 /// <param name="columns"></param>
-public class TableRowContext<TItem>(TItem model, IEnumerable<ITableColumn> columns)
+/// <param name="renderMode"></param>
+public class TableRowContext<TItem>(TItem model, IEnumerable<ITableColumn> columns, TableRenderMode renderMode)
 {
+    /// <summary>
+    /// 获得/设置 当前渲染模式
+    /// </summary>
+    public TableRenderMode RenderMode { get; } = renderMode;
+
     /// <summary>
     /// 获得/设置 行数据实例
     /// </summary>
@@ -21,5 +27,5 @@ public class TableRowContext<TItem>(TItem model, IEnumerable<ITableColumn> colum
     /// <summary>
     /// 获得/设置 当前绑定字段数据实例
     /// </summary>
-    public IEnumerable<ITableColumn> Columns => columns;
+    public IEnumerable<ITableColumn> Columns { get; } = columns;
 }

test/UnitTest/Components/HandwrittenTest.cs

@@ -7575,7 +7575,7 @@ public void TableColumnContext_Exception()
     [Fact]
     public void TableRowContext_Exception()
     {
-        Assert.Throws<ArgumentNullException>(() => new TableRowContext<Foo?>(null, [new InternalTableColumn("Name", typeof(string))]));
+        Assert.Throws<ArgumentNullException>(() => new TableRowContext<Foo?>(null, [new InternalTableColumn("Name", typeof(string))], TableRenderMode.Table));
     }
 
     [Fact]
@@ -8104,7 +8104,7 @@ public void RowContentTemplate_Ok(TableRenderMode mode)
                 });
                 pb.Add(a => a.RowContentTemplate, context => builder =>
                 {
-                    builder.OpenElement(0, "div");
+                    builder.OpenElement(0, context.RenderMode == TableRenderMode.CardView ? "div" : "tr");
                     builder.AddContent(1, $"template-{context.Row.Name}");
                     builder.CloseElement();
 
@@ -8141,7 +8141,7 @@ public void RowTemplate_Ok(TableRenderMode mode)
                 });
                 pb.Add(a => a.RowTemplate, context => builder =>
                 {
-                    builder.OpenElement(0, mode == TableRenderMode.CardView ? "div" : "tr");
+                    builder.OpenElement(0, context.RenderMode == TableRenderMode.CardView ? "div" : "tr");
                     builder.AddContent(1, new MarkupString(mode == TableRenderMode.CardView ? $"<div>template-{context.Row.Name}</div>" : $"<td>template-{context.Row.Name}</td>"));
                     builder.CloseElement();