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

Author: actions-user

src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj

@@ -69,7 +69,7 @@
     <PackageReference Include="BootstrapBlazor.SvgEditor" Version="9.0.3" />
     <PackageReference Include="BootstrapBlazor.SummerNote" Version="9.0.4" />
     <PackageReference Include="BootstrapBlazor.TableExport" Version="9.2.6" />
-    <PackageReference Include="BootstrapBlazor.Topology" Version="9.0.0" />
+    <PackageReference Include="BootstrapBlazor.Topology" Version="9.0.1" />
     <PackageReference Include="BootstrapBlazor.UniverIcon" Version="9.0.1" />
     <PackageReference Include="BootstrapBlazor.UniverSheet" Version="9.0.5" />
     <PackageReference Include="BootstrapBlazor.Vditor" Version="9.0.0" />

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

@@ -145,9 +145,7 @@
         <CollapseItems>
             <CollapseItem Text="@Localizer["Consistency"]">
                 <HeaderTemplate>
-                    <div class="p-2">
-                        <Select Items="Items" @bind-Value="Value" IsPopover="true"></Select>
-                    </div>
+                    <Select Items="Items" @bind-Value="Value" IsPopover="true"></Select>
                 </HeaderTemplate>
                 <ChildContent>
                     <div>@Localizer["ConsistencyItem1"]</div>
@@ -157,7 +155,7 @@
             </CollapseItem>
             <CollapseItem Text="@Localizer["Feedback"]">
                 <HeaderTemplate>
-                    <div class="p-2">Header-Test</div>
+                    Header-Test
                 </HeaderTemplate>
                 <ChildContent>
                     <div>@Localizer["FeedbackItem1"]</div>
@@ -166,7 +164,7 @@
             </CollapseItem>
             <CollapseItem Text="@Localizer["Controllability"]">
                 <HeaderTemplate>
-                    <div class="p-2">Header-Test</div>
+                    Header-Test
                 </HeaderTemplate>
                 <ChildContent>
                     <div>@Localizer["ControllabilityItem1"]</div>

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

@@ -110,3 +110,22 @@ class MockEntity
         return new Foo() { Id = data.Span[0], Name = name };
     }
 }</Pre>
+
+<p class="code-label">针对第三方程序集的数据类型解决方案如下：</p>
+<p>使用 <code></code></p>
+
+<Pre>builder.Services.ConfigureSocketDataConverters(options =>
+{
+    options.AddTypeConverter&lt;MockEntity&gt;();
+    options.AddPropertyConverter&lt;MockEntity&gt;(entity =&gt; entity.Header, new SocketDataPropertyConverterAttribute()
+    {
+        Offset = 0,
+        Length = 5
+    });
+    options.AddPropertyConverter&lt;MockEntity&gt;(entity =&gt; entity.Body, new SocketDataPropertyConverterAttribute()
+    {
+        Offset = 5,
+        Length = 2
+    });
+});
+</Pre>

src/BootstrapBlazor/BootstrapBlazor.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>9.8.2-beta02</Version>
+    <Version>9.8.2-beta04</Version>
   </PropertyGroup>
 
   <ItemGroup>

src/BootstrapBlazor/Components/Collapse/Collapse.razor

@@ -10,20 +10,23 @@
         {
             <div @key="item" class="@GetItemClassString(item)">
                 <div class="@GetHeaderClassString(item)">
-                    @if (item.HeaderTemplate != null)
-                    {
-                        <div class="accordion-header-body">
-                            @item.HeaderTemplate
-                        </div>
-                    }
                     <div class="@GetHeaderButtonClassString(item)"
                          data-bs-toggle="collapse" data-bs-target="@GetTargetIdString(item)"
                          aria-expanded="@(item.IsCollapsed ? "false" : "true")" @onclick="() => OnClickItem(item)">
-                        @if(!string.IsNullOrEmpty(item.Icon))
+                        @if (item.HeaderTemplate != null)
+                        {
+                            <div class="accordion-header-body">
+                                @item.HeaderTemplate
+                            </div>
+                        }
+                        else if(!string.IsNullOrEmpty(item.Icon))
                         {
                             <i class="@GetItemIconString(item)"></i>
                         }
-                        <span>@item.Text</span>
+                        else
+                        {
+                            <span>@item.Text</span>
+                        }
                     </div>
                 </div>
                 <div class="@GetClassString(item.IsCollapsed)" id="@GetTargetId(item)" data-bs-parent="@ParentIdString">

src/BootstrapBlazor/Components/Tab/Tab.razor.cs

@@ -432,7 +432,7 @@ public partial class Tab
     public ITabHeader? TabHeader { get; set; }
 
     /// <summary>
-    /// 获得/设置 是否开启全局异常捕获 默认 null 读取配置文件 EnableErrorLogger 值
+    /// 获得/设置 是否开启全局异常捕获 默认 null 读取配置文件 <see cref="BootstrapBlazorOptions.EnableErrorLogger"/> 值
     /// </summary>
     [Parameter]
     public bool? EnableErrorLogger { get; set; }

src/BootstrapBlazor/Components/Tab/TabItemContent.cs

@@ -15,6 +15,9 @@ class TabItemContent : IComponent, IHandlerException, IDisposable
     [Parameter, NotNull]
     public TabItem? Item { get; set; }
 
+    [CascadingParameter]
+    private Layout? Layout { get; set; }
+
     [CascadingParameter, NotNull]
     private Tab? TabSet { get; set; }
 
@@ -67,6 +70,7 @@ private void BuildRenderTree(RenderTreeBuilder builder)
             _logger.Register(this);
             return Task.CompletedTask;
         }));
