Merge branch 'main' into feat-chat-deepseek

Author: ArgoZhang

src/BootstrapBlazor.Server/wwwroot/css/devui.css

@@ -54,6 +54,11 @@ pre code.hljs {
     --bs-btn-xxl-font-size: 1.5rem;
 }
 
+.btn-xs {
+    --bs-btn-padding-y: 0;
+    --bs-btn-padding-x: 0.45rem;
+}
+
 .btn-circle {
     --bb-button-circle-width: 35px;
     --bb-button-circle-height: 35px;

src/BootstrapBlazor/BootstrapBlazor.csproj

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

src/BootstrapBlazor/Components/Layout/Layout.razor.cs

@@ -417,14 +417,12 @@ public partial class Layout : IHandlerException
     /// 获得/设置 Gets or sets a collection of additional assemblies that should be searched for components that can match URIs.
     /// </summary>
     [Parameter]
-    [NotNull]
     public IEnumerable<Assembly>? AdditionalAssemblies { get; set; }
 
     /// <summary>
     /// 获得/设置 鼠标悬停提示文字信息
     /// </summary>
     [Parameter]
-    [NotNull]
     public string? TooltipText { get; set; }
 
     /// <summary>
@@ -453,7 +451,7 @@ public partial class Layout : IHandlerException
     private IStringLocalizer<Layout>? Localizer { get; set; }
 
     private bool _init;
-    private Tab _tab = default!;
+    private Tab _tab = null!;
 
     /// <summary>
     /// <inheritdoc/>
@@ -483,7 +481,7 @@ protected override async Task OnInitializedAsync()
         if (AuthenticationStateTask != null)
         {
             // wasm 模式下 开启权限必须提供 AdditionalAssemblies 参数
-            AdditionalAssemblies ??= new[] { Assembly.GetEntryAssembly()! };
+            AdditionalAssemblies ??= [Assembly.GetEntryAssembly()!];
 
             var url = Navigation.ToBaseRelativePath(Navigation.Uri);
             var context = RouteTableFactory.Create(AdditionalAssemblies, url);

src/BootstrapBlazor/Components/Tab/Tab.razor.scss

@@ -504,7 +504,7 @@
                 &:hover {
                     background-color: var(--bb-tabs-item-hover-bg-color);
                 }
-            }
+            }       
         }
 
         .btn-fs {
@@ -593,6 +593,30 @@
             margin-left: -2rem;
         }
 
