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

Author: actions-user

src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj

@@ -29,7 +29,7 @@
     <PackageReference Include="BootstrapBlazor.BarCode" Version="9.0.1" />
     <PackageReference Include="BootstrapBlazor.BarcodeGenerator" Version="9.0.0" />
     <PackageReference Include="BootstrapBlazor.BootstrapIcon" Version="9.0.2" />
-    <PackageReference Include="BootstrapBlazor.Chart" Version="9.0.0" />
+    <PackageReference Include="BootstrapBlazor.Chart" Version="9.0.1" />
     <PackageReference Include="BootstrapBlazor.ChatBot" Version="9.0.0" />
     <PackageReference Include="BootstrapBlazor.CherryMarkdown" Version="9.0.3" />
     <PackageReference Include="BootstrapBlazor.CodeEditor" Version="9.0.3" />

src/BootstrapBlazor.Server/Components/Samples/Charts/Bar.razor.cs

@@ -59,14 +59,15 @@ private Task<ChartDataSource> OnInit(bool stacked, bool setTitle = true)
             ds.Options.Title = "Bar Histogram";
         }
 
+        ds.Options.ShowDataLabel = true;
         ds.Options.X.Title = "days";
         ds.Options.Y.Title = "Numerical value";
         ds.Options.X.Stacked = stacked;
         ds.Options.Y.Stacked = stacked;
         ds.Labels = Enumerable.Range(1, _barDataCount).Select(i => i.ToString());
         for (var index = 0; index < _barDatasetCount; index++)
         {
-            ds.Data.Add(new ChartDataset() { Label = $"Set {index}", Data = Enumerable.Range(1, _barDataCount).Select(i => Random.Shared.Next(20, 37)).Cast<object>() });
+            ds.Data.Add(new ChartDataset() { Label = $"Set {index}", Data = Enumerable.Range(1, _barDataCount).Select(i => Random.Shared.Next(20, 37) / 10.0f).Cast<object>() });
         }
 
         return Task.FromResult(ds);

src/BootstrapBlazor.Server/Components/Samples/ListGroups.razor.cs

@@ -87,6 +87,14 @@ private AttributeItem[] GetAttributes() =>
             DefaultValue = " — "
         },
         new()
+        {
+            Name = "OnDoubleClickItem",
+            Description = Localizer["AttrOnDoubleClickItem"],
+            Type = "Func<TItem, Task>",
+            ValueList = " — ",
+            DefaultValue = " — "
+        },
+        new()
         {
             Name = "GetItemDisplayText",
             Description = Localizer["GetItemDisplayText"],

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

@@ -6488,6 +6488,7 @@
     "AttrHeaderText": "the title of Header",
     "AttrItemTemplate": "the template of Item",
     "AttrOnClickItem": "the callback on click item",
+    "AttrOnDoubleClickItem": "the callback on double click item",
     "GetItemDisplayText": "the callback on get item display text"
   },
   "BootstrapBlazor.Server.Components.Samples.Marquees": {

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

@@ -6488,6 +6488,7 @@
     "AttrHeaderText": "标题栏文字",
     "AttrItemTemplate": "选项模板",
     "AttrOnClickItem": "点击候选项回调方法",
+    "AttrOnDoubleClickItem": "双击候选项回调方法",
     "GetItemDisplayText": "获得显示项显示内容回调方法"
   },
   "BootstrapBlazor.Server.Components.Samples.Marquees": {

src/BootstrapBlazor/Components/ListGroup/ListGroup.razor

@@ -14,7 +14,8 @@
     <div class="list-group-body scroll">
         @foreach (var item in Items)
         {
-            <div @key="item" class="@GetItemClassString(item)" @onclick="() => OnClick(item)">
+            <div @key="item" class="@GetItemClassString(item)"
+                 @onclick="() => OnClick(item)" @ondblclick="() => OnDoubleClick(item)">
                 @if (ItemTemplate != null)
                 {
                     @ItemTemplate(item)

src/BootstrapBlazor/Components/ListGroup/ListGroup.razor.cs

@@ -44,6 +44,12 @@ public partial class ListGroup<TItem>
     [Parameter]
     public Func<TItem, Task>? OnClickItem { get; set; }
 
+    /// <summary>
+    /// 获得/设置 双击 List 项目回调方法
+    /// </summary>
+    [Parameter]
+    public Func<TItem, Task>? OnDoubleClickItem { get; set; }
+
     /// <summary>
     /// 获得/设置 获得条目显示文本内容回调方法
     /// </summary>
@@ -78,4 +84,13 @@ private async Task OnClick(TItem item)
         }
         CurrentValue = item;
     }
+
+    private async Task OnDoubleClick(TItem item)
+    {
+        if (OnDoubleClickItem != null)
+        {
+            await OnDoubleClickItem(item);
+        }
+        CurrentValue = item;
+    }
 }

test/UnitTest/Components/ListGroupTest.cs

@@ -27,7 +27,7 @@ public void Items_Ok()
     }
 
     [Fact]
-    public void ClickItem_Ok()
+    public async Task ClickItem_Ok()
     {
         var clicked = false;
         var cut = Context.RenderComponent<ListGroup<Foo>>(pb =>
@@ -44,8 +44,30 @@ public void ClickItem_Ok()
             });
         });
         var item = cut.Find(".list-group-item");
-        item.Click();
-        cut.WaitForState(() => clicked);
+        await cut.InvokeAsync(() => item.Click());
+        Assert.True(clicked);
+    }
+
+    [Fact]
+    public async Task DoubleClickItem_Ok()
+    {
+        var clicked = false;
+        var cut = Context.RenderComponent<ListGroup<Foo>>(pb =>
+        {
+            pb.Add(a => a.Items,
+            [
+                new() { Name = "Test 1" },
+                new() { Name = "Test 1" }
+            ]);
+            pb.Add(a => a.OnDoubleClickItem, foo =>
+            {
+                clicked = true;
+                return Task.CompletedTask;
+            });
+        });
+        var item = cut.Find(".list-group-item");
+        await cut.InvokeAsync(() => item.DoubleClick());
+        Assert.True(clicked);
     }
 
     [Fact]