doc(Error): update sample code reduce error log (#5174)

* doc: 忽略取消异常

* doc: 更新 Menu 示例代码

* test: 增加单元测试

Author: ArgoZhang

src/BootstrapBlazor.Server/Components/Samples/Menus.razor

@@ -13,8 +13,8 @@
 <DemoBlock Title="@Localizer["MenusTopBarTitle"]"
            Introduction="@Localizer["MenusTopBarIntro"]"
            Name="TopBar">
-    <Menu Items="@Items" DisableNavigation="true" OnClick="@OnClickMenu" />
-    <ConsoleLogger @ref="Logger" />
+    <Menu Items="@Items" DisableNavigation="true" OnClick="@OnClickMenu"></Menu>
+    <ConsoleLogger @ref="Logger"></ConsoleLogger>
 </DemoBlock>
 
 <DemoBlock Title="@Localizer["MenusBottomBarTitle"]"
@@ -25,21 +25,21 @@
     </Tips>
     <div style="height: 120px; position: relative;">
         <div>@ClickedMenuItemText</div>
-        <Menu Items="@BottomItems" DisableNavigation="true" OnClick="@OnClickBottomMenu" IsBottom="true" />
+        <Menu Items="@BottomItems" DisableNavigation="true" OnClick="@OnClickBottomMenu" IsBottom="true"></Menu>
     </div>
 </DemoBlock>
 
 <DemoBlock Title="@Localizer["MenusIconTopTitle"]"
            Introduction="@Localizer["MenusIconTopIntro"]"
            Name="IconTop">
-    <Menu Items="@IconItems" DisableNavigation="true" />
+    <Menu Items="@IconItems" DisableNavigation="true"></Menu>
 </DemoBlock>
 
 <DemoBlock Title="@Localizer["MenusLeftRightLayoutTitle"]"
            Introduction="@Localizer["MenusLeftRightLayoutIntro"]"
            Name="LeftRightLayout">
-    <Menu Items="@SideMenuItems" DisableNavigation="true" IsVertical="true" OnClick="@OnClickSideMenu" style="width:220px; border-right: 1px solid #e6e6e6; padding-right: 4px;" />
-    <ConsoleLogger @ref="SideLogger" />
+    <Menu Items="@SideMenuItems" DisableNavigation="true" IsVertical="true" OnClick="@OnClickSideMenu" style="width:220px; border-right: 1px solid #e6e6e6; padding-right: 4px;"></Menu>
+    <ConsoleLogger @ref="SideLogger"></ConsoleLogger>
 </DemoBlock>
 
 <DemoBlock Title="@Localizer["MenusIconLeftTitle"]"
@@ -51,7 +51,7 @@
 <DemoBlock Title="@Localizer["MenusAccordionTitle"]"
            Introduction="@Localizer["MenusAccordionIntro"]"
            Name="Accordion">
-    <Menu Items="@IconSideMenuItems" DisableNavigation="true" IsVertical="true" IsAccordion="true" style="border-right: 1px solid #e6e6e6; width:220px;" />
+    <Menu Items="@IconSideMenuItems" DisableNavigation="true" IsVertical="true" IsAccordion="true" style="border-right: 1px solid #e6e6e6; width:220px;"></Menu>
 </DemoBlock>
 
 <DemoBlock Title="@Localizer["MenusClickShrinkTitle"]"
@@ -91,36 +91,34 @@
 <DemoBlock Title="@Localizer["MenusWidgetTitle"]"
            Introduction="@Localizer["MenusWidgetIntro"]"
            Name="Widget">
-    <Menu Items="@WidgetIconSideMenuItems" DisableNavigation="true" IsVertical="true" style="border-right: 1px solid #e6e6e6; width:220px;" />
+    <Menu Items="@WidgetIconSideMenuItems" DisableNavigation="true" IsVertical="true" style="border-right: 1px solid #e6e6e6; width:220px;"></Menu>
 </DemoBlock>
 
 <DemoBlock Title="@Localizer["MenusCustomNodeTitle"]"
            Introduction="@Localizer["MenusCustomNodeIntro"]"
            Name="CustomNode">
-    <p>@((MarkupString)Localizer["MenusCustomNodeDescription"].Value)</p>
-    <Menu Items="@CollapsedIconSideMenuItems" DisableNavigation="true" IsVertical="true" style="border-right: 1px solid #e6e6e6; width:220px;" />
+    <section ignore>@((MarkupString)Localizer["MenusCustomNodeDescription"].Value)</section>
+    <Menu Items="@CollapsedIconSideMenuItems" DisableNavigation="true" IsVertical="true" style="border-right: 1px solid #e6e6e6; width:220px;"></Menu>
 </DemoBlock>
 
 <DemoBlock Title="@Localizer["MenusDynamicTitle"]"
            Introduction="@Localizer["MenusDynamicIntro"]"
            Name="Dynamic">
-    <Menu Items="@DynamicSideMenuItems" DisableNavigation="true" IsVertical="true" style="border-right: 1px solid #e6e6e6; width:220px;" class="mb-3" />
-    <Button Text="@Localizer["MenusDynamicButton1Text"]" OnClick="UpdateMenu" />
-    <Button Text="@Localizer["MenusDynamicButton2Text"]" OnClick="ResetMenu" />
+    <Menu Items="@DynamicSideMenuItems" DisableNavigation="true" IsVertical="true" style="border-right: 1px solid #e6e6e6; width:220px;" class="mb-3"></Menu>
+    <Button Text="@Localizer["MenusDynamicButton1Text"]" OnClick="UpdateMenu"></Button>
+    <Button Text="@Localizer["MenusDynamicButton2Text"]" OnClick="ResetMenu"></Button>
 </DemoBlock>
 
 <DemoBlock Title="@Localizer["MenusPartDisableTitle"]"
            Introduction="@Localizer["MenusPartDisableIntro"]"
            Name="PartDisable">
-    <p>@((MarkupString)Localizer["MenusPartDisableDescription1"].Value)</p>
+    <section ignore>@((MarkupString)Localizer["MenusPartDisableDescription1"].Value)</section>
 
-    <Menu Items="@DisabledMenuItems" DisableNavigation="true" OnClick="@OnClick2" />
-    <p class="mt-3"><b>@Localizer["MenusPartDisableDescription2"]</b></p>
+    <Menu Items="@DisabledMenuItems" DisableNavigation="true"></Menu>
+    <section ignore class="mt-3"><b>@Localizer["MenusPartDisableDescription2"]</b></section>
     <div style="width:220px; border-right: 1px solid #e6e6e6;">
-        <Menu Items="@DisabledMenuItems" DisableNavigation="true" IsVertical="true" OnClick="@OnClick2" />
+        <Menu Items="@DisabledMenuItems" DisableNavigation="true" IsVertical="true"></Menu>
     </div>
-
-    <ConsoleLogger @ref="Logger" />
 </DemoBlock>
 
 <AttributeTable Items="@GetAttributes()" />

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

@@ -95,12 +95,6 @@ private async Task ResetMenu()
         DynamicSideMenuItems = await MenusDataGenerator.GetSideMenuItemsAsync(Localizer);
     }
 
