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

Author: actions-user

src/BootstrapBlazor.Server/Components/Samples/Table/TablesAttribute.razor

@@ -42,6 +42,8 @@ public class Foo
 
 <p class="code-label">@Localizer["TableAttributeIntro"]</p>
 
+<p><code>TableColumn</code> > <code>AutoGenerateClassAttribute</code> > <code>AutoGenerateColumnAttribute</code></p>
+
 <ul class="ul-demo">
     <li>@((MarkupString)Localizer["TableAttributeIntroLI1"].Value)</li>
     <li>@((MarkupString)Localizer["TableAttributeIntroLI2"].Value)</li>
@@ -60,7 +62,6 @@ public class Foo
     public string? Name { get; set; }
 }</Pre>
 
-<p>@((MarkupString)Localizer["TableAttributeQA1"].Value)</p>
 <p>@((MarkupString)Localizer["TableAttributeQAP2"].Value)</p>
 
 <p class="code-label">@Localizer["TableAttributeColumn"]</p>

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

@@ -5733,9 +5733,9 @@
     "TableAttributeIntro": "Priority",
     "TableAttributeIntroLI1": "Only <code>AutoGenerateClassAttribute</code> been set and its parameter value is used as the basis",
     "TableAttributeIntroLI2": "Only <code>AutoGenerateColumnAttribute</code> been set and its parameter value is used as the basis",
-    "TableAttributeIntroLI3": "Set <code>AutoGenerateClassAttribute</code> and set <code>AutoGenerateColumnAttribute</code> to combine the two parameter values ​​and take the opposite value of their default value",
+    "TableAttributeIntroLI3": "Write <code>AutoGenerateClassAttribute</code> and write <code>AutoGenerateColumnAttribute</code> to merge the two parameter values and take the value of <code>AutoGenerateColumnAttribute</code>",
     "TableAttributeIntroLI4": "When setting the TableColumn parameter value, the TableColumn parameter value is the final value.",
-    "TableAttributeQA1": "Set <code>AutoGenerateClassAttribute</code> and set <code>AutoGenerateColumnAttribute</code> to combine the two parameter values ​​and take the opposite value of their default values. Example",
+    "TableAttributeQA1": "I wrote <code>AutoGenerateClassAttribute</code> and <code>AutoGenerateColumnAttribute</code> to combine the two parameter values and give an example",
     "TableAttributeQAP1": "Because <code>AutoGenerateClassAttribute</code> sets <code>Filterable</code> to <code>true</code>, and <code>AutoGenerateColumn</code> keeps <code>Filterable</code> to its default value of <code>false</code>, the final <code>UI</code> uses <code>true</code>",
     "TableAttributeQAP2": "Since <code>AutoGenerateClassAttribute</code> is not set, <code>Sortable</code> remains at the default value of <code>false</code>, and <code>AutoGenerateColumn</code> sets the <code>Sortable</code> value to <code>true</code>, the final <code>UI</code> uses <code>true</code>",
     "TableAttributeQAP3": "In the latest version, some parameter values ​​such as <code>Filterable</code> of <code>TableColumn</code> are changed to <b>nullable data type</b>, and their default value is changed from <code>false</code> to <code>null</code>. Therefore, as long as the value of the <code>Filterable</code> parameter of <code>TableColumn</code> is not null, the <code>TableColumn</code> value is used as the final <code>UI</code> value.",

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

@@ -5733,9 +5733,9 @@
     "TableAttributeIntro": "权重说明",
     "TableAttributeIntroLI1": "只写了 <code>AutoGenerateClassAttribute</code> 以其参数值为准",
     "TableAttributeIntroLI2": "只写了 <code>AutoGenerateColumnAttribute</code> 以其参数值为准",
-    "TableAttributeIntroLI3": "写了 <code>AutoGenerateClassAttribute</code> 并且写了 <code>AutoGenerateColumnAttribute</code> 合并两者参数值取其默认值的相反值",
+    "TableAttributeIntroLI3": "写了 <code>AutoGenerateClassAttribute</code> 并且写了 <code>AutoGenerateColumnAttribute</code> 合并两者参数值取 <code>AutoGenerateColumnAttribute</code> 值",
     "TableAttributeIntroLI4": "写了 <code>TableColumn</code> <code>参数值时以 TableColumn</code> 参数值为最终值",
-    "TableAttributeQA1": "写了 <code>AutoGenerateClassAttribute</code> 并且写了 <code>AutoGenerateColumnAttribute</code> 合并两者参数值取其默认值的相反值举例说明",
+    "TableAttributeQA1": "写了 <code>AutoGenerateClassAttribute</code> 并且写了 <code>AutoGenerateColumnAttribute</code> 合并两者参数值取值举例说明",
     "TableAttributeQAP1": "由于 <code>AutoGenerateClassAttribute</code> 设置 <code>Filterable</code> 值为 <code>true</code>，而 <code>AutoGenerateColumn</code> 保持 <code>Filterable</code> 默认值 <code>false</code> 最终 <code>UI</code> 使用 <code>true</code>",
     "TableAttributeQAP2": "由于 <code>AutoGenerateClassAttribute</code> 未设置 <code>Sortable</code> 保持默认值 <code>false</code>，而 <code>AutoGenerateColumn</code> 设置 <code>Sortable</code> 值为 <code>true</code> 最终 <code>UI</code> 使用 <code>true</code>",
     "TableAttributeQAP3": "最新版本 <code>TableColumn</code> 的 <code>Filterable</code> 等一些参数值均更改为 <b>可为空数据类型</b>，其默认值由原来的 <code>false</code> 更改为 <code>null</code>，可由此判断，只要 <code>TableColumn</code> 的参数 <code>Filterable</code> 值不为空，即以 <code>TableColumn</code> 值为最终 <code>UI</code> 值",

src/BootstrapBlazor/Components/Badge/Badge.razor.cs

@@ -11,7 +11,7 @@ namespace BootstrapBlazor.Components;
 public partial class Badge
 {
     private string? ClassString => CssBuilder.Default("badge")
-        .AddClass($"bg-{Color.ToDescriptionString()}", Color != Color.None)
+        .AddClass($"text-bg-{Color.ToDescriptionString()}", Color != Color.None)
         .AddClass("rounded-pill", IsPill)
         .AddClassFromAttributes(AdditionalAttributes)
         .Build();

src/BootstrapBlazor/Components/Badge/Badge.razor.scss

@@ -1,5 +1,5 @@
-.badge {
-    &.bg-secondary, &.bg-light {
-        --bs-badge-color: #{$bb-badge-color};
+.badge {
+    &.text-bg-secondary, &.text-bg-light {
+        color: $bb-badge-color !important;
     }
 }

test/UnitTest/Components/DropdownWidgetTest.cs

@@ -77,7 +77,7 @@ public void BadgeColor_OK()
             }));
         });
 
-        var ele = cut.Find(".bg-success");
+        var ele = cut.Find(".text-bg-success");
         Assert.NotNull(ele);
     }