Merge branch 'main' of https://github.com/dotnetcore/BootstrapBlazor

actions-user · actions-user · commit 1918c845c796 · 2025-07-20T01:45:45.000Z
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Html2Pdfs.razor b/src/BootstrapBlazor.Server/Components/Samples/Html2Pdfs.razor
@@ -26,6 +26,32 @@
 
 <PackageTips Name="BootstrapBlazor.Html2Pdf" />
 
+<p class="code-label">常见问题</p>
+
+<p class="code-quest">1. 本地或者发布后无法使用</p>
+<p class="code-answer"><code>BootstrapBlazor.Html2Pdf v9.0.3</code> 后增加了日志输出功能，可以根据日志判断具体问题出现在哪里。比如由于根据当前浏览器版本去下载对应版本的
+    <code>chrome-headless-shell-win64.zip</code> 安装包</p>
+<Pre>info: BootstrapBlazor.Components.DefaultPdfService[0]
+      Ready to start downloading browser
+info: BootstrapBlazor.Components.DefaultPdfService[0]
+      Browser downloaded successfully. installed browser 138.0.7204.101
+info: BootstrapBlazor.Components.DefaultPdfService[0]
+      Start your browser | Args: --no-sandbox, --disable-setuid-sandbox, --disable-web-security</Pre>
+
+<p class="code-quest">2. 如何手动安装 <code>Debian</code> Linux 系统的 <code>Chrome</code> 浏览器</p>
+<Pre>wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+sudo apt install ./google-chrome-stable_current_amd64.deb</Pre>
+
+<p class="code-quest">3. 如何检查 <code>Debian</code> Linux 系统 <code>Chrome</code> 依赖缺失</p>
+<ul class="ul-demo">
+    <li>检查是否可以连接到 Chrome 服务器</li>
+    <li>检查服务器是否有执行安装包权限</li>
+    <li>检查是否有依赖缺失</li>
+</ul>
+
+<p class="code-quest">4. 部署后是否会反复下载 Chrome 安装包</p>
+<p class="code-answer">不会，Html2Pdf 会检查是否存在安装目录安装成功后即不会重复下载安装操作</p>
+
 <DemoBlock Title="@Localizer["Html2PdfElementTitle"]" Introduction="@Localizer["Html2PdfElementIntro"]" Name="Normal">
     <section ignore>
         <p>@((MarkupString)Localizer["Html2PdfElementDesc"].Value)</p>
diff --git a/src/BootstrapBlazor.Server/Components/Samples/SocketFactories.razor b/src/BootstrapBlazor.Server/Components/Samples/SocketFactories.razor
@@ -54,16 +54,15 @@ private async Task CreateClient()
     // 创建 ITcpSocketClient 实例
     var client = TcpSocketFactory.GetOrCreate("localhost", 0);
 