+        &:not(.active) {
+            &:not(:hover):not(:first-child) {
+                .tabs-item {
+                    &:before {
+                        content: '';
+                        width: 2px;
+                        background-color: rgba(var(--bs-emphasis-color-rgb), .2);
+                        position: absolute;
+                        left: 0;
+                        top: 8px;
+                        bottom: 10px;
+                    }
+                }
+            }
+
+            &:hover + .tabs-item-wrap {
+                .tabs-item {
+                    &:before {
+                        content: none;
+                    }
+                }
+            }
+        }
+
         .tabs-item {
             border: none !important;
             border-top-left-radius: 10px;

src/BootstrapBlazor/Components/ValidateForm/ValidateForm.razor.cs

@@ -385,10 +385,6 @@ private void ValidateDataAnnotations(object? value, ValidationContext context, L
             var result = rule.GetValidationResult(value, context);
             if (result != null && result != ValidationResult.Success)
             {
-                // 查找 resource 资源文件中的 ErrorMessage
-                var ruleNameSpan = rule.GetType().Name.AsSpan();
-                var index = ruleNameSpan.IndexOf(attributeSpan, StringComparison.OrdinalIgnoreCase);
-                var ruleName = ruleNameSpan[..index];
                 var find = false;
                 if (!string.IsNullOrEmpty(rule.ErrorMessage))
                 {
@@ -400,29 +396,36 @@ private void ValidateDataAnnotations(object? value, ValidationContext context, L
                     }
                 }
 
-                // 通过设置 ErrorMessage 检索
-                if (!context.ObjectType.Assembly.IsDynamic && !find
-                    && !string.IsNullOrEmpty(rule.ErrorMessage)
-                    && LocalizerFactory.Create(context.ObjectType).TryGetLocalizerString(rule.ErrorMessage, out var msg))
+                if (!context.ObjectType.Assembly.IsDynamic)
                 {
-                    rule.ErrorMessage = msg;
-                    find = true;
-                }
+                    if (!find && !string.IsNullOrEmpty(rule.ErrorMessage)
+                        && LocalizerFactory.Create(context.ObjectType).TryGetLocalizerString(rule.ErrorMessage, out var msg))
+                    {
+                        // 通过设置 ErrorMessage 检索
+                        rule.ErrorMessage = msg;
+                        find = true;
+                    }
 
-                // 通过 Attribute 检索
-                if (!rule.GetType().Assembly.IsDynamic && !find
-                    && LocalizerFactory.Create(rule.GetType()).TryGetLocalizerString(nameof(rule.ErrorMessage), out msg))
-                {
-                    rule.ErrorMessage = msg;
-                    find = true;
-                }
+                    if (!find && LocalizerFactory.Create(rule.GetType()).TryGetLocalizerString(nameof(rule.ErrorMessage), out msg))
+                    {
+                        // 通过 Attribute 检索
+                        rule.ErrorMessage = msg;
+                        find = true;
+                    }
 
-                // 通过 字段.规则名称 检索
-                if (!context.ObjectType.Assembly.IsDynamic && !find
-                    && LocalizerFactory.Create(context.ObjectType).TryGetLocalizerString($"{memberName}.{ruleName.ToString()}", out msg))
-                {
-                    rule.ErrorMessage = msg;
-                    find = true;
+                    if (!find)
+                    {
+                        // 通过 字段.规则名称 检索
+                        // 查找 resource 资源文件中的 ErrorMessage
+                        var ruleNameSpan = rule.GetType().Name.AsSpan();
+                        var index = ruleNameSpan.IndexOf(attributeSpan, StringComparison.OrdinalIgnoreCase);
+                        var ruleName = index == -1 ? ruleNameSpan[..] : ruleNameSpan[..index];
+                        if (LocalizerFactory.Create(context.ObjectType).TryGetLocalizerString($"{memberName}.{ruleName.ToString()}", out msg))
+                        {
+                            rule.ErrorMessage = msg;
+                            find = true;
+                        }
+                    }
                 }
 
                 if (!find)

test/UnitTest/Components/ValidateFormTest.cs

@@ -566,6 +566,27 @@ public async Task Validate_Service_Ok()
         var msg = cut.FindComponent<MockInput<string>>().Instance.GetErrorMessage();
         Assert.Equal(HasServiceAttribute.Success, msg);
     }
+    
+    [Fact]
+    public async Task TestService_Ok()
+    {
+        // 自定义验证规则没有使用约定 Attribute 结尾单元测试
+        var foo = new HasService();
+        var cut = Context.RenderComponent<ValidateForm>(pb =>
+        {
+            pb.Add(a => a.Model, foo);
+            pb.AddChildContent<MockInput<string>>(pb =>
+            {
+                pb.Add(a => a.Value, foo.Tag2);
+                pb.Add(a => a.ValueExpression, Utility.GenerateValueExpression(foo, "Tag2", typeof(string)));
+                pb.Add(a => a.ValidateRules, [new FormItemValidator(new TestValidateRule())]);
+            });
+        });
+        var form = cut.Find("form");
+        await cut.InvokeAsync(() => form.Submit());
+        var msg = cut.FindComponent<MockInput<string>>().Instance.GetErrorMessage();
+        Assert.Equal("Test", msg);
+    }
 
     [Fact]
     public async Task RequiredValidator_Ok()
@@ -726,7 +747,7 @@ public void ShowAllInvalidResult_Ok()
     private class HasServiceAttribute : ValidationAttribute
     {
         public const string Success = "Has Service";
-        public const string Error = "No Service";
+        private const string Error = "No Service";
 
         protected override ValidationResult? IsValid(object? value, ValidationContext validationContext)
         {
@@ -738,10 +759,21 @@ private class HasServiceAttribute : ValidationAttribute
         }
     }
 
+    private class TestValidateRule : ValidationAttribute
+    {
+        protected override ValidationResult? IsValid(object? value, ValidationContext validationContext)
+        {
+            return new("Test");
+        }
+    }
+
     private class HasService
     {
         [HasService]
         public string? Tag { get; set; }
+        
+        [TestValidateRule]
+        public string? Tag2 { get; set; }
     }
 
     [MetadataType(typeof(DummyMetadata))]