Merge branch 'doc-deps' into doc-project

ArgoZhang · ArgoZhang · commit 2b0d0010b1cd · 2024-10-10T12:08:06.000+08:00
diff --git a/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj b/src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj
@@ -26,7 +26,7 @@
     <PackageReference Include="BootstrapBlazor.AzureOpenAI" Version="8.0.1" />
     <PackageReference Include="BootstrapBlazor.AzureTranslator" Version="8.1.0" />
     <PackageReference Include="BootstrapBlazor.BaiduSpeech" Version="8.1.0" />
-    <PackageReference Include="BootstrapBlazor.BaiduOcr" Version="8.1.0" />
+    <PackageReference Include="BootstrapBlazor.BaiduOcr" Version="8.1.1" />
     <PackageReference Include="BootstrapBlazor.BarCode" Version="8.0.2" />
     <PackageReference Include="BootstrapBlazor.BarcodeGenerator" Version="0.1.1" />
     <PackageReference Include="BootstrapBlazor.Bluetooth" Version="8.0.2" />
@@ -39,7 +39,7 @@
     <PackageReference Include="BootstrapBlazor.DockView" Version="8.1.6" />
     <PackageReference Include="BootstrapBlazor.DriverJs" Version="8.0.1" />
     <PackageReference Include="BootstrapBlazor.ElementIcon" Version="8.0.0" />
-    <PackageReference Include="BootstrapBlazor.FileViewer" Version="8.1.0" />
+    <PackageReference Include="BootstrapBlazor.FileViewer" Version="8.1.1" />
     <PackageReference Include="BootstrapBlazor.FontAwesome" Version="8.0.6" />
     <PackageReference Include="BootstrapBlazor.Gantt" Version="8.0.1" />
     <PackageReference Include="BootstrapBlazor.Holiday" Version="8.0.1" />
@@ -70,8 +70,6 @@
     <PackageReference Include="BootstrapBlazor.WinBox" Version="8.0.3" />
     <PackageReference Include="Longbow.Logging" Version="8.0.0" />
     <PackageReference Include="Longbow.Tasks" Version="8.0.3" />
-    <PackageReference Include="System.Drawing.Common" Version="8.0.8" />
-    <PackageReference Include="System.Text.Json" Version="8.0.4" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/BootstrapBlazor.Server/Components/Samples/DropdownWidgets.razor b/src/BootstrapBlazor.Server/Components/Samples/DropdownWidgets.razor
@@ -7,7 +7,7 @@
 
 <DemoBlock Title="@Localizer["BasicUsageTitle"]" Introduction="@Localizer["BasicUsageIntro"]" Name="Normal">
     <div class="widget-demo">
-        <DropdownWidget>
+        <DropdownWidget OnItemCloseAsync="OnItemCloseAsync">
             <DropdownWidgetItem Icon="fa-regular fa-envelope" BadgeNumber="4">
                 <HeaderTemplate>
                     <span>@Localizer["BasicUsageMessage"]</span>
@@ -81,7 +81,9 @@
             </DropdownWidgetItem>
         </DropdownWidget>
     </div>
-
+    <section ignore>
+        <ConsoleLogger @ref="_logger"></ConsoleLogger>
+    </section>
 </DemoBlock>
 
 <AttributeTable Items="@GetAttributes()" Title="@Localizer["AttributeTitle"]" />
diff --git a/src/BootstrapBlazor.Server/Components/Samples/DropdownWidgets.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/DropdownWidgets.razor.cs
@@ -9,6 +9,14 @@ namespace BootstrapBlazor.Server.Components.Samples;
 /// </summary>
 public partial class DropdownWidgets
 {
+    private ConsoleLogger _logger = default!;
+
+    private Task OnItemCloseAsync(DropdownWidgetItem item)
+    {
+        _logger.Log($"Item {item.BadgeNumber} closed");
+        return Task.CompletedTask;
+    }
+
     private AttributeItem[] GetAttributes() =>
     [
         new()
@@ -82,6 +90,14 @@ private AttributeItem[] GetAttributes() =>
             Type = "RenderFragment",
             ValueList = " — ",
             DefaultValue = " — "
+        },
+        new()
+        {
+            Name = "OnItemCloseAsync",
+            Description = Localizer["OnItemCloseAsync"],
+            Type = "Func<DropdownWidgetItem, Task>",
+            ValueList = " — ",
+            DefaultValue = " — "
         }
     ];
 }
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Table/Tables.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/Table/Tables.razor.cs
@@ -646,6 +646,22 @@ private AttributeItem[] GetAttributes() =>
             DefaultValue = "false"
         },
         new()
