Merge branch 'main' into feat-upload

# Conflicts:
#	src/BootstrapBlazor.Server/Locales/en-US.json
#	src/BootstrapBlazor.Server/Locales/zh-CN.json

Author: ArgoZhang

src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj

@@ -45,6 +45,7 @@
     <PackageReference Include="BootstrapBlazor.IconPark" Version="9.0.3" />
     <PackageReference Include="BootstrapBlazor.ImageCropper" Version="9.0.0" />
     <PackageReference Include="BootstrapBlazor.IP2Region" Version="9.0.1" />
+    <PackageReference Include="BootstrapBlazor.JitsiMeet" Version="9.0.0" />
     <PackageReference Include="BootstrapBlazor.JuHeIpLocatorProvider" Version="9.0.0" />
     <PackageReference Include="BootstrapBlazor.Live2DDisplay" Version="9.0.1" />
     <PackageReference Include="BootstrapBlazor.Markdown" Version="9.0.2" />
@@ -65,7 +66,7 @@
     <PackageReference Include="BootstrapBlazor.Splitting" Version="9.0.3" />
     <PackageReference Include="BootstrapBlazor.SvgEditor" Version="9.0.3" />
     <PackageReference Include="BootstrapBlazor.SummerNote" Version="9.0.4" />
-    <PackageReference Include="BootstrapBlazor.TableExport" Version="9.2.4" />
+    <PackageReference Include="BootstrapBlazor.TableExport" Version="9.2.5" />
     <PackageReference Include="BootstrapBlazor.Topology" Version="9.0.0" />
     <PackageReference Include="BootstrapBlazor.UniverIcon" Version="9.0.1" />
     <PackageReference Include="BootstrapBlazor.UniverSheet" Version="9.0.5" />

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

@@ -0,0 +1,24 @@
+@page "/meet"
+
+<h3>JitsiMeet会议</h3>
+
+<h4>通过JitsiMeet创建会议</h4>
+
+<PackageTips Name="BootstrapBlazor.JitsiMeet" />
+
+<Tips class="mt-3">
+    <p>JitsiMeet是一个开源的WebRTC会议程序，可以自托管安装也可以使用官方的托管服务（免费计划为25MAU），此组件仅为JitsiMeet的客户端程序，不含服务端。</p>
+    <p>默认的测试会议仅支持5分钟的会议，并且主持人需要登录。子托管以及官方托管服务不需要。</p>
+</Tips>
+
+<DemoBlock Title="使用JitsiMeet创建会议室" Introduction="使用JitsiMeet创建会议室，支持执行命令，支持OnLoad回调（meet.jit.si不会触发回调也不会响应命令，请使用8x8.vc或子托管域名测试）。例子中隐藏了内置的邀请程序，无法在会议中找到邀请链接。" Name="Normal">
+    <section class="row form-inline g-3">
+        <div class="col-12 col-sm-6">
+            <Display Value="_domain" DisplayText="服务器地址" ShowLabel="true"></Display>
+        </div>
+        <div class="col-12 col-sm-6">
+            <Button OnClick="RunCommand">执行命令</Button>
+        </div>
+    </section>
+    <Meet @ref="@_meet" Option="@_option" Domain="@_domain" OnLoad="OnLoad"></Meet>
+</DemoBlock>

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

@@ -0,0 +1,56 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the Apache 2.0 License
+// See the LICENSE file in the project root for more information.
+// Maintainer: Argo Zhang([email protected]) Website: https://www.blazor.zone
+
+namespace BootstrapBlazor.Server.Components.Samples;
+
+/// <summary>
+/// Meet 视频会议组件示例
+/// </summary>
+public partial class Meets : ComponentBase
+{
+    private MeetOption? _option;
+    private Meet? _meet;
+    private readonly string _domain = "meet.jit.si";
+
+    [Inject, NotNull]
+    private ToastService? ToastService { get; set; }
+
+    /// <summary>
+    /// <inheritdoc />
+    /// </summary>
+    protected override void OnInitialized()
+    {
+        base.OnInitialized();
+
+        _option = new MeetOption
+        {
+            RoomName = "BootstrapBlazor",
+            Width = "100%",
+            Height = 700,
+            ConfigOverwrite = new
+            {
+                Lobby = new { EnableChat = false },
+                HiddenPremeetingButtons = new string[] { "invite" },
+                DisableInviteFunctions = true,
+                ButtonsWithNotifyClick = new[] { new { key = "invite", preventExecution = true } }
+            },
+            UserInfo = new UserInfo() { DisplayName = "BootstrapBlazor", Email = "[email protected]" }
+        };
+    }
+
+    private void OnLoad()
+    {
+        ToastService.Information("Meet 示例", "会议室加载完成");
+    }
+
+    private async Task RunCommand()
+    {
+        if (_meet != null)
+        {
+            await _meet.ExecuteCommand("toggleChat");
+        }
+    }
+}
+