-    private Task OnClick2(MenuItem item)
-    {
-        DisabledLogger.Log($"菜单点击项: {item.Text}");
-        return Task.CompletedTask;
-    }
-
     private AttributeItem[] GetAttributes() =>
     [
         new()

src/BootstrapBlazor/Services/IPLocator/BaiduIpLocatorProvider.cs

@@ -29,6 +29,7 @@ public class BaiduIpLocatorProvider(IHttpClientFactory httpClientFactory, IOptio
             using var token = new CancellationTokenSource(3000);
             ret = await Fetch(url, _client, token.Token);
         }
+        catch (TaskCanceledException) { }
         catch (Exception ex)
         {
             logger.LogError(ex, "Url: {url}", url);

test/UnitTest/Services/IpLocatorTest.cs

@@ -108,6 +108,10 @@ public async Task Fetch_Error()
         var result = await provider.Locate("223.91.188.112");
         Assert.Null(result);
 
+        var cancelPprovider = new MockProviderFetchCancelError(factory, option, logger);
+        result = await cancelPprovider.Locate("223.91.188.112");
+        Assert.Null(result);
+
         var configuration = Context.Services.GetRequiredService<IConfiguration>();
         var juHeLogger = Context.Services.GetRequiredService<ILogger<JuHeIpLocatorProvider>>();
         var juHeProvider = new MockProviderJuHeFetchError(factory, configuration, option, juHeLogger);
@@ -163,6 +167,11 @@ class MockProviderFetchError(IHttpClientFactory httpClientFactory, IOptions<Boot
         protected override Task<string?> Fetch(string url, HttpClient client, CancellationToken token) => throw new InvalidOperationException();
     }
 
+    class MockProviderFetchCancelError(IHttpClientFactory httpClientFactory, IOptions<BootstrapBlazorOptions> option, ILogger<MockProviderFetchError> logger) : BaiduIpLocatorProvider(httpClientFactory, option, logger)
+    {
+        protected override Task<string?> Fetch(string url, HttpClient client, CancellationToken token) => throw new TaskCanceledException();
+    }
+
     class MockProviderJuHeFetchError(IHttpClientFactory httpClientFactory, IConfiguration configuration, IOptions<BootstrapBlazorOptions> option, ILogger<JuHeIpLocatorProvider> logger) : JuHeIpLocatorProvider(httpClientFactory, configuration, option, logger)
     {
         protected override Task<string?> Fetch(string url, HttpClient client, CancellationToken token) => throw new InvalidOperationException();