-    // 设置 FixLengthDataPackageHandler 数据处理器处理数据定长 4 的数据
-    client.SetDataHandler(new FixLengthDataPackageHandler(4)
+    // 设置数据适配器 使用 FixLengthDataPackageHandler 数据处理器处理数据定长 4 的数据
+    var adapter = new DataPackageAdapter
     {
-        // 设置接收数据回调方法
-        ReceivedCallBack = buffer =>
-        {
-            // 内部自动处理粘包分包问题，这里参数 buffer 一定是定长为 4 的业务数据
-            receivedBuffer = buffer;
-            return Task.CompletedTask;
-        }
+        DataPackageHandler = new FixLengthDataPackageHandler(4)
+    };
+    client.SetDataPackageAdapter(adapter, buffer =>
+    {
+        // buffer 即是接收到的数据
+        return ValueTask.CompletedTask;
     });
 
     // 连接远端节点 连接成功后自动开始接收数据
@@ -78,8 +77,36 @@ private async Task CreateClient()
     <li><code>DelimiterDataPackageHandler</code> <b>分隔符数据处理器</b> 即通讯包以特定一个或一组字节分割</li>
 </ul>
 
-<p class="code-label">5. 数据适配器（设计中）</p>
+<p class="code-label">5. 数据适配器</p>
 
 <p>在我们实际应用中，接收到数据包后（已经过数据处理器）大多情况下是需要将电文转化为应用中的具体数据类型 <code>Class</code> 或 <code>Struct</code>。将原始数据包转化为类或者结构体的过程由我们的数据适配器来实现</p>
 
 <p>数据适配器设计思路如下</p>
+
+<ol class="ul-demo">
+    <li>使用 <code>SocketDataConverterAttribute</code> 标签约定通讯数据使用那个转换类型进行转换 指定类型需继承 <code>ISocketDataConverter</code>
+        接口
+    </li>
+    <li>使用 <code>SocketDataPropertyAttribute</code> 标签约定如何转换数据类型 （Property） 属性值</li>
+</ol>
+
+<Pre>[SocketDataConverter(Type = typeof(SocketDataConverter&lt;MockEntity&gt;))]
+class MockEntity
+{
+    [SocketDataProperty(Type = typeof(byte[]), Offset = 0, Length = 5)]
+    public byte[]? Header { get; set; }
+
+    [SocketDataProperty(Type = typeof(byte[]), Offset = 5, Length = 2)]
+    public byte[]? Body { get; set; }
+
+    [SocketDataProperty(Type = typeof(Foo), Offset = 7, Length = 1, ConverterType = typeof(FooConverter), ConverterParameters = ["test"])]
+    public string? Value1 { get; set; }
+}</Pre>
+
+<Pre>class FooConverter(string name) : ISocketDataPropertyConverter
+{
+    public object? Convert(ReadOnlyMemory&lt;byte&gt; data)
+    {
+        return new Foo() { Id = data.Span[0], Name = name };
+    }
+}</Pre>
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Sockets/Adapters.razor b/src/BootstrapBlazor.Server/Components/Samples/Sockets/Adapters.razor
@@ -41,8 +41,8 @@
     </ul>
     <p>本示例服务器端模拟了数据分包即响应数据实际是两次写入所以实际接收端是要通过两次接收才能得到一个完整的响应数据包，可通过 <b>数据适配器</b> 来简化接收逻辑。通过切换下方 <b>是否使用数据适配器</b> 控制开关进行测试查看实际数据接收情况。</p>
     <ul class="ul-demo">
-        <li>不使用 <b>数据处理器</b> 要分两次接收才能接收完整</li>
-        <li>使用 <b>数据处理器</b> 一次即可接收完整数据包</li>
+        <li>不使用 <b>数据适配器</b> 要分两次接收才能接收完整</li>
+        <li>使用 <b>数据适配器</b> 一次即可接收完整数据包</li>
     </ul>
     <Pre>private readonly DataPackageAdapter _dataAdapter = new()
 {
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Sockets/Adapters.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/Sockets/Adapters.razor.cs
@@ -48,10 +48,10 @@ protected override void OnInitialized()
         });
         _client.ReceivedCallBack += OnReceivedAsync;
 
-        _dataAdapter.ReceivedCallBack += async Data =>
+        _dataAdapter.ReceivedCallBack += async data =>
         {
             // 直接处理接收的数据
-            await UpdateReceiveLog(Data);
+            await UpdateReceiveLog(data);
         };
     }
 