+        {
+            Name = nameof(Table<Foo>.IsKeepSelectedRows),
+            Description = Localizer["IsKeepSelectedRowsAttr"],
+            Type = "boolean",
+            ValueList = "true / false",
+            DefaultValue = "false"
+        },
+        new()
+        {
+            Name = nameof(Table<Foo>.IsKeepSelectedRowAfterAdd),
+            Description = Localizer["IsKeepSelectedRowAfterAddAttr"],
+            Type = "boolean",
+            ValueList = "true / false",
+            DefaultValue = "false"
+        },
+        new()
         {
             Name = "ClickToSelect",
             Description = Localizer["ClickToSelectAttr"],
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Table/TablesEdit.razor b/src/BootstrapBlazor.Server/Components/Samples/Table/TablesEdit.razor
@@ -150,7 +150,6 @@
         <RadioList @bind-Value="InsertMode" />
     </section>
     <Table TItem="Foo"
-           IsPagination="true" PageItemsSource="@PageItemsSource"
            IsStriped="true" IsBordered="true" IsMultipleSelect="true"
            ShowToolbar="true" ShowExtendButtons="true" ShowSkeleton="true"
            AddModalTitle="@Localizer["TablesEditModeAddModalTitle"]" EditModalTitle="@Localizer["TablesEditModeEditModalTitle"]"
@@ -169,7 +168,6 @@
         <p>@((MarkupString)Localizer["TablesEditModeDrawer"].Value)</p>
     </section>
     <Table TItem="Foo"
-           IsPagination="true" PageItemsSource="@PageItemsSource"
            IsStriped="true" IsBordered="true" IsMultipleSelect="true"
            ShowToolbar="true" ShowExtendButtons="true" ShowSkeleton="true"
            AddModalTitle="@Localizer["TablesEditModeAddModalTitle"]" EditModalTitle="@Localizer["TablesEditModeEditModalTitle"]"
diff --git a/src/BootstrapBlazor.Server/Locales/en-US.json b/src/BootstrapBlazor.Server/Locales/en-US.json
@@ -3980,7 +3980,8 @@
     "BasicUsageNotify": "You have 10 unread notifications",
     "BasicUsageViewNotify": "View all notifications",
     "BasicUsageTasks": "You have 3 tasks",
-    "BasicUsageViewTasks": "View all tasks"
+    "BasicUsageViewTasks": "View all tasks",
+    "OnItemCloseAsync": "Close dropdown widget item callback method"
   },
   "BootstrapBlazor.Server.Components.Samples.Empties": {
     "Title": "Empty",
@@ -4894,6 +4895,8 @@
     "IsTreeAttr": "Is it tree data",
     "IsDetailsAttr": "Whether it is a detail row table, use DetailRowTemplate for logical judgment when not set",
     "IsHideFooterWhenNoDataAttr": "Whether to show Footer when no data is available",
+    "IsKeepSelectedRowsAttr": "Whether to keep the selected row after switch page index",
+    "IsKeepSelectedRowAfterAddAttr": "Whether to keep the selected row after call add method",
     "ClickToSelectAttr": "Click on the line to select the line",
     "ShowCheckboxTextAttr": "Selection column that displays text",
     "ShowFooterAttr": "Show feet",
diff --git a/src/BootstrapBlazor.Server/Locales/zh-CN.json b/src/BootstrapBlazor.Server/Locales/zh-CN.json
@@ -3980,7 +3980,8 @@
     "BasicUsageNotify": "您有 10 个未读通知",
     "BasicUsageViewNotify": "查看所有通知",
     "BasicUsageTasks": "您有 3 个任务",
-    "BasicUsageViewTasks": "查看所有任务"
+    "BasicUsageViewTasks": "查看所有任务",
+    "OnItemCloseAsync": "关闭菜单项回调方法"
   },
   "BootstrapBlazor.Server.Components.Samples.Empties": {
     "Title": "Empty 空状态",
@@ -4894,6 +4895,8 @@
     "IsTreeAttr": "是否为树形数据",
     "IsDetailsAttr": "是否为明细行表格，未设置时使用 DetailRowTemplate 进行逻辑判断",
     "IsHideFooterWhenNoDataAttr": "无数据时是否显示 Footer",
+    "IsKeepSelectedRowsAttr": "翻页后是否保持选中行数据",
+    "IsKeepSelectedRowAfterAddAttr": "新建数据后是否保持选中行",
     "ClickToSelectAttr": "点击行即选中本行",
     "ShowCheckboxTextAttr": "显示文字的选择列",
     "ShowFooterAttr": "是否显示表脚",
diff --git a/src/BootstrapBlazor.Server/Properties/launchSettings.json b/src/BootstrapBlazor.Server/Properties/launchSettings.json
@@ -8,7 +8,7 @@
     }
   },
   "profiles": {
-    "WebConsole": {
+    "console": {
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
@@ -17,15 +17,6 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
-    "Watch": {
-      "commandName": "Executable",
-      "executablePath": "dotnet.exe",
-      "workingDirectory": "$(ProjectDir)",
-      "commandLineArgs": "watch run",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
     "https": {
       "commandName": "Project",
       "dotnetRunMessages": true,
@@ -35,26 +26,12 @@
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
     },
-    "LanConsole": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "applicationUrl": "http://0.0.0.0/",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
     "IIS Express": {
       "commandName": "IISExpress",
       "launchBrowser": true,
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
-    },
-    "Docker": {
-      "commandName": "Docker",
-      "launchBrowser": true,
-      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}"
     }
   }
 }
diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>8.10.2-beta03</Version>
+    <Version>8.10.2-beta05</Version>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
diff --git a/src/BootstrapBlazor/Components/DropdownWidget/DropdownWidget.razor b/src/BootstrapBlazor/Components/DropdownWidget/DropdownWidget.razor
@@ -1,7 +1,8 @@
 ﻿@namespace BootstrapBlazor.Components
-@inherits BootstrapComponentBase
+@inherits BootstrapModuleComponentBase
+@attribute [BootstrapModuleAutoLoader(JSObjectReference = true)]
 
-<div @attributes="@AdditionalAttributes" class="@ClassString">
+<div @attributes="@AdditionalAttributes" class="@ClassString" id="@Id">
     <CascadingValue Value="this" IsFixed="true">
         @ChildContent
     </CascadingValue>
diff --git a/src/BootstrapBlazor/Components/DropdownWidget/DropdownWidget.razor.cs b/src/BootstrapBlazor/Components/DropdownWidget/DropdownWidget.razor.cs
@@ -25,8 +25,26 @@ public sealed partial class DropdownWidget
     [Parameter]
     public IEnumerable<DropdownWidgetItem>? Items { get; set; }
 
+    /// <summary>
+    /// 获得/设置 下拉项关闭回调方法
+    /// </summary>
+    [Parameter]
+    public Func<DropdownWidgetItem, Task>? OnItemCloseAsync { get; set; }
+
+    /// <summary>
+    /// 获得/设置 下拉项关闭回调方法
+    /// </summary>
+    [Parameter]
+    public Func<DropdownWidgetItem, Task>? OnItemShownAsync { get; set; }
+
     private List<DropdownWidgetItem> Childs { get; } = new List<DropdownWidgetItem>(20);
 
+    /// <summary>
+    /// <inheritdoc/>
+    /// </summary>
+    /// <returns></returns>
+    protected override Task InvokeInitAsync() => InvokeVoidAsync("init", Id, Interop, new { Method = nameof(TriggerStateChanged) });
+
     /// <summary>
     /// 添加 DropdownWidgetItem 方法
     /// </summary>
@@ -37,4 +55,28 @@ internal void Add(DropdownWidgetItem item)
     }
 
     private IEnumerable<DropdownWidgetItem> GetItems() => Items == null ? Childs : Childs.Concat(Items);
