From 52efdee0de4efb643e2b5b7d6bbe8a6b44e18c7b Mon Sep 17 00:00:00 2001
From: Argo-Tianyi <argo@163.com>
Date: Fri, 11 Mar 2022 15:37:21 +0800
Subject: [PATCH 1/6] =?UTF-8?q?fix:=20Tree=20=E5=A2=9E=E5=8A=A0=E9=AA=A8?=
 =?UTF-8?q?=E6=9E=B6=E5=B1=8F=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BootstrapBlazor/Components/Tree/Tree.razor | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/BootstrapBlazor/Components/Tree/Tree.razor b/src/BootstrapBlazor/Components/Tree/Tree.razor
index 31bb14f31..e4fa7d352 100644
--- a/src/BootstrapBlazor/Components/Tree/Tree.razor
+++ b/src/BootstrapBlazor/Components/Tree/Tree.razor
@@ -5,11 +5,11 @@
 {
     if (ShowSkeleton)
     {
-        <SkeletonTree></SkeletonTree>
+        <SkeletonTree AdditionalAttributes="AdditionalAttributes"></SkeletonTree>
     }
     else
     {
-        <div class="table-loading">
+        <div @attributes="@AdditionalAttributes" class="table-loading">
             <Spinner Color="Color.Primary" />
         </div>
     }
-- 
Gitee


From 94768eb23a80f7b62101c03628181943b6c39e35 Mon Sep 17 00:00:00 2001
From: Argo-Tianyi <argo@163.com>
Date: Fri, 11 Mar 2022 15:39:38 +0800
Subject: [PATCH 2/6] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E9=A2=9D?=
 =?UTF-8?q?=E5=A4=96=E6=A0=B7=E5=BC=8F=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BootstrapBlazor/Components/Tree/Tree.razor    | 4 ++--
 src/BootstrapBlazor/Components/Tree/Tree.razor.cs | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/BootstrapBlazor/Components/Tree/Tree.razor b/src/BootstrapBlazor/Components/Tree/Tree.razor
index e4fa7d352..a872654c5 100644
--- a/src/BootstrapBlazor/Components/Tree/Tree.razor
+++ b/src/BootstrapBlazor/Components/Tree/Tree.razor
@@ -9,14 +9,14 @@
     }
     else
     {
-        <div @attributes="@AdditionalAttributes" class="table-loading">
+        <div class="@LoadingClassString">
             <Spinner Color="Color.Primary" />
         </div>
     }
 }
 else
 {
-    <div @attributes="@AdditionalAttributes" tabindex="0" role="tree" class="@ClassString" @ref="@TreeElement">
+    <div tabindex="0" role="tree" class="@ClassString" @ref="@TreeElement">
         <ul class="tree-root" role="tree">
             @foreach (var item in Items)
             {
diff --git a/src/BootstrapBlazor/Components/Tree/Tree.razor.cs b/src/BootstrapBlazor/Components/Tree/Tree.razor.cs
index 9e3d797aa..820a31b8e 100644
--- a/src/BootstrapBlazor/Components/Tree/Tree.razor.cs
+++ b/src/BootstrapBlazor/Components/Tree/Tree.razor.cs
@@ -26,6 +26,13 @@ public partial class Tree
         .AddClassFromAttributes(AdditionalAttributes)
         .Build();
 
+    /// <summary>
+    /// 获得 Loading 样式集合
+    /// </summary>
+    private string? LoadingClassString => CssBuilder.Default("table-loading")
+        .AddClassFromAttributes(AdditionalAttributes)
+        .Build();
+
     /// <summary>
     /// 获得/设置 TreeItem 图标
     /// </summary>
-- 
Gitee


From a93c4b1261dbd28ec2e64196b0a524c7e66c19ff Mon Sep 17 00:00:00 2001
From: Argo-Tianyi <argo@163.com>
Date: Fri, 11 Mar 2022 15:40:19 +0800
Subject: [PATCH 3/6] =?UTF-8?q?doc:=20=E6=9B=B4=E6=96=B0=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BootstrapBlazor.Shared/Locales/en.json | 12 +++++++-----
 src/BootstrapBlazor.Shared/Locales/zh.json |  4 +++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/BootstrapBlazor.Shared/Locales/en.json b/src/BootstrapBlazor.Shared/Locales/en.json
index c31e66041..76ce84fef 100644
--- a/src/BootstrapBlazor.Shared/Locales/en.json
+++ b/src/BootstrapBlazor.Shared/Locales/en.json
@@ -297,16 +297,18 @@
     "Li2": "Lists/cards with more graphic information content",
     "Li3": "Only used when loading data for the first time",
     "Li4": "Can be completely replaced by Spin, but can provide better visual effects and user experience than Spin in available scenarios",
-    "Block1Title": "Picture frame screen",
+    "Block1Title": "Picture frame",
     "Block1Intro": "Suitable for display when loading avatars, pictures, etc.",
     "P1": "It can be set to a circle display by setting the <code>Circle</code> property",
-    "Block2Title": "Paragraph skeleton screen",
+    "Block2Title": "Paragraph skeleton",
     "Block2Intro": "Applicable to display when loading large paragraphs of text and other types",
     "P2": "The default paragraph skeleton screen only displays three lines. If you need multiple lines to occupy space, please place multiple <code>SkeletonParagraph</code>.",
-    "Block3Title": "Form skeleton screen",
+    "Block3Title": "Form skeleton",
     "Block3Intro": "Suitable for display when the edit form is loaded",
-    "Block4Title": "Table skeleton screen",
-    "Block4Intro": "Applicable to display when the edit table is loaded"
+    "Block4Title": "Table skeleton",
+    "Block4Intro": "Applicable to display when the edit table is loaded",
+    "BlockTreeTitle": "Tree skeleton",
+    "BlockTreeIntro": "Display when tree component is loaded"
   },
   "BootstrapBlazor.Shared.Pages.Coms": {
     "Search": "Search for the desired component",
diff --git a/src/BootstrapBlazor.Shared/Locales/zh.json b/src/BootstrapBlazor.Shared/Locales/zh.json
index ed6336254..e5eaf70d3 100644
--- a/src/BootstrapBlazor.Shared/Locales/zh.json
+++ b/src/BootstrapBlazor.Shared/Locales/zh.json
@@ -306,7 +306,9 @@
     "Block3Title": "表单骨架屏",
     "Block3Intro": "适用于编辑表单加载时显示",
     "Block4Title": "表格骨架屏",
-    "Block4Intro": "适用于编辑表格加载时显示"
+    "Block4Intro": "适用于编辑表格加载时显示",
+    "BlockTreeTitle": "树骨架屏",
+    "BlockTreeIntro": "适用于树组件加载时显示"
   },
   "BootstrapBlazor.Shared.Pages.Coms": {
     "Search": "搜索想要的组件",
-- 
Gitee


From 19d52b7f4a8d3d7a633836828d14f0b2328d9364 Mon Sep 17 00:00:00 2001
From: Argo-Tianyi <argo@163.com>
Date: Fri, 11 Mar 2022 15:41:51 +0800
Subject: [PATCH 4/6] =?UTF-8?q?doc:=20=E5=A2=9E=E5=8A=A0=E5=BC=82=E6=AD=A5?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E6=98=BE=E7=A4=BA=E9=AA=A8=E6=9E=B6=E5=B1=8F?=
 =?UTF-8?q?=E7=A4=BA=E4=BE=8B=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BootstrapBlazor.Shared/Samples/Trees.razor |  5 +++++
 .../Samples/Trees.razor.cs                     | 18 ++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/src/BootstrapBlazor.Shared/Samples/Trees.razor b/src/BootstrapBlazor.Shared/Samples/Trees.razor
index 9d534ba88..886044db8 100644
--- a/src/BootstrapBlazor.Shared/Samples/Trees.razor
+++ b/src/BootstrapBlazor.Shared/Samples/Trees.razor
@@ -89,6 +89,11 @@
     <BlockLogger @ref="TraceCheckedItems" class="mt-3" />
 </DemoBlock>
 
+<DemoBlock Title="加载骨架屏" Introduction="通过设置 <code>ShowSkeleton</code> 使异步加载数据时组件显示骨架屏" Name="ShowSkeleton">
+    <Button Text="异步加载" IsAsync="true" Icon="fa fa-fa" OnClick="OnLoadAsyncItems" />
+    <Tree Items="@AsyncItems" ShowSkeleton="true" class="mt-3" />
+</DemoBlock>
+
 <AttributeTable Items="@GetAttributes()" />
 
 <AttributeTable Items="@GetTreeItemAttributes()" Title="TreeItem 属性" />
diff --git a/src/BootstrapBlazor.Shared/Samples/Trees.razor.cs b/src/BootstrapBlazor.Shared/Samples/Trees.razor.cs
index 63f24b3ae..d7827e1c9 100644
--- a/src/BootstrapBlazor.Shared/Samples/Trees.razor.cs
+++ b/src/BootstrapBlazor.Shared/Samples/Trees.razor.cs
@@ -36,6 +36,24 @@ public sealed partial class Trees
 
     private List<TreeItem> CheckedItems { get; set; } = GetCheckedItems();
 
+    private List<TreeItem>? AsyncItems { get; set; }
+
+    /// <summary>
+    /// OnInitializedAsync 方法
+    /// </summary>
+    /// <returns></returns>
+    protected override async Task OnInitializedAsync()
+    {
+        await OnLoadAsyncItems();
+    }
+
+    private async Task OnLoadAsyncItems()
+    {
+        AsyncItems = null;
+        await Task.Delay(2000);
+        AsyncItems = TreeDataFoo.GetTreeItems();
+    }
+
     private static List<TreeItem> GetCheckedItems()
     {
         var ret = TreeDataFoo.GetTreeItems();
-- 
Gitee


From 44e7a086c8644104815a409c140ce078aa749c08 Mon Sep 17 00:00:00 2001
From: Argo-Tianyi <argo@163.com>
Date: Fri, 11 Mar 2022 15:55:33 +0800
Subject: [PATCH 5/6] =?UTF-8?q?test:=20=E6=9B=B4=E6=96=B0=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/UnitTest/Components/TreeTest.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/UnitTest/Components/TreeTest.cs b/test/UnitTest/Components/TreeTest.cs
index 853a88dc2..7a4ae723f 100644
--- a/test/UnitTest/Components/TreeTest.cs
+++ b/test/UnitTest/Components/TreeTest.cs
@@ -17,7 +17,7 @@ public class TreeTest : BootstrapBlazorTestBase
         cut.DoesNotContain("li");
 
         cut.SetParametersAndRender(pb => pb.Add(a => a.ShowSkeleton, true));
-        cut.Contains("Loading");
+        cut.Contains("skeleton tree");
 
         // 设置 Items
         cut.SetParametersAndRender(pb =>
-- 
Gitee


From d73600a807746aa544bef4332cd134b3c45bbe88 Mon Sep 17 00:00:00 2001
From: Argo-Tianyi <argo@163.com>
Date: Fri, 11 Mar 2022 15:57:55 +0800
Subject: [PATCH 6/6] chore: bump version beta03

---
 src/BootstrapBlazor/BootstrapBlazor.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
index f20ff0f23..7986fd857 100644
--- a/src/BootstrapBlazor/BootstrapBlazor.csproj
+++ b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>6.4.3-beta02</Version>
+    <Version>6.4.3-beta03</Version>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
-- 
Gitee