+        builder.AddAttribute(6, nameof(ErrorLogger.OnErrorHandleAsync), Layout?.OnErrorHandleAsync);
         builder.CloseComponent();
     }
 

src/BootstrapBlazor/Services/TcpSocket/DataConverter/SocketDataConverterCollections.cs

@@ -10,35 +10,41 @@
 namespace BootstrapBlazor.Components;
 
 /// <summary>
-/// 
+/// 数据转换器集合类
 /// </summary>
-public class SocketDataConverterCollections
+public sealed class SocketDataConverterCollections
 {
     readonly ConcurrentDictionary<Type, ISocketDataConverter> _converters = new();
     readonly ConcurrentDictionary<MemberInfo, SocketDataPropertyConverterAttribute> _propertyConverters = new();
 
     /// <summary>
-    /// 增加数据类型转换器方法
+    /// 增加指定 <see cref="ISocketDataConverter{TEntity}"/> 数据类型转换器方法
     /// </summary>
     /// <typeparam name="TEntity"></typeparam>
     /// <param name="converter"></param>
-    public void AddOrUpdateTypeConverter<TEntity>(ISocketDataConverter<TEntity> converter)
+    public void AddTypeConverter<TEntity>(ISocketDataConverter<TEntity> converter)
     {
         var type = typeof(TEntity);
         _converters.AddOrUpdate(type, t => converter, (t, v) => converter);
     }
 
+    /// <summary>
+    /// 增加默认数据类型转换器方法 转换器使用 <see cref="SocketDataConverter{TEntity}"/>
+    /// </summary>
+    /// <typeparam name="TEntity"></typeparam>
+    public void AddTypeConverter<TEntity>() => AddTypeConverter(new SocketDataConverter<TEntity>(this));
+
     /// <summary>
     /// 添加属性类型转化器方法
     /// </summary>
     /// <typeparam name="TEntity"></typeparam>
     /// <param name="propertyExpression"></param>
     /// <param name="attribute"></param>
-    public void AddOrUpdatePropertyConverter<TEntity>(Expression<Func<TEntity, object?>> propertyExpression, SocketDataPropertyConverterAttribute attribute)
+    public void AddPropertyConverter<TEntity>(Expression<Func<TEntity, object?>> propertyExpression, SocketDataPropertyConverterAttribute attribute)
     {
         if (propertyExpression.Body is MemberExpression memberExpression)
         {
-            if(attribute.Type == null)
+            if (attribute.Type == null)
             {
                 attribute.Type = memberExpression.Type;
             }

src/BootstrapBlazor/Services/TcpSocket/PropertyConverter/SocketDataPropertyConverterAttribute.cs renamed to src/BootstrapBlazor/Services/TcpSocket/DataConverter/SocketDataPropertyConverterAttribute.cs

@@ -16,21 +16,21 @@ protected override void ConfigureConfiguration(IServiceCollection services)
 
         services.ConfigureSocketDataConverters(options =>
         {
-            options.AddOrUpdateTypeConverter(new SocketDataConverter<MockEntity>());
-            options.AddOrUpdatePropertyConverter<MockEntity>(entity => entity.Header, new SocketDataPropertyConverterAttribute()
+            options.AddTypeConverter<MockEntity>();
+            options.AddPropertyConverter<MockEntity>(entity => entity.Header, new SocketDataPropertyConverterAttribute()
             {
                 Offset = 0,
                 Length = 5
             });
-            options.AddOrUpdatePropertyConverter<MockEntity>(entity => entity.Body, new SocketDataPropertyConverterAttribute()
+            options.AddPropertyConverter<MockEntity>(entity => entity.Body, new SocketDataPropertyConverterAttribute()
             {
                 Offset = 5,
                 Length = 2
             });
 
             // 为提高代码覆盖率 重复添加转换器以后面的为准
-            options.AddOrUpdateTypeConverter(new SocketDataConverter<MockEntity>());
-            options.AddOrUpdatePropertyConverter<MockEntity>(entity => entity.Header, new SocketDataPropertyConverterAttribute()
+            options.AddTypeConverter<MockEntity>();
+            options.AddPropertyConverter<MockEntity>(entity => entity.Header, new SocketDataPropertyConverterAttribute()
             {
                 Offset = 0,
                 Length = 5