fix(TInputAdorment): 修复因为 tdesign.css 升级造成的组件样式变形

tdesign-blazor · May 22, 2023 · 7f45e63 · 7f45e63
1 parent d634d2a
commit 7f45e63
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 40 deletions.
diff --git a/doc/TDesign.Docs.ServerSide/TDesign.xml b/doc/TDesign.Docs.ServerSide/TDesign.xml
diff --git a/doc/TDesign.Docs.WebAssembly/wwwroot/TDesign.xml b/doc/TDesign.Docs.WebAssembly/wwwroot/TDesign.xml
diff --git a/src/TDesign.Test/Components/Input/InputAdornmentTest.cs b/src/TDesign.Test/Components/Input/InputAdornmentTest.cs
@@ -1,4 +1,5 @@
 using ComponentBuilder;
+using ComponentBuilder.FluentRenderTree;
 using Microsoft.AspNetCore.Components.Forms;
 using System;
 using System.Collections.Generic;
@@ -21,39 +22,67 @@ public void Test_Render()
         public void Test_Prepend_Parameter()
         {
             RenderComponent(m => m.Add(p => p.Prepend, "http"))
-                .Should()
-                .HaveClass("t-input-adornment--prepend")
-                .And
-                .HaveChildMarkup(builder => builder.CreateElement(0, "span", "http", new { @class = "t-input-adornment__prepend" }));
+                .MarkupMatches(builder =>
+                {
+                    builder.Div("t-input-adornment").Content(prepend =>
+                    {
+                        prepend.Span("t-input-adornment__prepend").Content(text =>
+                        {
+                            text.Span("t-input-adornment__text").Content("http").Close();
+                        }).Close();
+                    })
+                    .Close();
+                });
         }
 
         [Fact(DisplayName = "InputAdornment - PrependContent 参数")]
         public void Test_PrependContent_Parameter()
         {
             RenderComponent(m => m.Add(p => p.PrependContent, builder => builder.AddContent(0, "html content")))
-                .Should()
-                .HaveClass("t-input-adornment--prepend")
-                .And
-                .HaveChildMarkup(builder => builder.CreateElement(0, "span", content => content.AddContent(0, "html content"), new { @class = "t-input-adornment__prepend" }));
+                .MarkupMatches(builder =>
+                {
+                    builder.Div("t-input-adornment").Content(prepend =>
+                    {
+                        prepend.Span("t-input-adornment__prepend").Content(text =>
+                        {
+                            text.Span("t-input-adornment__text").Content("html content").Close();
+                        }).Close();
+                    })
+                    .Close();
+                });
         }
         [Fact(DisplayName = "InputAdornment - Append 参数")]
         public void Test_Append_Parameter()
         {
             RenderComponent(m => m.Add(p => p.Append, "http"))
-                .Should()
-                .HaveClass("t-input-adornment--append")
-                .And
-                .HaveChildMarkup(builder => builder.CreateElement(0, "span", "http", new { @class = "t-input-adornment__append" }));
+                .MarkupMatches(builder =>
+                {
+                    builder.Div("t-input-adornment").Content(prepend =>
+                    {
+                        prepend.Span("t-input-adornment__append").Content(text =>
+                        {
+                            text.Span("t-input-adornment__text").Content("http").Close();
+                        }).Close();
+                    })
+                    .Close();
+                });
         }
 
         [Fact(DisplayName = "InputAdornment - AppendContent 参数")]
         public void Test_AppendContent_Parameter()
         {
             RenderComponent(m => m.Add(p => p.AppendContent, builder => builder.AddContent(0, "html content")))
-                .Should()
-                .HaveClass("t-input-adornment--append")
-                .And
-                .HaveChildMarkup(builder => builder.CreateElement(0, "span", content => content.AddContent(0, "html content"), new { @class = "t-input-adornment__append" }));
+                .MarkupMatches(builder =>
+                {
+                    builder.Div("t-input-adornment").Content(prepend =>
+                    {
+                        prepend.Span("t-input-adornment__append").Content(text =>
+                        {
+                            text.Span("t-input-adornment__text").Content("html content").Close();
+                        }).Close();
+                    })
+                    .Close();
+                });
         }
 
     }

diff --git a/src/TDesign/Components/Forms/TInputAdornment.cs b/src/TDesign/Components/Forms/TInputAdornment.cs
@@ -32,35 +32,28 @@ public class TInputAdornment : BlazorComponentBase, IHasChildContent
     [Parameter]public RenderFragment? AppendContent { get; set; }
 
     /// <inheritdoc/>
-    protected override void OnParametersSet()
+    protected override void AfterSetParameters(ParameterView parameters)
     {
-        base.OnParametersSet();
-
-        if ( !string.IsNullOrEmpty(Prepend) )
+        base.AfterSetParameters(parameters);
+        if (!string.IsNullOrWhiteSpace( Prepend ))
         {
             PrependContent ??= builder => builder.AddContent(0, Prepend);
         }
-        if ( !string.IsNullOrEmpty(Append) )
+        if ( !string.IsNullOrWhiteSpace(Append) )
         {
             AppendContent ??= builder => builder.AddContent(0, Append);
         }
     }
 
-    /// <inheritdoc/>
-    protected override void BuildCssClass(ICssClassBuilder builder)
-    {
-        builder.Append("t-input-adornment--prepend", PrependContent is not null)
-            .Append("t-input-adornment--append",AppendContent is not null)
-            ;
-    }
-
     /// <inheritdoc/>
     protected override void AddContent(RenderTreeBuilder builder, int sequence)
     {
-        builder.CreateElement(sequence, "span", PrependContent, new { @class = "t-input-adornment__prepend" }, PrependContent is not null);
-
+        builder.Span("t-input-adornment__prepend",PrependContent is not null).Content(text => BuildText(text, PrependContent)).Close();
         builder.AddContent(sequence + 1, ChildContent);
+        builder.Span("t-input-adornment__append", AppendContent is not null).Content(text => BuildText(text, AppendContent)).Close();
 
-        builder.CreateElement(sequence+2, "span", AppendContent, new { @class = "t-input-adornment__append" },AppendContent is not null);
     }
+
+    void BuildText(RenderTreeBuilder builder, RenderFragment? fragment)
+        => builder.Span("t-input-adornment__text").Content(fragment).Close();
 }