Merge branch 'main' into Feat_20250313

Author: ArgoZhang

src/BootstrapBlazor.Server/Components/Pages/Introduction.razor

@@ -3,11 +3,7 @@
 
 <h3>@Localizer["Title"]</h3>
 
-<p>@Localizer["P1"]</p>
-
-<p>@Localizer["P2"]</p>
-
-<p>@((MarkupString)Localizer["P3"].Value)</p>
+<p>@Localizer["SubTitle"]</p>
 
 <h3>@Localizer["UpdateTitle"]</h3>
 

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

@@ -27,7 +27,7 @@
            Introduction="@Localizer["TreeViewNormalIntro"]"
            Name="Normal">
     <section ignore>@((MarkupString)Localizer["TreeViewNormalDescription"].Value)</section>
-    <TreeView Items="@NormalItems" OnTreeItemClick="@OnTreeItemClick" />
+    <TreeView Items="@NormalItems" OnTreeItemClick="@OnTreeItemClick" ShowToolbar="true"></TreeView>
     <ConsoleLogger @ref="Logger1" />
 </DemoBlock>
 
@@ -203,6 +203,16 @@
     </div>
 </DemoBlock>
 
+<DemoBlock Title="@Localizer["TreeViewShowToolbarTitle"]"
+           Introduction="@Localizer["TreeViewShowToolbarIntro"]"
+           Name="ShowToolbar">
+    <section ignore>
+        <p>@((MarkupString)Localizer["TreeViewShowToolbarDesc"].Value)</p>
+    </section>
+    <TreeView Items="@EditItems" ShowToolbar="true" OnUpdateCallbackAsync="OnUpdateCallbackAsync">
+    </TreeView>
+</DemoBlock>
+
 <AttributeTable Items="@GetAttributes()"></AttributeTable>
 
 <AttributeTable Items="@GetTreeItemAttributes()" Title="@Localizer["TreeViewsAttribute"]"></AttributeTable>

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

@@ -30,6 +30,8 @@ public sealed partial class TreeViews
 
     private List<TreeViewItem<TreeFoo>> Items { get; } = TreeFoo.GetTreeItems();
 
+    private List<TreeViewItem<TreeFoo>> EditItems { get; } = TreeFoo.GetTreeItems();
+
     private bool AutoCheckChildren { get; set; }
 
     private bool AutoCheckParent { get; set; }
@@ -218,6 +220,12 @@ private static async Task<IEnumerable<TreeViewItem<TreeFoo>>> OnExpandVirtualNod
         return items;
     }
 
+    private Task<bool> OnUpdateCallbackAsync(TreeFoo foo, string? text)
+    {
+        foo.Text = text;
+        return Task.FromResult(true);
+    }
+
     /// <summary>
     /// 获得属性方法
     /// </summary>

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

@@ -711,7 +711,10 @@
     "TreeViewEnableKeyboardArrowUpDownIntro": "Support keyboard up and down arrow operations by setting <code>EnableKeyboardArrowUpDown=\"true\"</code>. <kbd>ArrowLeft</kbd> collapse the node, <kbd>ArrowRight</kbd> expand the node, <kbd>ArrowUp</kbd> move the node up, <kbd>ArrowDown</kbd> move the node down, <kbd>Space</kbd> select the node,",
     "TreeViewVirtualizeTitle": "Virtualize",
     "TreeViewVirtualizeIntro": "Enable virtual scrolling by setting <code>IsVirtualize=\"true\"</code> to support big data",