@@ -104,7 +104,7 @@ private async ValueTask OnReceivedAsync(ReadOnlyMemory<byte> data)
 
     private async Task UpdateReceiveLog(ReadOnlyMemory<byte> data)
     {
-        var payload = System.Text.Encoding.UTF8.GetString(data.Span);
+        var payload = Encoding.UTF8.GetString(data.Span);
         var body = BitConverter.ToString(data.ToArray());
 
         _items.Add(new ConsoleMessageItem
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Sockets/DataEntities.razor b/src/BootstrapBlazor.Server/Components/Samples/Sockets/DataEntities.razor
@@ -9,7 +9,7 @@
            Name="Normal" ShowCode="false">
     <p>通过 <code>SocketDataConverterAttribute</code> 类标签与 <code>SocketDataPropertyAttribute</code>
         属性标签可以将通讯数据自动转化为我们系统中需要的业务实体类，示例如下：</p>
-    <Pre>[SocketDataConverter(Type = typeof(MockEntitySocketDataConverter))]
+    <Pre>[SocketDataConverter(Type = typeof(SocketDataConverter&lt;MockEntity&gt;))]
 class MockEntity
 {
     [SocketDataProperty(Type = typeof(byte[]), Offset = 0, Length = 5)]
@@ -26,8 +26,7 @@ class MockEntity
 }</Pre>
     <p class="code-label">1. <code>SocketDataConverter</code> 参数说明：</p>
     <ul class="ul-demo">
-        <li><b>Type</b>: 自定义转换器类型，组件库内置了 <code>SocketDataConverterBase</code> 泛型基类，继承后非常方便扩展出自己的转换器，重载
-            <code>TryConvertTo</code> 方法调用基类的 <code>Parse</code> 基本就完成了 99% 的工作量，也可以完全自己解析通讯电文到实体类的各个属性上
+        <li><b>Type</b>: 自定义转换器类型，组件库内置了 <code>SocketDataConverter</code> 泛型类，建议看一下源码非常方便扩展出自己的转换器
         </li>
     </ul>
     <Pre>class MockEntitySocketDataConverter : SocketDataConverterBase&lt;MockEntity&gt;
@@ -96,7 +95,7 @@ class MockEntity
         <li><code>SocketDataUInt64LittleEndianConverter</code> 转成 ulong 无符号整形小端读取</li>
     </ul>
     <p>自定义数据类型转化器示例</p>
-    <Pre>[SocketDataConverter(Type = typeof(MockEntitySocketDataConverter))]
+    <Pre>[SocketDataConverter(Type = typeof(SocketDataConverter&lt;MockEntity&gt;))]
 class MockEntity
 {
     [SocketDataProperty(Type = typeof(byte[]), Offset = 0, Length = 5)]
@@ -107,9 +106,8 @@ class MockEntity
 
     [SocketDataProperty(Type = typeof(Foo), Offset = 7, Length = 1, ConverterType = typeof(FooConverter), ConverterParameters = ["test"])]
     public string? Value1 { get; set; }
-}
-
-class FooConverter(string name) : ISocketDataPropertyConverter
+}</Pre>
+    <Pre>class FooConverter(string name) : ISocketDataPropertyConverter
 {
     public object? Convert(ReadOnlyMemory&lt;byte&gt; data)
     {
diff --git a/src/BootstrapBlazor.Server/Locales/en-US.json b/src/BootstrapBlazor.Server/Locales/en-US.json
@@ -6858,7 +6858,7 @@
     "AttributeChildContent": "Child component",
     "LoadMoreTitle": "LoadMore Component",
     "LoadMoreIntro": "By setting the <code>LoadMore</code> component parameter <code>IsLoading</code> to control the loading state, the <code>OnLoadMoreAsync</code> callback method loads more data",
-    "LoadMoreDesc": "In this example, the loading indicator is displayed by setting <code>CanLoading</code> to <code>true</code>, and the <b>No More Data</b> prompt text is displayed by setting it to <code>false</code> after loading is complete. The UI for loading more data can be customized through <code>LoadingTemplate</code>, the UI displayed when there is no more data can be customized through <code>NoMoreTemplate</code>, and the indicator text displayed when there are no more add-ons can be set through the <code>NoMoreText</code> parameter."
+    "LoadMoreDesc": "<p>In this example, the loading indicator is displayed by setting <code>CanLoading</code> to <code>true</code>, and the <b>No More Data</b> prompt text is displayed when loading is complete.</p><ul class=\"ul-demo\"><li>Customize the UI for loading more through <code>LoadingTemplate</code></li><li>Customize the UI displayed when there is no more data through <code>NoMoreTemplate</code></li><li>Set the indicator text displayed when there are no more add-ons through the <code>NoMoreText</code> parameter</li></ui>"
   },
   "BootstrapBlazor.Server.Components.Samples.SortableLists": {
     "SortableListTitle": "SortableList",
diff --git a/src/BootstrapBlazor.Server/Locales/zh-CN.json b/src/BootstrapBlazor.Server/Locales/zh-CN.json
@@ -4839,7 +4839,7 @@
     "SocketComponents": "Socket 服务",
     "SocketAutoReceive": "自动接收数据",
     "SocketManualReceive": "手动接收数据",
-    "DataPackageAdapter": "数据处理器",
+    "DataPackageAdapter": "数据适配器",
     "SocketAutoConnect": "自动重连",
     "SocketDataEntity": "通讯数据转实体类",
     "NetworkMonitor": "网络状态 NetworkMonitor"
@@ -6858,7 +6858,7 @@
     "AttributeChildContent": "子组件",
     "LoadMoreTitle": "LoadMore 组件",
     "LoadMoreIntro": "通过设置 <code>LoadMore</code> 组件参数 <code>CanLoading</code> 控制加载状态，<code>OnLoadMoreAsync</code> 回调方法加载更多数据",
-    "LoadMoreDesc": "本例中通过设置 <code>CanLoading</code> 为 <code>true</code> 显示加载指示符，加载完成后设置为 <code>false</code> 显示 <b>没有更多数据</b> 提示文本，可以通过 <code>LoadingTemplate</code> 自定义加载更多的 UI，通过 <code>NoMoreTemplate</code> 自定义没有更多数据时显示的 UI，可以通过 <code>NoMoreText</code> 参数设置没有更多加载项时显示的指示文本"
+    "LoadMoreDesc": "<p>本例中通过设置 <code>CanLoading</code> 为 <code>true</code> 显示加载指示符，加载完成后设置为 <code>false</code> 显示 <b>没有更多数据</b> 提示文本</p><ul class=\"ul-demo\"><li>通过 <code>LoadingTemplate</code> 自定义加载更多的 UI</li><li>通过 <code>NoMoreTemplate</code> 自定义没有更多数据时显示的 UI</li><li>通过 <code>NoMoreText</code> 参数设置没有更多加载项时显示的指示文本</li></ui>"
   },
   "BootstrapBlazor.Server.Components.Samples.SortableLists": {
     "SortableListTitle": "SortableList 拖拽组件",
diff --git a/src/BootstrapBlazor/Components/IntersectionObserver/LoadMore.razor.scss b/src/BootstrapBlazor/Components/IntersectionObserver/LoadMore.razor.scss
@@ -9,6 +9,7 @@
         align-items: center;
         background-color: var(--bb-intersection-observer-loading-bg);
         color: var(--bb-intersection-observer-loading-color);
-        padding: var(--bb-intersection-observer-loading-padding)
+        padding: var(--bb-intersection-observer-loading-padding);
+        margin-bottom: 1px;
     }
 }
diff --git a/src/BootstrapBlazor/Services/TcpSocket/DataConverter/SocketDataConverter.cs b/src/BootstrapBlazor/Services/TcpSocket/DataConverter/SocketDataConverter.cs
@@ -11,15 +11,27 @@ namespace BootstrapBlazor.Components;
 /// Provides a base class for converting socket data into a specified entity type.
 /// </summary>
 /// <typeparam name="TEntity">The type of entity to convert the socket data into.</typeparam>
-public abstract class SocketDataConverterBase<TEntity> : ISocketDataConverter<TEntity>
+public class SocketDataConverter<TEntity> : ISocketDataConverter<TEntity>
 {
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
     /// <param name="data"></param>
     /// <param name="entity"></param>
     /// <returns></returns>
-    public abstract bool TryConvertTo(ReadOnlyMemory<byte> data, [NotNullWhen(true)] out TEntity? entity);
+    public virtual bool TryConvertTo(ReadOnlyMemory<byte> data, [NotNullWhen(true)] out TEntity? entity)
+    {
+        var v = CreateEntity();
+        var ret = Parse(data, v);
+        entity = ret ? v : default;
+        return ret;
+    }
+
+    /// <summary>
+    /// 创建实体实例方法
+    /// </summary>
+    /// <returns></returns>
+    protected virtual TEntity CreateEntity() => Activator.CreateInstance<TEntity>();
 
     /// <summary>
     /// 将字节数据转换为指定实体类型的实例。
diff --git a/src/BootstrapBlazor/Services/TcpSocket/SocketClientOptions.cs b/src/BootstrapBlazor/Services/TcpSocket/SocketClientOptions.cs
@@ -10,7 +10,7 @@ namespace BootstrapBlazor.Components;
 /// <summary>
 /// Represents configuration options for a socket client, including buffer sizes, timeouts, and endpoints.
 /// </summary>
-/// <remarks>Use this class to configure various settings for a socket client, such as connection timeouts, 
+/// <remarks>Use this class to configure various settings for a socket client, such as connection timeouts,
 /// buffer sizes, and local or remote endpoints. These options allow fine-tuning of socket behavior  to suit specific
 /// networking scenarios.</remarks>
 public class SocketClientOptions
@@ -49,14 +49,14 @@ public class SocketClientOptions
     /// Gets or sets the local endpoint for the socket client. Default value is <see cref="IPAddress.Any"/>
     /// </summary>
     /// <remarks>This property specifies the local network endpoint that the socket client will bind to when establishing a connection.</remarks>
-    public IPEndPoint LocalEndPoint { get; set; } = new IPEndPoint(IPAddress.Any, 0);
+    public IPEndPoint LocalEndPoint { get; set; } = new(IPAddress.Any, 0);
 
     /// <summary>
     /// Gets or sets a value indicating whether logging is enabled. Default value is false.
     /// </summary>
     public bool EnableLog { get; set; }
-    
-    /// <summary>    
+
+    /// <summary>
     /// Gets or sets a value indicating whether the system should automatically attempt to reconnect  after a connection is lost. Default value is false.
     /// </summary>
     public bool IsAutoReconnect { get; set; }
diff --git a/test/UnitTest/Services/TcpSocketFactoryTest.cs b/test/UnitTest/Services/TcpSocketFactoryTest.cs
@@ -655,7 +655,7 @@ public async Task TryConvertTo_Ok()
         {
             DataPackageHandler = new FixLengthDataPackageHandler(29),
         };
-        client.SetDataPackageAdapter(adapter, new MockEntitySocketDataConverter(), t =>
+        client.SetDataPackageAdapter(adapter, new SocketDataConverter<MockEntity>(), t =>
         {
             entity = t;
             tcs.SetResult();
@@ -734,7 +734,7 @@ public async Task TryConvertTo_Ok()
 
         // 测试数据适配器直接调用 TryConvertTo 方法转换数据
         var adapter2 = new DataPackageAdapter();
-        var result = adapter2.TryConvertTo(data, new MockEntitySocketDataConverter(), out var t);
+        var result = adapter2.TryConvertTo(data, new SocketDataConverter<MockEntity>(), out var t);
         Assert.True(result);
         Assert.NotNull(t);
         Assert.Equal([1, 2, 3, 4, 5], entity.Header);
@@ -751,6 +751,10 @@ public async Task TryConvertTo_Ok()
         await client.SendAsync(data);
         await tcs.Task;
         Assert.Null(noConvertEntity);
+
+        var converter = new MockSocketDataConverter();
+        result = converter.TryConvertTo(new byte[] { 0x1, 0x2 }, out t);
+        Assert.False(result);
     }
 
     private static TcpListener StartTcpServer(int port, Func<TcpClient, Task> handler)
@@ -1137,18 +1141,7 @@ public void SetReceive(bool state)
         }
     }
 
-    class MockEntitySocketDataConverter : SocketDataConverterBase<MockEntity>
-    {
-        public override bool TryConvertTo(ReadOnlyMemory<byte> data, [NotNullWhen(true)] out MockEntity? entity)
-        {
-            var v = new MockEntity();
-            var ret = Parse(data, v);
-            entity = ret ? v : null;
-            return ret;
-        }
-    }
-
-    [SocketDataConverter(Type = typeof(MockEntitySocketDataConverter))]
+    [SocketDataConverter(Type = typeof(SocketDataConverter<MockEntity>))]
     class MockEntity
     {
         [SocketDataProperty(Type = typeof(byte[]), Offset = 0, Length = 5)]
@@ -1199,6 +1192,14 @@ class MockEntity
         public string? Value13 { get; set; }
     }
 
+    class MockSocketDataConverter: SocketDataConverter<MockEntity>
+    {
+        protected override bool Parse(ReadOnlyMemory<byte> data, MockEntity entity)
+        {
+            return false;
+        }
+    }
+
     class FooConverter(string name) : ISocketDataPropertyConverter
     {
         public object? Convert(ReadOnlyMemory<byte> data)

Original file line number	Diff line number	Diff line change
`@@ -48,10 +48,10 @@ protected override void OnInitialized()`
`48`	`48`	`});`
`49`	`49`	`_client.ReceivedCallBack += OnReceivedAsync;`
`50`	`50`
`51`		`- _dataAdapter.ReceivedCallBack += async Data =>`
	`51`	`+ _dataAdapter.ReceivedCallBack += async data =>`
`52`	`52`	`{`
`53`	`53`	`// 直接处理接收的数据`
`54`		`- await UpdateReceiveLog(Data);`
	`54`	`+ await UpdateReceiveLog(data);`
`55`	`55`	`};`
`56`	`56`	`}`
`57`	`57`
`@@ -104,7 +104,7 @@ private async ValueTask OnReceivedAsync(ReadOnlyMemory<byte> data)`
`104`	`104`
`105`	`105`	`private async Task UpdateReceiveLog(ReadOnlyMemory<byte> data)`
`106`	`106`	`{`
`107`		`- var payload = System.Text.Encoding.UTF8.GetString(data.Span);`
	`107`	`+ var payload = Encoding.UTF8.GetString(data.Span);`
`108`	`108`	`var body = BitConverter.ToString(data.ToArray());`
`109`	`109`
`110`	`110`	`_items.Add(new ConsoleMessageItem`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`align-items: center;`
`10`	`10`	`background-color: var(--bb-intersection-observer-loading-bg);`
`11`	`11`	`color: var(--bb-intersection-observer-loading-color);`
`12`		`- padding: var(--bb-intersection-observer-loading-padding)`
	`12`	`+ padding: var(--bb-intersection-observer-loading-padding);`
	`13`	`+ margin-bottom: 1px;`
`13`	`14`	`}`
`14`	`15`	`}`