+
+    /// <summary>
+    /// Widget 下拉项关闭回调方法 由 JavaScript 调用
+    /// </summary>
+    /// <param name="index"></param>
+    /// <param name="shown"></param>
+    /// <returns></returns>
+    [JSInvokable]
+    public async Task TriggerStateChanged(int index, bool shown)
+    {
+        var items = GetItems().ToList();
+        var item = index < items.Count ? items[index] : null;
+        if (item != null)
+        {
+            if (OnItemCloseAsync != null && !shown)
+            {
+                await OnItemCloseAsync(item);
+            }
+            else if (OnItemShownAsync != null && shown)
+            {
+                await OnItemShownAsync(item);
+            }
+        }
+    }
 }
diff --git a/src/BootstrapBlazor/Components/DropdownWidget/DropdownWidget.razor.js b/src/BootstrapBlazor/Components/DropdownWidget/DropdownWidget.razor.js
@@ -0,0 +1,23 @@
+﻿import EventHandler from "../../modules/event-handler.js"
+
+export function init(id, invoke, options) {
+    const el = document.getElementById(id);
+    if (el === null) {
+        return;
+    }
+
+    const invokeMethod = e => {
+        const item = e.target;
+        const items = [...el.querySelectorAll("[data-bs-toggle=\"dropdown\"]")];
+        const index = items.indexOf(item);
+        invoke.invokeMethodAsync(method, index, e.type === 'shown.bs.dropdown');
+    }
+
+    const { method } = options;
+    EventHandler.on(el, 'shown.bs.dropdown', invokeMethod);
+    EventHandler.on(el, 'hidden.bs.dropdown', invokeMethod);
+}
+
+export function dispose(id) {
+    EventHandler.off(el, 'hidden.bs.dropdown');
+}
diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.Checkbox.cs b/src/BootstrapBlazor/Components/Table/Table.razor.Checkbox.cs
@@ -24,6 +24,12 @@ public partial class Table<TItem>
     [Parameter]
     public bool IsKeepSelectedRows { get; set; }
 