src/BootstrapBlazor.Server/Extensions/MenusLocalizerExtensions.cs

@@ -1228,6 +1228,12 @@ void AddNotice(DemoMenuItem item)
                     Url = "message"
                 },
                 new()
+                {
+                    IsNew = true,
+                    Text = Localizer["Meet"],
+                    Url = "meet"
+                },
+                new()
                 {
                     Text = Localizer["Modal"],
                     Url = "modal"

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

@@ -4942,6 +4942,7 @@
     "VideoDevice": "IVideoDevice",
     "AudioDevice": "IAudioDevice",
     "FullScreenButton": "FullScreenButton",
+    "Meet": "Meet",
     "InputUpload": "InputUpload",
     "ButtonUpload": "ButtonUpload",
     "AvatarUpload": "AvatarUpload",

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

@@ -4942,6 +4942,7 @@
     "VideoDevice": "视频设备服务 IVideoDevice",
     "AudioDevice": "音频设备服务 IAudioDevice",
     "FullScreenButton": "全屏按钮 FullScreenButton",
+    "Meet": "视频会议组件 Meet",
     "InputUpload": "上传组件 InputUpload",
     "ButtonUpload": "按钮上传组件 ButtonUpload",
     "AvatarUpload": "头像上传组件 AvatarUpload",

src/BootstrapBlazor.Server/docs.json

@@ -237,7 +237,8 @@
     "otp-service": "OtpServices",
     "video-device": "VideoDevices",
     "audio-device": "AudioDevices",
-    "fullscreen-button": "FullScreenButtons"
+    "fullscreen-button": "FullScreenButtons",
+    "meet": "Meets"
   },
   "video": {
     "table": "BV1ap4y1x7Qn?p=1",

src/BootstrapBlazor/BootstrapBlazor.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>9.6.5-beta01</Version>
+    <Version>9.6.5-beta02</Version>
   </PropertyGroup>
 
   <ItemGroup>

src/BootstrapBlazor/Components/Table/Table.razor.Toolbar.cs

@@ -545,6 +545,7 @@ public async Task EditAsync()
         if (SelectedRows.Count == 1)
         {
             // 检查是否选中了不可编辑行（行内无编辑按钮），同时检查按钮禁用状态（禁用时不可编辑）
+            // ShowExtendEditButton 不参与逻辑，不显示扩展编辑按钮时用户可能自定义按钮调用 EditAsync 方法
             if (ProhibitEdit())
             {
                 // 提示不可编辑
@@ -1004,12 +1005,10 @@ protected async Task<bool> ConfirmDelete()
     }
 
     private bool ProhibitEdit() => (ShowExtendEditButtonCallback != null && !ShowExtendEditButtonCallback(SelectedRows[0]))
-                || !ShowExtendEditButton
-                || (DisableExtendEditButtonCallback != null && DisableExtendEditButtonCallback(SelectedRows[0]))
-                || DisableExtendEditButton;
+            || (DisableExtendEditButtonCallback != null && DisableExtendEditButtonCallback(SelectedRows[0]))
+            || DisableExtendEditButton;
 
     private bool ProhibitDelete() => (ShowExtendDeleteButtonCallback != null && SelectedRows.Any(i => !ShowExtendDeleteButtonCallback(i)))
-            || !ShowExtendDeleteButton
             || (DisableExtendDeleteButtonCallback != null && SelectedRows.Any(x => DisableExtendDeleteButtonCallback(x)))
             || DisableExtendDeleteButton;
 

test/UnitTest/Components/TableTest.cs

@@ -8679,8 +8679,10 @@ public void Modify_Ok()
             pb.Add(a => a.ShowExtendEditButton, false);
             pb.Add(a => a.ShowExtendDeleteButton, false);
         });
-        Assert.True(ProhibitEdit(cut.Instance));
-        Assert.True(ProhibitDelete(cut.Instance));
+
+        // 不显示编辑删除按钮不参与是否可编辑删除判断，用户可能自定义按钮编辑或者删除当前行
+        Assert.False(ProhibitEdit(cut.Instance));
+        Assert.False(ProhibitDelete(cut.Instance));
 
         cut.SetParametersAndRender(pb =>
         {