-    "TreeViewVirtualizeDescription": "The component uses <code>Virtualize</code> to implement virtual scrolling logic, which reduces the pressure on the browser. However, if there is a lot of tree structure data, such as <b>Select All</b>, all data must be marked, resulting in large data in the memory. This problem has not been solved yet. Currently, this component still puts a lot of pressure on the <b>CPU</b> due to large data."
+    "TreeViewVirtualizeDescription": "The component uses <code>Virtualize</code> to implement virtual scrolling logic, which reduces the pressure on the browser. However, if there is a lot of tree structure data, such as <b>Select All</b>, all data must be marked, resulting in large data in the memory. This problem has not been solved yet. Currently, this component still puts a lot of pressure on the <b>CPU</b> due to large data.",
+    "TreeViewShowToolbarTitle": "Show Toolbar",
+    "TreeViewShowToolbarIntro": "Show the toolbar by setting <code>ShowToolbar=\"true\"</code>",
+    "TreeViewShowToolbarDesc": "After it is turned on, when the mouse hovers over a node, a toolbar icon appears on the right, and the toolbar function can be customized; data is updated by setting the <code>OnUpdateCallbackAsync</code> callback method; the toolbar template is defined by setting <code>ToolbarTemplate</code>, and if not set, the internal default node name template is used"
   },
   "BootstrapBlazor.Server.Components.Samples.SwitchButtons": {
     "SwitchButtonsTitle": "Switch Button state switch button",
@@ -5747,11 +5750,9 @@
   },
   "BootstrapBlazor.Server.Components.Pages.Introduction": {
     "Title": "Introduction",
-    "P1": "BootstrapBlazor is an enterprise-level component library based on Bootstrap and Blazor, which can be considered as the Blazor version of the Bootstrap project.",
-    "P2": "The dependency is：BootstrapBlazor > Bootstrap",
-    "P3": "In the latest <a href='template' target='_blank'>Project Template</a> ,the above dependencies are packaged and bundled, which greatly simplifies use",
+    "SubTitle": "BootstrapBlazor is an enterprise-level component library based on Bootstrap and Blazor, which can be considered as the Blazor version of the Bootstrap project.",
     "UpdateTitle": "Update Log",
-    "UpdateLog": "In order to fix the components <b><code>bugs</code></b>, a small version of the component may be released every day. The second <b><code>Thursday</code></b> every month release <b><code>official version</code></b>",
+    "UpdateLog": "In order to fix the components <b><code>bugs</code></b>, a small version of the component may be released every day.",
     "UpdateLogLink": "[Update Log]",
     "LearnTitle": "Learning materials",
     "LearnLi1": "Blazor Official Document",
@@ -5770,7 +5771,7 @@
     "GetStarted": "Get Started",
     "QuickStart": "Quick Start",
     "Features": "Features of Components",
-    "P6": "The Bootstrap Blazor UI component library provides everything from basic <code>Button</code> components to advanced web-level <code>SmartPage</code> components",
+    "P6": "The Bootstrap Blazor UI component library provides everything from basic <code>Button</code> components to advanced web-level <code>Online</code> components",
     "Advantage": "Advantage",
     "AdvantageLi1": "No need to write <code>JavaScript</code> to use components",
     "AdvantageLi2": "The component supports all <code>html</code> features",

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

@@ -711,7 +711,10 @@
     "TreeViewEnableKeyboardArrowUpDownIntro": "通过设置 <code>EnableKeyboardArrowUpDown=\"true\"</code> 支持键盘上下箭头操作。<kbd>左箭头</kbd> 收起节点，<kbd>右箭头</kbd> 展开节点，<kbd>上箭头</kbd> 向上移动节点，<kbd>下箭头</kbd> 向下移动节点，<kbd>空格</kbd> 选中节点",
     "TreeViewVirtualizeTitle": "虚拟滚动",
     "TreeViewVirtualizeIntro": "通过设置 <code>IsVirtualize=\"true\"</code> 开启虚拟滚动，支持大数据",
-    "TreeViewVirtualizeDescription": "组件内部使用 <code>Virtualize</code> 来实现虚拟滚动逻辑，对浏览器压力会减少很多；但是如果树状结构数据比较多，比如 <b>全选</b> 等操作必须对所有数据进行标记，导致内存中确实有大数据存在，目前还没有解决这个问题，目前此组件由于大数据对 <b>CPU</b> 压力还是比较大的"
+    "TreeViewVirtualizeDescription": "组件内部使用 <code>Virtualize</code> 来实现虚拟滚动逻辑，对浏览器压力会减少很多；但是如果树状结构数据比较多，比如 <b>全选</b> 等操作必须对所有数据进行标记，导致内存中确实有大数据存在，目前还没有解决这个问题，目前此组件由于大数据对 <b>CPU</b> 压力还是比较大的",
+    "TreeViewShowToolbarTitle": "显示工具栏",
+    "TreeViewShowToolbarIntro": "通过设置 <code>ShowToolbar=\"true\"</code> 显示工具栏",
+    "TreeViewShowToolbarDesc": "开启后鼠标悬浮节点时，右侧出现工具栏图标，可自定义工具栏功能；通过设置 <code>OnUpdateCallbackAsync</code> 回调方法进行数据的更新；通过设置 <code>ToolbarTemplate</code> 定义工具栏模板，如未设置时使用内部默认更改节点名称模板"
   },
   "BootstrapBlazor.Server.Components.Samples.SwitchButtons": {
     "SwitchButtonsTitle": "Switch Button 状态切换按钮",
@@ -5747,11 +5750,9 @@
   },
   "BootstrapBlazor.Server.Components.Pages.Introduction": {
     "Title": "简介",
-    "P1": "BootstrapBlazor 是一套基于 Bootstrap 和 Blazor 的企业级组件库，可以认为是 Bootstrap 项目的 Blazor 版实现。",
-    "P2": "依赖关系为：BootstrapBlazor > Bootstrap",
-    "P3": "最新 <a href='template' target='_blank'>项目模板</a> 中将以上依赖进行了打包捆绑大大简化使用",
+    "SubTitle": "BootstrapBlazor 是一套基于 Bootstrap 和 Blazor 的企业级组件库，可以认为是 Bootstrap 项目的 Blazor 版实现。",
     "UpdateTitle": "更新日志",
-    "UpdateLog": "为了修复组件 <code>bug</code> 每天可能有小版本发布，每个月第二个 <b><code>周四</code></b> 发布 <b><code>正式版</code></b> 更新日志",
+    "UpdateLog": "为了修复组件 <code>bug</code> 每天可能有小版本发布更新日志",
     "UpdateLogLink": "[传送门]",
     "LearnTitle": "学习资料",
     "LearnLi1": "Blazor 官方文档",
@@ -5770,7 +5771,7 @@
     "GetStarted": "快速上手",
     "QuickStart": "快速入门",
     "Features": "组件特色",
-    "P6": "Bootstrap Blazor UI 组件库提供了从基本的 <code>Button</code> 组件到高级的网页级 <code>SmartPage</code> 组件",
+    "P6": "Bootstrap Blazor UI 组件库提供了从基本的 <code>Button</code> 组件到高级的网页级 <code>Online</code> 组件",
     "Advantage": "优势",
     "AdvantageLi1": "使用组件无需编写 <code>JavaScript</code>",
     "AdvantageLi2": "组件支持所有 <code>html</code> 特性",

src/BootstrapBlazor/BootstrapBlazor.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>9.4.9-beta03</Version>
+    <Version>9.4.9-beta06</Version>
   </PropertyGroup>
 
   <ItemGroup>

src/BootstrapBlazor/Components/Button/PopConfirmButton.razor.js

@@ -31,9 +31,8 @@ export function init(id) {
     confirm.inserted = () => {
         const popover = getDescribedElement(el)
         const children = confirm.container.children
-        const len = children.length
-        for (let i = 0; i < len; i++) {
-            popover.appendChild(children[i])
+        while (children.length > 0) {
+            popover.appendChild(children[0])
         }
     }
     confirm.hide = () => {

src/BootstrapBlazor/Components/Dialog/Dialog.razor.cs

@@ -27,7 +27,7 @@ public partial class Dialog : IDisposable
     private Dictionary<string, object>? _currentParameter;
     private bool _isKeyboard = false;
     private bool _isBackdrop = false;
-    private bool _isFade = true;
+    private bool? _isFade = null;
 
     /// <summary>
     /// <inheritdoc/>

src/BootstrapBlazor/Components/Dialog/DialogOption.cs

@@ -68,9 +68,9 @@ public class DialogOption
     public bool ShowHeaderCloseButton { get; set; } = true;
 
     /// <summary>
-    /// Gets or sets whether to enable fade animation, default is true
+    /// Gets or sets whether to enable fade animation, default is null
     /// </summary>
-    public bool IsFade { get; set; } = true;
+    public bool? IsFade { get; set; }
 
     /// <summary>
     /// Gets or sets whether to support closing the dialog with the ESC key, default is true

src/BootstrapBlazor/Components/Input/BootstrapInput.razor.js

@@ -12,6 +12,10 @@ export function handleKeyUp(id, invoke, enter, enterCallbackMethod, esc, escCall
     if (el) {
         EventHandler.on(el, 'keyup', e => {
             if (enter && (e.key === 'Enter' || e.key === 'NumpadEnter')) {
+                const useShiftEnter = el.getAttribute('data-bb-shift-enter') === 'true';
+                if (!e.shiftKey && useShiftEnter) {
+                    return;
+                }
                 invoke.invokeMethodAsync(enterCallbackMethod, el.value)
             }
             else if (esc && e.key === 'Escape') {