+    /// <summary>
+    /// 获得/设置 新建数据是否保持原选择行，默认为 false 不保持
+    /// </summary>
+    [Parameter]
+    public bool IsKeepSelectedRowAfterAdd { get; set; }
+
     /// <summary>
     /// 获得 表头行是否选中状态
     /// </summary>
diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.Edit.cs b/src/BootstrapBlazor/Components/Table/Table.razor.Edit.cs
@@ -287,21 +287,18 @@ private async Task InternalOnAddAsync()
     [Parameter]
     public Func<TItem>? CreateItemCallback { get; set; }
 
-    private TItem CreateTItem()
+    private TItem CreateTItem() => CreateItemCallback?.Invoke() ?? CreateInstance();
+
+    private TItem CreateInstance()
     {
-        var item = CreateItemCallback?.Invoke();
-        if (item == null)
+        try
         {
-            try
-            {
-                item = Activator.CreateInstance<TItem>();
-            }
-            catch (Exception)
-            {
-                throw new InvalidOperationException($"{typeof(TItem)} missing new() method. Please provider {nameof(CreateItemCallback)} create the {typeof(TItem)} instance. {typeof(TItem)} 未提供无参构造函数 new() 请通过 {nameof(CreateItemCallback)} 回调方法创建实例");
-            }
+            return Activator.CreateInstance<TItem>();
+        }
+        catch (Exception)
+        {
+            throw new InvalidOperationException($"{typeof(TItem)} missing new() method. Please provider {nameof(CreateItemCallback)} create the {typeof(TItem)} instance. {typeof(TItem)} 未提供无参构造函数 new() 请通过 {nameof(CreateItemCallback)} 回调方法创建实例");
         }
-        return item;
     }
 
     /// <summary>
diff --git a/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs b/src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs
@@ -486,8 +486,12 @@ public async Task AddAsync()
             // 数据源为 DataTable 新建后重建行与列
             await DynamicContext.AddAsync(SelectedRows.OfType<IDynamicObject>());
             ResetDynamicContext();
-            SelectedRows.Clear();
-            await OnSelectedRowsChanged();
+
+            if (!IsKeepSelectedRowAfterAdd)
+            {
+                SelectedRows.Clear();
+                await OnSelectedRowsChanged();
+            }
         }
         else if (IsExcel)
         {
diff --git a/test/UnitTest/Components/DropdownWidgetTest.cs b/test/UnitTest/Components/DropdownWidgetTest.cs
diff --git a/test/UnitTest/Components/TableTest.cs b/test/UnitTest/Components/TableTest.cs
