Run @Runtime
+Run @Runtime
@if (_options.Enable)
{
diff --git a/src/BootstrapBlazor.Server/Components/Components/FooterCounter.razor.cs b/src/BootstrapBlazor.Server/Components/Components/FooterCounter.razor.cs
index 370581d1832..c2571e44969 100644
--- a/src/BootstrapBlazor.Server/Components/Components/FooterCounter.razor.cs
+++ b/src/BootstrapBlazor.Server/Components/Components/FooterCounter.razor.cs
@@ -10,11 +10,11 @@ namespace BootstrapBlazor.Server.Components.Components;
///
/// FooterCounter 组件
///
-public partial class FooterCounter : IDisposable
+public partial class FooterCounter
{
private string? Runtime { get; set; }
- private CancellationTokenSource _disposeTokenSource = new();
+ private readonly CancellationTokenSource _disposeTokenSource = new();
private ConnectionHubOptions _options = default!;
@@ -30,7 +30,9 @@ protected override void OnInitialized()
base.OnInitialized();
_options = BootstrapBlazorOptions.Value.ConnectionHubOptions;
- UpdateRuntime();
+
+ var ts = DateTimeOffset.Now - Cache.GetStartTime();
+ Runtime = ts.ToString("dd\\.hh\\:mm\\:ss");
}
///
@@ -41,36 +43,44 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
{
await base.OnAfterRenderAsync(firstRender);
- try
+ if (firstRender)
{
- await Task.Delay(1000, _disposeTokenSource.Token);
- UpdateRuntime();
- StateHasChanged();
+ try
+ {
+ while (_disposeTokenSource is { IsCancellationRequested: false })
+ {
+ await Task.Delay(30000, _disposeTokenSource.Token);
+ var ts = DateTimeOffset.Now - Cache.GetStartTime();
+ await InvokeVoidAsync("updateFooterCounter", Id, ts.TotalSeconds);
+ }
+ }
+ catch { }
}
- catch { }
}
- private void UpdateRuntime()
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
- ///
- public void Dispose()
- {
- Dispose(true);
- GC.SuppressFinalize(this);
- }
}
diff --git a/src/BootstrapBlazor.Server/Components/Components/FooterCounter.razor.js b/src/BootstrapBlazor.Server/Components/Components/FooterCounter.razor.js
new file mode 100644
index 00000000000..e62fda8d0da
--- /dev/null
+++ b/src/BootstrapBlazor.Server/Components/Components/FooterCounter.razor.js
@@ -0,0 +1,46 @@
+import Data from "../../_content/BootstrapBlazor/modules/data.js"
+
+export function init(id, totalSeconds) {
+ const el = document.getElementById(id);
+ if (el === null) {
+ return;
+ }
+
+ const tick = () => {
+ const counter = Data.get(id);
+
+ counter.totalSeconds = (counter.totalSeconds || 0) + 1;
+ const now = Math.round(counter.totalSeconds, 0);
+
+ const days = Math.floor(now / (24 * 3600));
+ const hours = Math.floor((now % (24 * 3600)) / 3600);
+ const minutes = Math.floor((now % 3600) / 60);
+ const seconds = now % 60;
+
+ const pad = num => num.toString().padStart(2, '0');
+ el.innerHTML = `Run ${pad(days)}.${pad(hours)}:${pad(minutes)}:${pad(seconds)}`;
+ }
+
+ const handler = setInterval(tick, 1000);
+ Data.set(id, {
+ el,
+ handler,
+ totalSeconds
+ });
+}
+
+export function updateFooterCounter(id, totalSeconds) {
+ const counter = Data.get(id);
+ if (counter) {
+ counter.totalSeconds = totalSeconds;
+ console.log(`FooterCounter updated: ${id}, totalSeconds: ${totalSeconds}`);
+ }
+}
+
+export function dispose(id) {
+ const counter = Data.get(id);
+ if (counter) {
+ clearInterval(counter.handler);
+ Data.remove(id);
+ }
+}
diff --git a/src/BootstrapBlazor.Server/Components/Components/Header.razor b/src/BootstrapBlazor.Server/Components/Components/Header.razor
index ff5d44e649f..b5db1b2cb8d 100644
--- a/src/BootstrapBlazor.Server/Components/Components/Header.razor
+++ b/src/BootstrapBlazor.Server/Components/Components/Header.razor
@@ -37,7 +37,7 @@
diff --git a/src/BootstrapBlazor.Server/Components/Components/MaskDemo.razor b/src/BootstrapBlazor.Server/Components/Components/MaskDemo.razor
new file mode 100644
index 00000000000..26d61c3bc63
--- /dev/null
+++ b/src/BootstrapBlazor.Server/Components/Components/MaskDemo.razor
@@ -0,0 +1,8 @@
+
+/// TooltipContent 组件用于显示 Tooltip 的内容
+///
+public partial class TooltipContent
+{
+ [CascadingParameter]
+ private Tooltip? Tooltip { get; set; }
+
+ private async Task ToggleShow()
+ {
+ if (Tooltip == null)
+ {
+ return;
+ }
+
+ await Tooltip.Toggle();
+ }
+}
diff --git a/src/BootstrapBlazor.Server/Components/Components/Video.razor b/src/BootstrapBlazor.Server/Components/Components/Video.razor
index 871d5d19666..b279520d1ca 100644
--- a/src/BootstrapBlazor.Server/Components/Components/Video.razor
+++ b/src/BootstrapBlazor.Server/Components/Components/Video.razor
@@ -3,12 +3,12 @@
-
- @Body
-
+ @if (_init)
+ {
+
+ @Body
+
+ }
+
diff --git a/src/BootstrapBlazor.Server/Components/Components/MaskDemo.razor.css b/src/BootstrapBlazor.Server/Components/Components/MaskDemo.razor.css
new file mode 100644
index 00000000000..e27e761f8d0
--- /dev/null
+++ b/src/BootstrapBlazor.Server/Components/Components/MaskDemo.razor.css
@@ -0,0 +1,5 @@
+.mask-dialog-demo {
+ background-color: var(--bs-body-bg);
+ border-radius: var(--bs-border-radius);
+ padding: 1rem;
+}
diff --git a/src/BootstrapBlazor.Server/Components/Components/Pre.razor.js b/src/BootstrapBlazor.Server/Components/Components/Pre.razor.js
index d36a6cbd382..1c4efade929 100644
--- a/src/BootstrapBlazor.Server/Components/Components/Pre.razor.js
+++ b/src/BootstrapBlazor.Server/Components/Components/Pre.razor.js
@@ -1,4 +1,4 @@
-import { copy, getDescribedElement, addLink, removeLink, addScript, getHeight, getPreferredTheme, registerBootstrapBlazorModule } from "../../_content/BootstrapBlazor/modules/utility.js"
+import { copy, getDescribedElement, addLink, removeLink, addScript, getHeight, getTheme, registerBootstrapBlazorModule } from "../../_content/BootstrapBlazor/modules/utility.js"
import EventHandler from "../../_content/BootstrapBlazor/modules/event-handler.js"
export async function init(id, title, assetRoot) {
@@ -9,7 +9,7 @@ export async function init(id, title, assetRoot) {
await addScript(`${assetRoot}lib/highlight/highlight.min.js`)
await addScript(`${assetRoot}lib/highlight/cshtml-razor.min.js`)
- await switchTheme(getPreferredTheme(), assetRoot);
+ await switchTheme(getTheme(), assetRoot);
const preElement = el.querySelector('pre')
const code = el.querySelector('pre > code')
diff --git a/src/BootstrapBlazor.Server/Components/Components/TooltipContent.razor b/src/BootstrapBlazor.Server/Components/Components/TooltipContent.razor
new file mode 100644
index 00000000000..90ee795c511
--- /dev/null
+++ b/src/BootstrapBlazor.Server/Components/Components/TooltipContent.razor
@@ -0,0 +1 @@
+
diff --git a/src/BootstrapBlazor.Server/Components/Components/TooltipContent.razor.cs b/src/BootstrapBlazor.Server/Components/Components/TooltipContent.razor.cs
new file mode 100644
index 00000000000..3b453dc86ca
--- /dev/null
+++ b/src/BootstrapBlazor.Server/Components/Components/TooltipContent.razor.cs
@@ -0,0 +1,25 @@
+// 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(argo@live.ca) Website: https://www.blazor.zone
+
+namespace BootstrapBlazor.Server.Components.Components;
+
+///
+
+ MaskDemo
+
+
+@Localizer["H1"]
-@if (VideoUrl.Any()) +@if (VideoUrl.Count > 0) { foreach (var url in VideoUrl) { } } diff --git a/src/BootstrapBlazor.Server/Components/Layout/BaseLayout.razor b/src/BootstrapBlazor.Server/Components/Layout/BaseLayout.razor index 2c3286201cf..d31966d483f 100644 --- a/src/BootstrapBlazor.Server/Components/Layout/BaseLayout.razor +++ b/src/BootstrapBlazor.Server/Components/Layout/BaseLayout.razor @@ -1,10 +1,13 @@ @inherits LayoutComponentBase
diff --git a/src/BootstrapBlazor.Server/Components/Layout/BaseLayout.razor.cs b/src/BootstrapBlazor.Server/Components/Layout/BaseLayout.razor.cs
index 324edf5136a..d089760ff06 100644
--- a/src/BootstrapBlazor.Server/Components/Layout/BaseLayout.razor.cs
+++ b/src/BootstrapBlazor.Server/Components/Layout/BaseLayout.razor.cs
@@ -3,6 +3,9 @@
// See the LICENSE file in the project root for more information.
// Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
+using Microsoft.Extensions.Options;
+using Microsoft.JSInterop;
+
namespace BootstrapBlazor.Server.Components.Layout;
///
@@ -10,6 +13,10 @@ namespace BootstrapBlazor.Server.Components.Layout;
///
public partial class BaseLayout : IDisposable
{
+ [Inject]
+ [NotNull]
+ private IJSRuntime? JSRuntime { get; set; }
+
[Inject]
[NotNull]
private IStringLocalizer? Localizer { get; set; }
@@ -26,6 +33,10 @@ public partial class BaseLayout : IDisposable
[NotNull]
private IDispatchService? RebootDispatchService { get; set; }
+ [Inject]
+ [NotNull]
+ private IOptions? WebsiteOption { get; set; }
+
[NotNull]
private string? FlowText { get; set; }
@@ -38,6 +49,8 @@ public partial class BaseLayout : IDisposable
[NotNull]
private string? CancelText { get; set; }
+ private bool _init = false;
+
///
///
@@ -54,6 +67,19 @@ protected override void OnInitialized()
RebootDispatchService.Subscribe(NotifyReboot);
}
+ ///
+ ///
+ /// payload)
{
if (payload.CanDispatch())
diff --git a/src/BootstrapBlazor.Server/Components/Layout/BaseLayout.razor.js b/src/BootstrapBlazor.Server/Components/Layout/BaseLayout.razor.js
new file mode 100644
index 00000000000..6d4599d796a
--- /dev/null
+++ b/src/BootstrapBlazor.Server/Components/Layout/BaseLayout.razor.js
@@ -0,0 +1,6 @@
+import { getTheme, setTheme } from "../../_content/BootstrapBlazor/modules/utility.js"
+
+export function initTheme() {
+ const currentTheme = getTheme();
+ setTheme(currentTheme, false);
+}
diff --git a/src/BootstrapBlazor.Server/Components/Layout/HomeLayout.razor b/src/BootstrapBlazor.Server/Components/Layout/HomeLayout.razor
index 7922e1a4b05..ceab4b681d0 100644
--- a/src/BootstrapBlazor.Server/Components/Layout/HomeLayout.razor
+++ b/src/BootstrapBlazor.Server/Components/Layout/HomeLayout.razor
@@ -11,7 +11,7 @@
diff --git a/src/BootstrapBlazor.Server/Components/Layout/MainLayout.razor b/src/BootstrapBlazor.Server/Components/Layout/MainLayout.razor
index 9ca982cc104..a8dc5abf812 100644
--- a/src/BootstrapBlazor.Server/Components/Layout/MainLayout.razor
+++ b/src/BootstrapBlazor.Server/Components/Layout/MainLayout.razor
@@ -21,7 +21,7 @@
@@ -29,13 +29,21 @@
-
+
+
+
+
-
+
+
+
+
diff --git a/src/BootstrapBlazor.Server/Components/Layout/MainLayout.razor.css b/src/BootstrapBlazor.Server/Components/Layout/MainLayout.razor.css
index d0416ad10ed..6a07e3ed9cb 100644
--- a/src/BootstrapBlazor.Server/Components/Layout/MainLayout.razor.css
+++ b/src/BootstrapBlazor.Server/Components/Layout/MainLayout.razor.css
@@ -96,21 +96,7 @@
opacity: 1;
}
-::deep .btn-update {
- --bs-btn-bg: var(--bb-layout-button-update-bg);
- --bs-btn-hover-bg: var(--bs-btn-bg);
- --bs-btn-active-bg: var(--bs-btn-bg);
- display: flex;
- justify-content: center;
- align-items: center;
-}
-
- ::deep .btn-update img {
- width: 55%;
- margin-inline-start: 2px;
- }
-
-::deep .btn-chat {
+::deep .btn-dial-item {
--bs-btn-bg: var(--bb-layout-button-bg);
--bs-btn-hover-bg: var(--bb-layout-button-hover-bg);
--bs-btn-active-bg: var(--bb-layout-button-active-bg);
@@ -118,9 +104,12 @@
display: flex;
align-items: center;
justify-content: center;
- color: var(--bb-button-chat-color);
}
+ ::deep .btn-dial-item a {
+ color: var(--bb-button-chat-color);
+ }
+
::deep .btn-theme-mode {
--bs-btn-bg: var(--bb-layout-button-bg);
--bs-btn-hover-bg: var(--bb-layout-button-hover-bg);
diff --git a/src/BootstrapBlazor.Server/Components/Pages/Chats.razor b/src/BootstrapBlazor.Server/Components/Pages/Chats.razor
index 551f2e433ba..6380bcba807 100644
--- a/src/BootstrapBlazor.Server/Components/Pages/Chats.razor
+++ b/src/BootstrapBlazor.Server/Components/Pages/Chats.razor
@@ -1,6 +1,7 @@
@page "/ai-chat"
@using Azure.AI.OpenAI
@inherits WebSiteModuleComponentBase
+@inject IOptions WebsiteOption
@attribute [JSModuleAutoLoader("Pages/Chats.razor.js")]
- 
+
@Localizer["ChatsTitle"]
@@ -36,7 +37,7 @@
@if (message.Role == ChatRole.User)
{
- 
+
}
else
{
diff --git a/src/BootstrapBlazor.Server/Components/Pages/Index.razor b/src/BootstrapBlazor.Server/Components/Pages/Index.razor
index b1ce6796d2b..af0e0b7d23f 100644
--- a/src/BootstrapBlazor.Server/Components/Pages/Index.razor
+++ b/src/BootstrapBlazor.Server/Components/Pages/Index.razor
@@ -7,12 +7,15 @@
+
diff --git a/src/BootstrapBlazor.Server/Components/Pages/Index.razor.css b/src/BootstrapBlazor.Server/Components/Pages/Index.razor.css
index 9700f026945..8ee3049ac6a 100644
--- a/src/BootstrapBlazor.Server/Components/Pages/Index.razor.css
+++ b/src/BootstrapBlazor.Server/Components/Pages/Index.razor.css
@@ -30,10 +30,59 @@
}
.bd-masthead .bb-logo {
+ --bb-btn-space: 4px;
width: 200px;
height: 200px;
+ position: relative;
+ overflow: hidden;
+ border-radius: 30px;
}
+ .bd-masthead .bb-logo .holder {
+ background-color: var(--bb-primary-color);
+ }
+
+ .bd-masthead .bb-logo .holder,
+ .bd-masthead .bb-logo img {
+ width: calc(100% - 2 * var(--bb-btn-space));
+ height: calc(100% - 2 * var(--bb-btn-space));
+ position: absolute;
+ left: var(--bb-btn-space);
+ top: var(--bb-btn-space);
+ border-radius: inherit;
+ }
+
+.bb-logo:before {
+ content: '';
+ position: absolute;
+ inset: 0;
+ background-color: #5a23c8;
+ z-index: -2;
+}
+
+.bb-logo:after {
+ content: '';
+ position: absolute;
+ left: 50%;
+ top: 50%;
+ width: 68%;
+ height: 68%;
+ background-image: linear-gradient(to bottom, #3f51b1 0%, #5a55ae 13%, #7b5fac 25%, #8f6aae 38%, #a86aa4 50%, #cc6b8e 62%, #f18271 75%, #f3a469 87%, #f7c978 100%);
+ transform-origin: left top;
+ animation: rotate 5s linear infinite;
+ z-index: -1;
+}
+
+@keyframes rotate {
+ 0% {
+ transform: rotate(0deg);
+ }
+
+ 100% {
+ transform: rotate(360deg);
+ }
+}
+
.bd-gutter {
--bs-gutter-x: 3rem;
}
diff --git a/src/BootstrapBlazor.Server/Components/Routes.razor b/src/BootstrapBlazor.Server/Components/Routes.razor
index f90a06ec137..bb2e405ae65 100644
--- a/src/BootstrapBlazor.Server/Components/Routes.razor
+++ b/src/BootstrapBlazor.Server/Components/Routes.razor
@@ -1,5 +1,6 @@
diff --git a/src/BootstrapBlazor.Server/Components/Samples/BaiduOcr.razor b/src/BootstrapBlazor.Server/Components/Samples/BaiduOcr.razor
index ce35e36a6f8..3a527a26ae7 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/BaiduOcr.razor
+++ b/src/BootstrapBlazor.Server/Components/Samples/BaiduOcr.razor
@@ -1,22 +1,29 @@
@page "/ocr"
-@inject IBaiduOcr OcrService
-@inject IStringLocalizer Localizer
-@inject ToastService ToastService
@Localizer["BaiduOcrDesc"]
+
-
+
-
+
@Localizer["Support"]
-
+
+
+
+
+
@Localizer["Title"]
@Localizer["SubTitle"] @@ -24,15 +27,15 @@
Currently @_versionString · - Download + Download · - All releases + All releases
@Localizer["DonateH1"]
@Localizer["DonateH2"]
-@Localizer["Title"]
@Localizer["SubTitle"]
@Localizer["BaiduOcrIntro"]
+@((MarkupString)Localizer["BaiduOcrStep1"].Value)
+@((MarkupString)Localizer["BaiduOcrStep1Desc"].Value)
+{
+ "BaiduOcrOption": {
+ "AppId": "",
+ "ApiKey": "",
+ "Secret": ""
+ }
+}
+@((MarkupString)Localizer["BaiduOcrStep2"].Value)
+[Inject, NotNull]
+private IBaiduOcr? OcrService { get; set; }
- @Localizer["BaiduOcrIntro"]
-@((MarkupString)Localizer["BaiduOcrStep1"].Value)
-@((MarkupString)Localizer["BaiduOcrStep2"].Value)
+@((MarkupString)Localizer["BaiduOcrStep3"].Value)
@@ -128,7 +135,7 @@
-
+
diff --git a/src/BootstrapBlazor.Server/Components/Samples/BaiduOcr.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/BaiduOcr.razor.cs
index aa4a2ca02c9..9d1c8501063 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/BaiduOcr.razor.cs
+++ b/src/BootstrapBlazor.Server/Components/Samples/BaiduOcr.razor.cs
@@ -12,16 +12,21 @@ namespace BootstrapBlazor.Server.Components.Samples;
///
public partial class BaiduOcr : IDisposable
{
- private InvoiceEntity? Invoice { get; set; }
+ [Inject, NotNull]
+ private IBaiduOcr? OcrService { get; set; }
- /*以下示例为本站特殊处理逻辑可不参考*/
- private bool IsLoading { get; set; }
+ [Inject, NotNull]
+ private IStringLocalizer? Localizer { get; set; }
- private string ButtonIcon { get; } = "fa-solid fa-cloud-arrow-up";
+ [Inject, NotNull]
+ private ToastService? ToastService { get; set; }
- private string LoadingIcon { get; } = "fa-solid fa-spinner fa-spin-pulse";
+ private InvoiceEntity? Invoice { get; set; }
+
+ /*以下示例为本站特殊处理逻辑可不参考*/
+ private bool _isLoading;
- private string Icon => IsLoading ? LoadingIcon : ButtonIcon;
+ private string Icon => _isLoading ? "fa-solid fa-spinner fa-spin-pulse" : "fa-solid fa-cloud-arrow-up";
///
/// 取消请求令牌
@@ -33,12 +38,12 @@ private async Task OnClickToUploadBlock(UploadFile file)
if (file.File != null)
{
// 设置 按钮禁用
- IsLoading = true;
+ _isLoading = true;
StateHasChanged();
// 获得上传文件
var payload = await file.GetBytesAsync(file.File.Size);
- if (payload != null && payload.Length > 0)
+ if (payload is { Length: > 0 })
{
try
{
@@ -60,7 +65,7 @@ private async Task OnClickToUploadBlock(UploadFile file)
}
}
- IsLoading = false;
+ _isLoading = false;
StateHasChanged();
}
}
diff --git a/src/BootstrapBlazor.Server/Components/Samples/BootstrapBlazorIcons.razor b/src/BootstrapBlazor.Server/Components/Samples/BootstrapBlazorIcons.razor
index 3e4935cc602..63baa245905 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/BootstrapBlazorIcons.razor
+++ b/src/BootstrapBlazor.Server/Components/Samples/BootstrapBlazorIcons.razor
@@ -1,5 +1,6 @@
@page "/icon"
@inject IStringLocalizer Localizer
+@inject IOptions WebsiteOption
-
+
diff --git a/src/BootstrapBlazor.Server/Components/Samples/DateTimePickers.razor b/src/BootstrapBlazor.Server/Components/Samples/DateTimePickers.razor
index d515b753b46..2f92e5742a4 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/DateTimePickers.razor
+++ b/src/BootstrapBlazor.Server/Components/Samples/DateTimePickers.razor
@@ -5,7 +5,7 @@
-
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Dom2Images.razor b/src/BootstrapBlazor.Server/Components/Samples/Dom2Images.razor
new file mode 100644
index 00000000000..42dc629903c
--- /dev/null
+++ b/src/BootstrapBlazor.Server/Components/Samples/Dom2Images.razor
@@ -0,0 +1,32 @@
+@page "/dom2image"
+
+
+
+
+
+
+
+ @if (!string.IsNullOrEmpty(_imageData))
+ {
+ 
+ }
+
+
+
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Dom2Images.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/Dom2Images.razor.cs
new file mode 100644
index 00000000000..733cf684830
--- /dev/null
+++ b/src/BootstrapBlazor.Server/Components/Samples/Dom2Images.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(argo@live.ca) Website: https://www.blazor.zone
+
+namespace BootstrapBlazor.Server.Components.Samples;
+
+///
+/// Dom2Image 组件
+///
+public partial class Dom2Images
+{
+ [Inject]
+ [NotNull]
+ private IStringLocalizer? LocalizerFoo { get; set; }
+
+ [Inject]
+ [NotNull]
+ private IDom2ImageService? Dom2ImageService { get; set; }
+
+ [Inject]
+ [NotNull]
+ private IStringLocalizer? Localizer { get; set; }
+
+ [NotNull]
+ private List? Items { get; set; }
+
+ private string? _imageData;
+
+ ///
+ ///
+ protected override void OnInitialized()
+ {
+ base.OnInitialized();
+
+ Items = Foo.GenerateFoo(LocalizerFoo);
+ }
+
+ private async Task OnGetUrlAsync()
+ {
+ _imageData = await Dom2ImageService.GetUrlAsync("#table-9527");
+ }
+
+ private async Task OnDownloadAsync()
+ {
+ var fileName = $"table-9527-{DateTime.Now:HHmmss}";
+ await Dom2ImageService.DownloadAsync("#table-9527", fileName);
+ }
+
+ private async Task OnFullAsync()
+ {
+ var fileName = $"full-{DateTime.Now:HHmmss}";
+ await Dom2ImageService.DownloadAsync(".tabs-body-content:not(.d-none)", fileName);
+ }
+}
diff --git a/src/BootstrapBlazor.Server/Components/Samples/EditorForms.razor b/src/BootstrapBlazor.Server/Components/Samples/EditorForms.razor
index 3e3169ae42e..fa0cb79b386 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/EditorForms.razor
+++ b/src/BootstrapBlazor.Server/Components/Samples/EditorForms.razor
@@ -130,6 +130,14 @@
+
+
+
+
+
+
+
Localizer
+@inject IOptionsMonitor WebsiteOption
-
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Editors.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/Editors.razor.cs
index cd97b1d1478..2c340824e87 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/Editors.razor.cs
+++ b/src/BootstrapBlazor.Server/Components/Samples/Editors.razor.cs
@@ -111,6 +111,17 @@ private async Task InsertHtmlAsync()
await Editor.DoMethodAsync("pasteHTML", $" OnFileUpload(EditorUploadFile uploadFile)
+ {
+ var url = Path.Combine("images", "uploader", $"{Path.GetFileNameWithoutExtension(uploadFile.FileName)}-{DateTimeOffset.Now:yyyyMMddHHmmss}{Path.GetExtension(uploadFile.FileName)}");
+ var fileName = Path.Combine(WebsiteOption.CurrentValue.WebRootPath, url);
+ await uploadFile.SaveToFileAsync(fileName);
+
+ // 此处返回空字符串底层使用 URL.createObjectURL 方法创建 Blob 对象地址
+ // 实战中可以返回 SSO 地址或者 base64 字符串等
+ return "";
+ }
+
private string? _editorCode;
private async Task OnGetCode()
@@ -167,6 +178,14 @@ private AttributeItem[] GetAttributes() =>
Type = "IEnumerable",
ValueList = " — ",
DefaultValue = " — "
+ },
+ new()
+ {
+ Name = "OnFileUpload",
+ Description = Localizer["OnFileUploadAttribute"],
+ Type = "Func",
+ ValueList = " — ",
+ DefaultValue = " — "
}
];
}
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Html2Images.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/Html2Images.razor.cs
index 9ebe519aecc..f50a2aaa437 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/Html2Images.razor.cs
+++ b/src/BootstrapBlazor.Server/Components/Samples/Html2Images.razor.cs
@@ -10,13 +10,6 @@ namespace BootstrapBlazor.Server.Components.Samples;
///
public partial class Html2Images
{
- ///
- /// 获得 IconTheme 实例
- ///
- [Inject]
- [NotNull]
- private IIconTheme? IconTheme { get; set; }
-
[Inject]
[NotNull]
private IStringLocalizer? LocalizerFoo { get; set; }
@@ -29,10 +22,6 @@ public partial class Html2Images
[NotNull]
private IStringLocalizer? Localizer { get; set; }
- [Inject]
- [NotNull]
- private NavigationManager? NavigationManager { get; set; }
-
[NotNull]
private List? Items { get; set; }
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Masks.razor b/src/BootstrapBlazor.Server/Components/Samples/Masks.razor
index d535a720d0f..ff6c80c6de7 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/Masks.razor
+++ b/src/BootstrapBlazor.Server/Components/Samples/Masks.razor
@@ -6,6 +6,9 @@
+
+
@@ -27,3 +30,7 @@
+
+
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Masks.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/Masks.razor.cs
index 76abdd4d6e2..819f1a90d97 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/Masks.razor.cs
+++ b/src/BootstrapBlazor.Server/Components/Samples/Masks.razor.cs
@@ -56,4 +56,12 @@ await MaskService.Show(new MaskOption()
await MaskService.Close(CustomMask1);
await MaskService.Close(CustomMask2);
}
+
+ private async Task ShowCloseMask()
+ {
+ await MaskService.Show(new MaskOption()
+ {
+ ChildContent = BootstrapDynamicComponent.CreateComponent().Render()
+ });
+ }
}
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Navbars.razor b/src/BootstrapBlazor.Server/Components/Samples/Navbars.razor
new file mode 100644
index 00000000000..f4ed79e64cd
--- /dev/null
+++ b/src/BootstrapBlazor.Server/Components/Samples/Navbars.razor
@@ -0,0 +1,77 @@
+@page "/navbar"
+@inject IStringLocalizer Localizer
+
+
+
+
+ Navbar
+
+
+
+ Home
+
+
+ Action
+
+
+ Another action
+
+
+ Something else here
+
+
+ Disabled
+
+ About
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Navbars.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/Navbars.razor.cs
new file mode 100644
index 00000000000..6cad933b4ec
--- /dev/null
+++ b/src/BootstrapBlazor.Server/Components/Samples/Navbars.razor.cs
@@ -0,0 +1,41 @@
+// 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(argo@live.ca) Website: https://www.blazor.zone
+
+using Microsoft.AspNetCore.Components.Forms;
+
+namespace BootstrapBlazor.Server.Components.Samples;
+
+///
+/// Navbar 示例
+///
+public partial class Navbars
+{
+ private List _dropdownItems = [];
+ private SearchModel _searchModel = new SearchModel();
+
+ ///
+ ///
+ protected override void OnInitialized()
+ {
+ base.OnInitialized();
+
+ _dropdownItems.AddRange([
+ new SelectedItem() { Text="Item1", Value="0"},
+ new SelectedItem() { Text="Item2", Value="1"},
+ new SelectedItem() { Text="Item3", Value="2"}
+ ]);
+ }
+
+ private Task OnValidSubmit(EditContext context)
+ {
+ return Task.CompletedTask;
+ }
+
+ class SearchModel
+ {
+ public string? SearchText { get; set; }
+ }
+}
diff --git a/src/BootstrapBlazor.Server/Components/Samples/OpcDa.razor b/src/BootstrapBlazor.Server/Components/Samples/OpcDa.razor
new file mode 100644
index 00000000000..3f16711ac77
--- /dev/null
+++ b/src/BootstrapBlazor.Server/Components/Samples/OpcDa.razor
@@ -0,0 +1,87 @@
+@page "/opc-da"
+@inject IStringLocalizer Localizer
+
+
+
diff --git a/src/BootstrapBlazor.Server/Components/Samples/OpcDa.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/OpcDa.razor.cs
new file mode 100644
index 00000000000..38be9d5ac8a
--- /dev/null
+++ b/src/BootstrapBlazor.Server/Components/Samples/OpcDa.razor.cs
@@ -0,0 +1,124 @@
+// 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(argo@live.ca) Website: https://www.blazor.zone
+
+using BootstrapBlazor.OpcDa;
+
+namespace BootstrapBlazor.Server.Components.Samples;
+
+///
+/// OpcDa 示例
+///
+public partial class OpcDa : ComponentBase
+{
+ [Inject]
+ [NotNull]
+ private IOpcDaServer? OpcDaServer { get; set; }
+
+ private string? _serverName = "opcda://localhost/Kepware.KEPServerEX.V6";
+
+ private const string Tag1 = "Channel1.Device1.Tag1";
+ private const string Tag2 = "Channel1.Device1.Tag2";
+
+ private string? _tagValue1;
+ private string? _tagValue2;
+ private string? _tagValue3;
+ private string? _tagValue4;
+
+ private IOpcSubscription? _subscription;
+
+ private bool _subscribed;
+
+ private void OnConnect()
+ {
+ if (!string.IsNullOrEmpty(_serverName))
+ {
+ OpcDaServer.Connect(_serverName);
+ }
+ }
+
+ private void OnDisConnect()
+ {
+ OnCancelSubscription();
+ OpcDaServer.Disconnect();
+ }
+
+ private void OnRead()
+ {
+ var items = OpcDaServer.Read(Tag1, Tag2);
+ var value1 = items.FirstOrDefault(i => i.Name == Tag1).Value;
+ if (value1 != null)
+ {
+ _tagValue1 = value1.ToString();
+ }
+ var value2 = items.FirstOrDefault(i => i.Name == Tag2).Value;
+ if (value2 != null)
+ {
+ _tagValue2 = value2.ToString();
+ }
+ }
+
+ private void OnCreateSubscription()
+ {
+ _subscribed = true;
+ _subscription = OpcDaServer.CreateSubscription("Subscription1", 1000, true);
+ _subscription.DataChanged += UpdateValues;
+ _subscription.AddItems([Tag1, Tag2]);
+ }
+
+ private void OnCancelSubscription()
+ {
+ _subscribed = false;
+ if (_subscription != null)
+ {
+ _subscription.DataChanged -= UpdateValues;
+ OpcDaServer.CancelSubscription(_subscription);
+ }
+ }
+
+ private void UpdateValues(List items)
+ {
+ var value1 = items.Find(i => i.Name == Tag1).Value;
+ if (value1 != null)
+ {
+ _tagValue3 = value1.ToString();
+ }
+ var value2 = items.Find(i => i.Name == Tag2).Value;
+ if (value2 != null)
+ {
+ _tagValue4 = value2.ToString();
+ }
+
+ InvokeAsync(StateHasChanged);
+ }
+
+ private List> _roots = [];
+
+ private void OnBrowse()
+ {
+ var elements = OpcDaServer.Browse("", new OpcBrowseFilters(), out _);
+ _roots = [.. elements.Select(element => new TreeViewItem(element)
+ {
+ Text = element.Name,
+ HasChildren = element.HasChildren,
+ Icon = "fa-solid fa-fw fa-cubes"
+ })];
+ }
+
+ private Task>> OnExpandNodeAsync(TreeViewItem element)
+ {
+ var children = OpcDaServer.Browse(element.Value.ItemName, new OpcBrowseFilters(), out _);
+ var items = children.Select(i => new TreeViewItem(i)
+ {
+ Text = i.Name,
+ HasChildren = i.HasChildren,
+ Icon = i.HasChildren ? "fa-solid fa-fw fa-cube" : "fa-solid fa-fw fa-wrench"
+ });
+ if (!items.Any())
+ {
+ element.HasChildren = false;
+ }
+ return Task.FromResult(items);
+ }
+}
diff --git a/src/BootstrapBlazor.Server/Components/Samples/PdfViewers.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/PdfViewers.razor.cs
index 1c0c7ce673a..175db17dd0d 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/PdfViewers.razor.cs
+++ b/src/BootstrapBlazor.Server/Components/Samples/PdfViewers.razor.cs
@@ -3,8 +3,6 @@
// See the LICENSE file in the project root for more information.
// Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
-using System.ComponentModel;
-
namespace BootstrapBlazor.Server.Components.Samples;
///
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Popovers.razor b/src/BootstrapBlazor.Server/Components/Samples/Popovers.razor
index 3196a4cc376..90a8c2f40dc 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/Popovers.razor
+++ b/src/BootstrapBlazor.Server/Components/Samples/Popovers.razor
@@ -66,4 +66,19 @@
+
+
+
+
+
+
+
+
+
///
diff --git a/src/BootstrapBlazor.Server/Components/Samples/SelectTables.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/SelectTables.razor.cs
index cf0dd455f5c..fcdca1de2c0 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/SelectTables.razor.cs
+++ b/src/BootstrapBlazor.Server/Components/Samples/SelectTables.razor.cs
@@ -99,14 +99,6 @@ class SelectTableMode
/// ",
- ValueList = " — ",
- DefaultValue = " — "
- },
new()
{
Name = "TableColumns",
diff --git a/src/BootstrapBlazor.Server/Components/Samples/SelectTrees.razor b/src/BootstrapBlazor.Server/Components/Samples/SelectTrees.razor
index 8cea4ffd6fe..ea284db84eb 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/SelectTrees.razor
+++ b/src/BootstrapBlazor.Server/Components/Samples/SelectTrees.razor
@@ -50,7 +50,10 @@
+ Name="IsEditable">
+
+
不使用 数据适配器 要分两次接收才能接收完整
使用 数据适配器 一次即可接收完整数据包
-
@Localizer["IconsTitle"]
@@ -24,6 +25,6 @@
+ @Localizer["Description"]
@Localizer["Dom2ImageTitle"]
+ +@Localizer["Dom2ImageIntro"]
+ +@((MarkupString)Localizer["Dom2ImageDesc"].Value)
+
+
+
+
+
+ @Localizer["EditorsTitle"]
@@ -38,7 +40,7 @@{Localizer["DoMethodAsyncPasteHTML"]}
"); } + private async Task@Localizer["MaskDescription"]
@((MarkupString)Localizer["MaskNormalDesc"].Value)
+ @Localizer["NavbarTitle"]
+ +@Localizer["NavbarDescription"]
+ +Nav
+-
+
Size: 指定导航栏响应阈值，默认Size.Medium
+ BackgroundColorCssClass: 导航栏背景色样式，默认 null 未设置使用bg-body-tertiary
+
NavbarBrand
+渲染 navbar-brand 样式，导航栏 Brand 当屏幕宽度小于特定阈值时导航栏会响应式收起，NavbarBrand 的内容始终显示
NavbarToggleButton
+渲染 navbar-toggler 样式，导航栏中的折叠展开按钮，当屏幕宽度小于特定阈值时显示，通过设置参数 Target 值指定折叠展开组件 NavbarCollapse
NavbarCollapse
+渲染 collapse navbar-collapse 样式，导航栏中的可折叠展开区域，通过设置参数 Id 值，与组件 NavbarToggleButton 联动
NavbarGroup
+渲染 navbar-nav 样式，导航栏中区域分组容器组件
-
+
IsScrolling: 是否开启滚动条
+ Height: 组件高度，默认 200px
+
NavbarItem
+渲染 navbar-item 样式，导航栏中单项容器组件，通过内置自定义组件或者 Html 实现导航项
NavbarLink
+渲染 nav-link 样式，导航栏中导航组件，内部渲染为 a 链接
-
+
Url: 导航地址
+ Target: 导航目标
+ ImageUrl: 图片地址
+ ImageCss: 图片样式
+
NavbarDropdown
+渲染 nav-item dropdown 样式，导航栏中下拉菜单组件
NavbarDropdownItem
+渲染 dropdown-item 样式，导航栏中下拉菜单组件内项目
@Localizer["OpcDaTitle"]
+ +@Localizer["OpcDaDescription"]
+ +1. 点击 连接 按钮与 OpcDa 服务器建立通讯连接
+
2. 点击 读取 按钮读取 OpcDa 服务器上的位号值
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 3. 订阅功能
+通过订阅可以监控一组 位号 数据改变情况，当数据改变时通过 DataChanged 回调方法通知订阅者
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 4. 浏览
+通过调用 OpcDaServer 的 Browse 方法可以构建一个节点树状结构
+ +
+
+
-
+
- @((MarkupString)Localizer["PopoversManualDescLI1"].Value) +
- @((MarkupString)Localizer["PopoversManualDescLI2"].Value) +
@((MarkupString)Localizer["SelectTreesEditDesc"].Value)
+ private readonly DataPackageAdapter _dataAdapter = new()
-{
- // 数据适配器内部使用固定长度数据处理器
- DataPackageHandler = new FixLengthDataPackageHandler(12)
-};
+ // 数据适配器内部使用固定长度数据处理器
+private readonly DataPackageAdapter _dataAdapter = new(new FixLengthDataPackageHandler(12));
-_dataAdapter.ReceivedCallBack += async Data =>
+_dataAdapter.ReceivedCallBack = async Data =>
{
// 此处接收到的数据 Data 为完整响应数据
};
+ // 实战中可以使用 ITcpSocketClient 扩展方法 AddDataPackageAdapter 简化代码
+// 如果 _client 实例在当前页面不销毁时，切记使用 AddDataPackageAdapter 移除当前页面加载的 UpdateReceiveLog 回调方法避免内存泄露
+_client.AddDataPackageAdapter(_dataAdapter, UpdateReceiveLog);
+
+ 本例中使用的模拟服务端代码如下：
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Sockets/Adapters.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/Sockets/Adapters.razor.cs
index b8871f39141..b421951b9ed 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/Sockets/Adapters.razor.cs
+++ b/src/BootstrapBlazor.Server/Components/Samples/Sockets/Adapters.razor.cs
@@ -25,10 +25,7 @@ public partial class Adapters : IDisposable
private readonly CancellationTokenSource _connectTokenSource = new();
private readonly CancellationTokenSource _sendTokenSource = new();
private readonly CancellationTokenSource _receiveTokenSource = new();
- private readonly DataPackageAdapter _dataAdapter = new()
- {
- DataPackageHandler = new FixLengthDataPackageHandler(12)
- };
+ private readonly DataPackageAdapter _dataAdapter = new(new FixLengthDataPackageHandler(12));
private bool _useDataAdapter = true;
///
@@ -46,13 +43,14 @@ protected override void OnInitialized()
// 设置本地使用的 IP地址与端口
options.LocalEndPoint = new IPEndPoint(IPAddress.Loopback, 0);
});
+
+ // 此处代码分开写是为了判断 _useDataAdapter 参数
_client.ReceivedCallBack += OnReceivedAsync;
+ _dataAdapter.ReceivedCallBack = UpdateReceiveLog;
+
+ // 实战中可以通过下面一句话设置数据适配器与回调方法
+ // _client.AddDataPackageAdapter(_dataAdapter, UpdateReceiveLog);
- _dataAdapter.ReceivedCallBack += async data =>
- {
- // 直接处理接收的数据
- await UpdateReceiveLog(data);
- };
}
private async Task OnConnectAsync()
@@ -102,7 +100,7 @@ private async ValueTask OnReceivedAsync(ReadOnlyMemory data)
}
}
- private async Task UpdateReceiveLog(ReadOnlyMemory data)
+ private async ValueTask UpdateReceiveLog(ReadOnlyMemory data)
{
var payload = Encoding.UTF8.GetString(data.Span);
var body = BitConverter.ToString(data.ToArray());
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Sockets/DataEntities.razor b/src/BootstrapBlazor.Server/Components/Samples/Sockets/DataEntities.razor
index f1498c51879..517b2629302 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/Sockets/DataEntities.razor
+++ b/src/BootstrapBlazor.Server/Components/Samples/Sockets/DataEntities.razor
@@ -63,7 +63,7 @@ class MockEntity
DataUInt64LittleEndianConverter 转成 ulong 无符号整形小端读取自定义数据类型转化器示例
- [SocketTypeDataConverter(Type = typeof(DataConverter<MockEntity>))]
+ [DataTypeConverter(Type = typeof(DataConverter<MockEntity>))]
class MockEntity
{
[DataPropertyConverter(Type = typeof(byte[]), Offset = 0, Length = 5)]
@@ -84,3 +84,44 @@ class MockEntity
}
更多技术细节可以参考以上内置提供的转换器源码
+
+
+ 通过 ConfigureDataConverters 可以配置任意类型（第三方程序集中无源码类型）自定数据转换
+ class MockEntity
+{
+ public byte[]? Header { get; set; }
+
+ public byte[]? Body { get; set; }
+}
+ service.ConfigureDataConverters(options =>
+{
+ // 配置 MockEntity 转换
+ options.AddTypeConverter<MockEntity>();
+
+ // 配置 MockEntity 属性 Header 转换逻辑 从起始位置 0 开始读取 5 个字节
+ options.AddPropertyConverter<MockEntity>(entity => entity.Header, new DataPropertyConverterAttribute()
+ {
+ Offset = 0,
+ Length = 5
+ });
+
+ // 配置 MockEntity 属性 Body 转换逻辑 从起始位置 5 开始读取 2 个字节
+ options.AddPropertyConverter<MockEntity>(entity => entity.Body, new DataPropertyConverterAttribute()
+ {
+ Offset = 5,
+ Length = 2
+ });
+});
+ 通过调用 ITcpSocketClient 实例泛型扩展方法 AddDataPackageAdapter 在回调方法 OnReceiveAsync 中直接拿到数据实体类
+ // 创建一个数据适配器
+var adapter = new DataPackageAdapter(new FixLengthDataPackageHandler(7));
+
+// 设置数据适配器与回调方法
+_client.AddDataPackageAdapter<MockEntity>(adapter, OnReceiveAsync);
+ private async Task OnReceiveAsync(MockEntity? entity)
+{
+ return Task.CompletedTask;
+}
+
diff --git a/src/BootstrapBlazor.Server/Components/Samples/SvgEditors.razor b/src/BootstrapBlazor.Server/Components/Samples/SvgEditors.razor
index 8d8c0ad844a..9948dad8f30 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/SvgEditors.razor
+++ b/src/BootstrapBlazor.Server/Components/Samples/SvgEditors.razor
@@ -3,6 +3,8 @@
@Localizer["SvgEditorTitle"]
+
@@ -101,7 +101,13 @@
OnQueryAsync="@OnQueryAsync"
OnAddAsync="@OnAddAsync" OnSaveAsync="@OnSaveAsync" OnDeleteAsync="@OnDeleteAsync">
-
+
+
+
+
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Table/TablesFilter.razor b/src/BootstrapBlazor.Server/Components/Samples/Table/TablesFilter.razor
index 215cd90e2c3..997fe95c8f4 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/Table/TablesFilter.razor
+++ b/src/BootstrapBlazor.Server/Components/Samples/Table/TablesFilter.razor
@@ -88,7 +88,13 @@
+
+
+
+
+
diff --git a/src/BootstrapBlazor.Server/Components/Samples/TaskBoard.razor b/src/BootstrapBlazor.Server/Components/Samples/TaskBoard.razor
new file mode 100644
index 00000000000..3dda0358228
--- /dev/null
+++ b/src/BootstrapBlazor.Server/Components/Samples/TaskBoard.razor
@@ -0,0 +1,16 @@
+@page "/task-board"
+@using BootstrapBlazor.Components.Tasks
+
+@inject IStringLocalizer Localizer
+
+@Localizer["TaskBoardTitle"]
+
+@Localizer["TaskBoardIntro"]
+
+
+
diff --git a/src/BootstrapBlazor.Server/Components/Samples/TaskBoard.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/TaskBoard.razor.cs
new file mode 100644
index 00000000000..ca232a02e09
--- /dev/null
+++ b/src/BootstrapBlazor.Server/Components/Samples/TaskBoard.razor.cs
@@ -0,0 +1,14 @@
+// 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(argo@live.ca) Website: https://www.blazor.zone
+
+namespace BootstrapBlazor.Server.Components.Samples;
+
+///
+/// TaskBoard 组件示例
+///
+public partial class TaskBoard
+{
+
+}
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Tooltips.razor b/src/BootstrapBlazor.Server/Components/Samples/Tooltips.razor
index 73434013139..0f4bfad44a5 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/Tooltips.razor
+++ b/src/BootstrapBlazor.Server/Components/Samples/Tooltips.razor
@@ -88,4 +88,19 @@
+
+
+
+ - @((MarkupString)Localizer["TooltipsManualDescLI1"].Value)
+ - @((MarkupString)Localizer["TooltipsManualDescLI2"].Value)
+
+
+
+
+
+
+
/// 获得属性方法
///
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Tutorials/Dashboard.razor b/src/BootstrapBlazor.Server/Components/Samples/Tutorials/Dashboard.razor
index dc9279c5b53..2434af255ee 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/Tutorials/Dashboard.razor
+++ b/src/BootstrapBlazor.Server/Components/Samples/Tutorials/Dashboard.razor
@@ -129,22 +129,16 @@
-
-
- @{
- foreach (var item in Data.TestKKSGroupList)
- {
-
- @item.KKS @item.NAM
- @(
- item.Percent
- )%
-
-
-
+ @foreach (var item in Data.TestKKSGroupList)
+ {
+
+
+ @item.KKS @item.NAM@item.Percent%
+
+
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Tutorials/Dashboard.razor.css b/src/BootstrapBlazor.Server/Components/Samples/Tutorials/Dashboard.razor.css
index dc6fcd54102..1a8b6d9ba4b 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/Tutorials/Dashboard.razor.css
+++ b/src/BootstrapBlazor.Server/Components/Samples/Tutorials/Dashboard.razor.css
@@ -20,3 +20,7 @@
.db-progress ::deep .progress {
flex: 1;
}
+
+.progress-item:not(:last-child) {
+ margin-block-end: 1rem;
+}
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Tutorials/LoginAndRegister/Template5.razor b/src/BootstrapBlazor.Server/Components/Samples/Tutorials/LoginAndRegister/Template5.razor
index a51b377624f..f7633160bbb 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/Tutorials/LoginAndRegister/Template5.razor
+++ b/src/BootstrapBlazor.Server/Components/Samples/Tutorials/LoginAndRegister/Template5.razor
@@ -1,6 +1,7 @@
@page "/tutorials/template5"
@layout TutorialsLayout
@inherits WebSiteModuleComponentBase
+@inject IOptions WebsiteOption
@attribute [JSModuleAutoLoader("Samples/Tutorials/LoginAndRegister/Template5.razor.js", AutoInvokeDispose = false)]
@@ -57,7 +58,7 @@
- 
+
此登录高仿微软登录 UI
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Tutorials/OnlineSheet/Contributor.cs b/src/BootstrapBlazor.Server/Components/Samples/Tutorials/OnlineSheet/Contributor.cs
new file mode 100644
index 00000000000..90298a43945
--- /dev/null
+++ b/src/BootstrapBlazor.Server/Components/Samples/Tutorials/OnlineSheet/Contributor.cs
@@ -0,0 +1,32 @@
+// 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(argo@live.ca) Website: https://www.blazor.zone
+
+namespace BootstrapBlazor.Server.Components.Samples.Tutorials;
+
+///
+/// Contributor
+///
+public sealed class Contributor
+{
+ ///
+ /// Gets or sets Name
+ ///
+ public string? Name { get; set; }
+
+ ///
+ /// Gets or sets Avatar
+ ///
+ public string? Avatar { get; set; }
+
+ ///
+ /// Gets or sets Description
+ ///
+ public string? Description { get; set; }
+
+ ///
+ /// Gets or sets Sheet data
+ ///
+ public UniverSheetData? Data { get; set; }
+}
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Tutorials/OnlineSheet/MockOnlineContributor.cs b/src/BootstrapBlazor.Server/Components/Samples/Tutorials/OnlineSheet/MockOnlineContributor.cs
new file mode 100644
index 00000000000..478ab44ffec
--- /dev/null
+++ b/src/BootstrapBlazor.Server/Components/Samples/Tutorials/OnlineSheet/MockOnlineContributor.cs
@@ -0,0 +1,32 @@
+// 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(argo@live.ca) Website: https://www.blazor.zone
+
+namespace BootstrapBlazor.Server.Components.Samples.Tutorials;
+
+static class MockOnlineContributor
+{
+ public static void Trigger(IDispatchService dispatchService)
+ {
+ dispatchService.Dispatch(new DispatchEntry()
+ {
+ Name = "OnlineSheet-Demo",
+ Entry = new Contributor()
+ {
+ Name = "Argo Zhang",
+ Avatar = "/images/Argo-C.png",
+ Description = "正在更新单元格 A8",
+ Data = new UniverSheetData()
+ {
+ CommandName = "UpdateRange",
+ Data = new
+ {
+ Range = "A8",
+ Value = $"{DateTime.Now: yyyy-MM-dd HH:mm:ss} Argo 更新此单元格"
+ }
+ }
+ }
+ });
+ }
+}
diff --git a/src/BootstrapBlazor.Server/Components/Samples/Tutorials/OnlineSheet/OnlineSheet.razor.cs b/src/BootstrapBlazor.Server/Components/Samples/Tutorials/OnlineSheet/OnlineSheet.razor.cs
index 7b76104aec4..90ac066baaf 100644
--- a/src/BootstrapBlazor.Server/Components/Samples/Tutorials/OnlineSheet/OnlineSheet.razor.cs
+++ b/src/BootstrapBlazor.Server/Components/Samples/Tutorials/OnlineSheet/OnlineSheet.razor.cs
@@ -49,6 +49,22 @@ protected override void OnInitialized()
}
}
+ ///
+ ///
+ ///
+ /// entry)
return;
}
- if (entry.Entry != null)
+ if (entry is { Name: "OnlineSheet-Demo", Entry: not null })
{
await ToastService.Show(new ToastOption()
{
diff --git a/src/BootstrapBlazor.Server/Dockerfile b/src/BootstrapBlazor.Server/Dockerfile
index 1fd5253a3fb..4bc769d5a5e 100644
--- a/src/BootstrapBlazor.Server/Dockerfile
+++ b/src/BootstrapBlazor.Server/Dockerfile
@@ -3,7 +3,13 @@
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
WORKDIR /app
-EXPOSE 80
+EXPOSE 8080
+
+RUN apt-get update && apt-get install -y wget
+RUN wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+RUN apt install -y ./google-chrome-stable_current_amd64.deb
+RUN rm ./google-chrome-stable_current_amd64.deb
+RUN apt install -y fonts-wqy-microhei
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
WORKDIR /
@@ -11,6 +17,7 @@ COPY . .
WORKDIR "src/BootstrapBlazor.Server"
FROM build AS publish
+RUN dotnet build
RUN dotnet publish -c Release -o /app
FROM base AS final
diff --git a/src/BootstrapBlazor.Server/Extensions/MenusLocalizerExtensions.cs b/src/BootstrapBlazor.Server/Extensions/MenusLocalizerExtensions.cs
index eeee6ed773f..76758c82c7c 100644
--- a/src/BootstrapBlazor.Server/Extensions/MenusLocalizerExtensions.cs
+++ b/src/BootstrapBlazor.Server/Extensions/MenusLocalizerExtensions.cs
@@ -816,6 +816,12 @@ void AddData(DemoMenuItem item)
Url = "tag"
},
new()
+ {
+ IsNew = true,
+ Text = Localizer["TaskDashBoard"],
+ Url = "task-board"
+ },
+ new()
{
Text = Localizer["Timeline"],
Url = "timeline"
@@ -1458,6 +1464,12 @@ void AddLayout(DemoMenuItem item)
Url = "footer"
},
new()
+ {
+ IsNew = true,
+ Text = Localizer["Navbar"],
+ Url = "navbar"
+ },
+ new()
{
Text = Localizer["Row"],
Url = "row"
@@ -1547,6 +1559,12 @@ void AddServices(DemoMenuItem item)
Url = "dispatch"
},
new()
+ {
+ IsNew = true,
+ Text = Localizer["Dom2ImageService"],
+ Url = "dom2image"
+ },
+ new()
{
Text = Localizer["Download"],
Url = "download"
@@ -1612,6 +1630,12 @@ void AddServices(DemoMenuItem item)
Url = "mask"
},
new()
+ {
+ IsNew = true,
+ Text = Localizer["OpcDaService"],
+ Url = "opc-da"
+ },
+ new()
{
Text = Localizer["PrintService"],
Url = "print-service"
diff --git a/src/BootstrapBlazor.Server/Extensions/ServiceCollectionExtensions.cs b/src/BootstrapBlazor.Server/Extensions/ServiceCollectionExtensions.cs
index 9645ead253d..e62f7e8803e 100644
--- a/src/BootstrapBlazor.Server/Extensions/ServiceCollectionExtensions.cs
+++ b/src/BootstrapBlazor.Server/Extensions/ServiceCollectionExtensions.cs
@@ -34,17 +34,24 @@ public static IServiceCollection AddBootstrapBlazorServerService(this IServiceCo
// 增加 SignalR 服务数据传输大小限制配置
services.Configure(option => option.MaximumReceiveMessageSize = null);
-#if !DEBUG
// 增加后台任务服务
services.AddTaskServices();
services.AddHostedService();
- services.AddHostedService();
-#endif
services.AddHostedService();
services.AddHostedService();
services.AddHostedService();
services.AddHostedService();
+ if (OperatingSystem.IsWindows())
+ {
+ services.AddOpcDaServer();
+ }
+ else
+ {
+ // 增加 OpcDa 模拟服务（给 Linux 平台使用）
+ services.AddMockOpcDaServer();
+ }
+
// 增加通用服务
services.AddBootstrapBlazorServices();
diff --git a/src/BootstrapBlazor.Server/Extensions/ServiceCollectionSharedExtensions.cs b/src/BootstrapBlazor.Server/Extensions/ServiceCollectionSharedExtensions.cs
index 13c4ae2790a..c965c15bd2c 100644
--- a/src/BootstrapBlazor.Server/Extensions/ServiceCollectionSharedExtensions.cs
+++ b/src/BootstrapBlazor.Server/Extensions/ServiceCollectionSharedExtensions.cs
@@ -67,6 +67,9 @@ public static IServiceCollection AddBootstrapBlazorServices(this IServiceCollect
// 增加 Html2Image 导出服务
services.AddBootstrapBlazorHtml2ImageService();
+ // 增加 Dom2Image 导出服务
+ services.AddBootstrapBlazorDom2ImageService();
+
// 增加 WinBox 弹窗服务
services.AddBootstrapBlazorWinBoxService();
diff --git a/src/BootstrapBlazor.Server/Locales/en-US.json b/src/BootstrapBlazor.Server/Locales/en-US.json
index 8be381be25a..294fad37e76 100644
--- a/src/BootstrapBlazor.Server/Locales/en-US.json
+++ b/src/BootstrapBlazor.Server/Locales/en-US.json
@@ -108,7 +108,11 @@
"TooltipsCustomClassIntro": "Set the custom style by setting the CustomClass parameter",
"BootstrapTooltipIntro": "Try to make a new component that is more comfortable to use, you can use it early, the name of the component may be changed later",
"BootstrapTooltipTips1": "Wrap other components or HTML elements through BootstrapTooltip so that the wrapped object has the function of Tooltip",
- "BootstrapTooltipTips2": "In this example, an icon is wrapped by BootstrapTooltip. When the mouse moves over the icon, the default Tooltip is displayed, which is easier and faster to use."
+ "BootstrapTooltipTips2": "In this example, an icon is wrapped by BootstrapTooltip. When the mouse moves over the icon, the default Tooltip is displayed, which is easier and faster to use.",
+ "TooltipsManualTitle": "Manual",
+ "TooltipsManualIntro": "Use code to control the tooltip state by setting Trigger=\"manual\"",
+ "TooltipsManualDescLI1": "The child component uses the cascade parameters to get the Tooltip instance and then calls its methods Show Hide Toggle",
+ "TooltipsManualDescLI2": "Get the Tooltip instance through @ref and call its instances method"
},
"BootstrapBlazor.Server.Components.Samples.Toasts": {
"ToastsTitle": "Toast Lightweight Popup",
@@ -348,7 +352,11 @@
"PopoversCssClassTitle": "custom style",
"PopoversCssClassIntro": "Customize the pop-up window by setting the Popover parameter CssClass",
"PopoversCssClassDescription": "set up Popover parameter CssClass=\"custom-popover\" make custom styles",
- "PopoversCssClassButtonText": "Click to activate/deactivate"
+ "PopoversCssClassButtonText": "Click to activate/deactivate",
+ "PopoversManualTitle": "Manual",
+ "PopoversManualIntro": "Use code to control the popover state by setting Trigger=\"manual\"",
+ "PopoversManualDescLI1": "The child component uses the cascade parameters to get the Popover instance and then calls its methods Show Hide Toggle",
+ "PopoversManualDescLI2": "Get the Popover instance through @ref and call its instances method"
},
"BootstrapBlazor.Server.Components.Samples.Progress": {
"ProgressTitle": "Progress progress bar",
@@ -448,12 +456,15 @@
"MaskDescription": "By calling the service display and hide methods, a mask layer is displayed to mask the data.",
"MaskNormalTitle": "Basic usage",
"MaskNormalIntro": "Call the MaskService mask service example method Show to display a mask, and call the instance method Close to close the mask after 3 seconds",
+ "MaskNormalDesc": "You can adjust the ZIndex Opacity BackgroundColor parameters via MaskOption",
"ShowMaskButtonText": "Show",
"MaskContainerTitle": "Container",
"MaskContainerIntro": "Specify the mask position by setting the MaskOption parameter ContainerId",
"MultipleMaskContainerTitle": "Multiple Mask",
"MultipleMaskContainerIntro": "By customizing the Mask component, you can mask multiple parts of a web page.",
- "MultipleMaskContainerDesc": "Set the Mask component in the component. When calling the Show instance method of MaskService, specify the Mask instance as the second parameter."
+ "MultipleMaskContainerDesc": "Set the Mask component in the component. When calling the Show instance method of MaskService, specify the Mask instance as the second parameter.",
+ "MaskCloseTitle": "Close By Code",
+ "MaskCloseIntro": "Close the popup by using the DialogCloseButton component or cascade parameters"
},
"BootstrapBlazor.Server.Components.Samples.Messages": {
"MessagesTitle": "Message prompt",
@@ -639,7 +650,9 @@
"BaiduOcrDesc": "本组件通过调用 Baidu AI 平台文字识别接口进行增值税发票文字识别。支持对增值税普票、专票、全电发票（新版全国统一电子发票，专票/普票）、卷票、区块链发票的所有字段进行结构化识别，包括发票基本信息、销售方及购买方信息、商品信息、价税信息等，其中五要素字段的识别准确率超过 99.9%； 同时，支持对增值税卷票的 21 个关键字段进行识别，包括发票类型、发票代码、发票号码、机打号码、机器编号、收款人、销售方名称、销售方纳税人识别号、开票日期、购买方名称、购买方纳税人识别号、项目、单价、数量、金额、税额、合计金额(小写)、合计金额(大写)、校验码、省、市，四要素字段的识别准确率可达95%。上传图片不能超过 4M",
"BaiduOcrIntro": "Usage",
"BaiduOcrStep1": "1. Get IBaiduOcr instance by inject service",
- "BaiduOcrStep2": "2. Call IBaiduOcr instance method",
+ "BaiduOcrStep1Desc": "Update the appsettings.json file with the following configuration. Please register on Baidu AI Open Platform and apply for relevant parameter values.",
+ "BaiduOcrStep2": "2. Get IBaiduOcr instance by inject service",
+ "BaiduOcrStep3": "3. Call IBaiduOcr instance method",
"VerifyVatInvoiceTitle": "增值税验真",
"VerifyVatInvoiceIntro": "通过调用 IBaiduOcr 服务实例的发票验真方法 VerifyInvoiceAsync 返回 InvoiceVerifyResult 其属性 Valid 为 true 时为真"
},
@@ -2534,7 +2547,7 @@
"EditorPlaceholderIntro": "The prompt message when a null value is set by setting the Placeholder attribute",
"EditorPlaceholderDescription": "The default prompt is Edit after clicking",
"EditorIsEditorTitle": "Display as a rich text edit box by default",
- "EditorIsEditorIntro": "Set the component to be directly displayed as a rich text edit box by setting the IsEditor property",
+ "EditorIsEditorIntro": "Set the component to be directly displayed as a rich text edit box by setting the IsEditor property. When uploading an image, you can get the image information through the OnFileUpload callback method",
"EditorHeightTitle": "Custom height",
"EditorHeightIntro": "Set the height of the component by setting the Height property",
"EditorOnValueChangedTitle": "Two-way binding",
@@ -2575,7 +2588,8 @@
"DoMethodAsyncButton2": "Update to H2",
"DoMethodAsyncButton3": "Insert Image",
"DoMethodAsyncButton4": "Get Code",
- "DoMethodAsyncPasteHTML": "Here is the content inserted by the external button"
+ "DoMethodAsyncPasteHTML": "Here is the content inserted by the external button",
+ "OnFileUploadAttribute": "File upload callback method"
},
"BootstrapBlazor.Server.Components.Samples.EditorForms": {
"Title": "EditorForm",
@@ -2627,7 +2641,9 @@
"TestName": "Tom",
"TestAddress": "The test address",
"AutoGenerateDescription": "In this example, by setting the autoGenerate AllItem value to false, turning off auto-generation, and rendering the form editing by manually adding two EditoItem edits",
- "SkipValidateDescription": "In some cases, the value of some columns in the form may be a secondary classification, etc., and you need to know the information for a level 1 classification, at which point the first-level classification requires additional components to render if Select, which is independent of the current context binding model Model, which requires that you set the SkipValidate value to true, turn off model validation for this component"
+ "SkipValidateDescription": "In some cases, the value of some columns in the form may be a secondary classification, etc., and you need to know the information for a level 1 classification, at which point the first-level classification requires additional components to render if Select, which is independent of the current context binding model Model, which requires that you set the SkipValidate value to true, turn off model validation for this component",
+ "IsDisplayTitle": "Readonly Form",
+ "IsDisplayIntro": "Make the entire form non-editable by setting IsDisplay=\"true\""
},
"BootstrapBlazor.Server.Components.Samples.FloatingLabels": {
"FloatingLabelsTitle": "FloatingLabel",
@@ -4846,7 +4862,11 @@
"SocketAutoConnect": "Reconnect",
"SocketDataEntity": "DataEntity",
"NetworkMonitor": "Network Monitor",
- "Toolbar": "Toolbar"
+ "Toolbar": "Toolbar",
+ "OpcDaService": "OpcDaServer",
+ "Navbar": "Navbar",
+ "TaskDashBoard": "TaskDashBoard",
+ "Dom2ImageService": "IDom2HtmlService"
},
"BootstrapBlazor.Server.Components.Samples.Table.TablesHeader": {
"TablesHeaderTitle": "Header grouping function",
@@ -4873,6 +4893,7 @@
"SelectTreesClientValidationIntro": "validate the value when submit the form. Inside ValidateForm",
"SelectTreesEditTitle": "Edit",
"SelectTreesEditIntro": "By setting IsEditable=\"true\" you can edit the input textbox",
+ "SelectTreesEditDesc": "After setting IsEditable=\"true\", the content displayed in the text box is the Value value of the node selected in the TreeView, the input value may not be in the Items collection",
"SelectTreesIsPopoverTitle": "IsPopover",
"SelectTreesIsPopoverIntro": "Set IsPopover to true, use popover render UI prevent The dropdown menu cannot be fully displayed because the parent container is set to overflow: hidden",
"SelectTreesClientValidationButtonText": "Submit"
@@ -5699,7 +5720,11 @@
"SetFilterInCodeIntro": "Example shows how to set filters through code",
"SetFilterInCodeButtonText1": "Name contains 01",
"SetFilterInCodeButtonText2": "Reset All Filter",
- "TablesFilterTemplateDescription": "The FilterTemplate type is RenderFragment its value is a custom component, and the component must inherit the filterBase In this case, the last column in this case, the Quantity column, uses the custom component by filtering the template CustomerFilter [portal] CustomerFilter component source code
Notes:
- Custom filter components are wrapped with
FilterProvider, and FilterProvider must be under the FilterTemplate node - Filters can be fine-tuned through the parameters of the
FilterProvider component; for example, by setting ShowMoreButton to control whether the + - symbol is displayed "
+ "TablesFilterTemplateDescription": "The FilterTemplate type is RenderFragment its value is a custom component, and the component must inherit the filterBase In this case, the last column in this case, the Quantity column, uses the custom component by filtering the template CustomerFilter [portal] CustomerFilter component source code
Notes:
- Custom filter components are wrapped with
FilterProvider, and FilterProvider must be under the FilterTemplate node - Filters can be fine-tuned through the parameters of the
FilterProvider component; for example, by setting ShowMoreButton to control whether the + - symbol is displayed - Before
v9.6.2, use OnFilterValueChanged to trigger the filter callback. After refactoring, use OnFilterAsync to trigger the filter callback method. ",
+ "CustomerFilterItem1": "All",
+ "CustomerFilterItem2": "Greater than 10",
+ "CustomerFilterItem3": "Greater than 50",
+ "CustomerFilterItem4": "Greater than 80"
},
"BootstrapBlazor.Server.Components.Samples.Table.TablesFixedHeader": {
"TablesFixedHeaderTitle": "Fixed header function",
@@ -7141,7 +7166,9 @@
"DataEntityTitle": "Socket Auto Entity",
"DataEntityDescription": "After receiving the communication data, it is automatically converted into the entity class required by the business",
"NormalTitle": "Basic usage",
- "NormalIntro": "Enable automatic data conversion through the DataTypeConverterAttribute attribute"
+ "NormalIntro": "Enable automatic data conversion through the DataTypeConverterAttribute attribute",
+ "ConfigTitle": "DataType Converter",
+ "ConfigIntro": "Use the ConfigureDataConverters method to map the entity class and automatically convert the received data"
},
"BootstrapBlazor.Server.Components.Samples.NetworkMonitors": {
"NetworkMonitorTitle": "NetworkMonitor",
@@ -7158,5 +7185,33 @@
"ToolbarSubTitle": "ToolBar component is a container for buttons or other application-specific tools",
"NormalTitle": "Normal",
"NormalIntro": ""
+ },
+ "BootstrapBlazor.Server.Components.Samples.OpcDa": {
+ "OpcDaTitle": "OpcDa Server",
+ "OpcDaDescription": "Connect to OpcDa Server to obtain PLC real-time data",
+ "OpcDaNormalTitle": "Basic usage",
+ "OpcDaNormalIntro": "Get an instance by injecting the service IOpcDaServer and call the Read method to get the PLC Tag value."
+ },
+ "BootstrapBlazor.Server.Components.Samples.Navbars": {
+ "NavbarTitle": "Navbar",
+ "NavbarDescription": "A powerful, responsive navigation header, the navbar. Includes support for branding, navigation, and more",
+ "NormalTitle": "Basic usage",
+ "NormalIntro": "By setting NavbarBrand NavbarToggleButton NavbarCollapse NavbarGroup NavbarItem to layout its internal elements"
+ },
+ "BootstrapBlazor.Server.Components.Samples.TaskBoard": {
+ "TaskBoardTitle": "Task DashBoard",
+ "TaskBoardIntro": "Background task dashboard",
+ "TaskBoardNormalTitle": "Basic usage",
+ "TaskBoardNormalIntro": "This component provides detailed information about background task schedule trigger."
+ },
+ "BootstrapBlazor.Server.Components.Samples.Dom2Images": {
+ "Dom2ImageTitle": "Dom2Image",
+ "Dom2ImageIntro": "Export HTML snippets as images",
+ "Dom2ImageNormalTitle": "Basic usage",
+ "Dom2ImageNormalIntro": "Convert the node to an image by specifying a Selector",
+ "Dom2ImageDesc": "Since the underlying framework uses SnapDOM , if you encounter any problems during actual use, please refer to the project Issue",
+ "Dom2ImageButtonText": "Convert",
+ "Dom2ImageDownloadText": "Download",
+ "Dom2ImageFullText": "Capture"
}
}
diff --git a/src/BootstrapBlazor.Server/Locales/zh-CN.json b/src/BootstrapBlazor.Server/Locales/zh-CN.json
index ea2223ed4e9..18dfe6e2363 100644
--- a/src/BootstrapBlazor.Server/Locales/zh-CN.json
+++ b/src/BootstrapBlazor.Server/Locales/zh-CN.json
@@ -108,7 +108,11 @@
"TooltipsCustomClassIntro": "通过设置 CustomClass 参数进行自定义样式设置",
"BootstrapTooltipIntro": "尝试新做一个用起来比较舒服的组件，可尝鲜使用，后期组件名字可能会更改",
"BootstrapTooltipTips1": "通过 BootstrapTooltip 对其他组件或者 HTML 元素进行包裹，使其被包裹对象具有 Tooltip 功能",
- "BootstrapTooltipTips2": "本例中通过 BootstrapTooltip 包裹一个图标，鼠标移动到图标上时，显示预设 Tooltip 使用更简单快捷"
+ "BootstrapTooltipTips2": "本例中通过 BootstrapTooltip 包裹一个图标，鼠标移动到图标上时，显示预设 Tooltip 使用更简单快捷",
+ "TooltipsManualTitle": "手动控制状态",
+ "TooltipsManualIntro": "通过设置 Trigger=\"manual\" 使用代码控制提示栏状态",
+ "TooltipsManualDescLI1": "子组件使用级联参数得到 Tooltip 实例，然后调用其相应方法 Show Hide Toggle",
+ "TooltipsManualDescLI2": "通过 @ref 获得 Tooltip 实例调用其对应方法"
},
"BootstrapBlazor.Server.Components.Samples.Toasts": {
"ToastsTitle": "Toast 轻量弹窗",
@@ -348,7 +352,11 @@
"PopoversCssClassTitle": "自定义样式",
"PopoversCssClassIntro": "通过设置 Popover 参数 CssClass 对弹窗进行自定义样式",
"PopoversCssClassDescription": "设置 Popover 参数 CssClass=\"custom-popover\" 进行自定义样式",
- "PopoversCssClassButtonText": "Click 激活/关闭"
+ "PopoversCssClassButtonText": "Click 激活/关闭",
+ "PopoversManualTitle": "手动控制状态",
+ "PopoversManualIntro": "通过设置 Trigger=\"manual\" 使用代码控制提示栏状态",
+ "PopoversManualDescLI1": "子组件使用级联参数得到 Popover 实例，然后调用其相应方法 Show Hide Toggle",
+ "PopoversManualDescLI2": "通过 @ref 获得 Popover 实例调用其对应方法"
},
"BootstrapBlazor.Server.Components.Samples.Progress": {
"ProgressTitle": "Progress 进度条",
@@ -448,12 +456,15 @@
"MaskDescription": "通过调用服务显示，隐藏方法，显示一个遮罩层对数据进行遮罩操作",
"MaskNormalTitle": "基本用法",
"MaskNormalIntro": "调用 MaskService 遮罩服务示例方法 Show 方法显示一个遮罩，3 秒后调用实例方法 Close 关闭遮罩",
+ "MaskNormalDesc": "可以通过 MaskOption 调整 ZIndex Opacity BackgroundColor 参数",
"ShowMaskButtonText": "打开",
"MaskContainerTitle": "指定容器",
"MaskContainerIntro": "通过设置 MaskOption 参数 ContainerId 指定遮罩出现位置",
"MultipleMaskContainerTitle": "多遮罩",
"MultipleMaskContainerIntro": "通过自定义设置 Mask 组件可实现网页内多个局部进行遮罩操作",
- "MultipleMaskContainerDesc": "组件内自己设置 Mask 组件，调用 MaskService 实例方法 Show 时，通过第二个参数指定 Mask 实例即可"
+ "MultipleMaskContainerDesc": "组件内自己设置 Mask 组件，调用 MaskService 实例方法 Show 时，通过第二个参数指定 Mask 实例即可",
+ "MaskCloseTitle": "代码关闭弹窗",
+ "MaskCloseIntro": "通过使用 DialogCloseButton 组件或者级联参数关闭弹窗"
},
"BootstrapBlazor.Server.Components.Samples.Messages": {
"MessagesTitle": "Message 消息提示",
@@ -638,8 +649,10 @@
"VatInvoiceIntro": "通过上传增值税发票图片调用百度 Ocr 接口进行文字识别",
"BaiduOcrDesc": "本组件通过调用 Baidu AI 平台文字识别接口进行增值税发票文字识别。支持对增值税普票、专票、全电发票（新版全国统一电子发票，专票/普票）、卷票、区块链发票的所有字段进行结构化识别，包括发票基本信息、销售方及购买方信息、商品信息、价税信息等，其中五要素字段的识别准确率超过 99.9%； 同时，支持对增值税卷票的 21 个关键字段进行识别，包括发票类型、发票代码、发票号码、机打号码、机器编号、收款人、销售方名称、销售方纳税人识别号、开票日期、购买方名称、购买方纳税人识别号、项目、单价、数量、金额、税额、合计金额(小写)、合计金额(大写)、校验码、省、市，四要素字段的识别准确率可达95%。上传图片不能超过 4M",
"BaiduOcrIntro": "使用方法",
- "BaiduOcrStep1": "1. 通过注入服务获得 IBaiduOcr 实例",
- "BaiduOcrStep2": "2. 调用服务相对应的识别方法即可",
+ "BaiduOcrStep1": "1. 配置 BaiduOcrOption",
+ "BaiduOcrStep1Desc": "更新 appsettings.json 文件，配置如下：相关参数值请在 百度 AI 开放平台 注册后开通申请",
+ "BaiduOcrStep2": "2. 通过注入服务获得 IBaiduOcr 实例",
+ "BaiduOcrStep3": "3. 调用服务相对应的识别方法即可",
"VerifyVatInvoiceTitle": "增值税验真",
"VerifyVatInvoiceIntro": "通过调用 IBaiduOcr 服务实例的发票验真方法 VerifyInvoiceAsync 返回 InvoiceVerifyResult 其属性 Valid 为 true 时为真"
},
@@ -2534,7 +2547,7 @@
"EditorPlaceholderIntro": "通过设置 Placeholder 属性来设置空值时的提示消息",
"EditorPlaceholderDescription": "默认提示是 点击后进行编辑",
"EditorIsEditorTitle": "默认显示为富文本编辑框",
- "EditorIsEditorIntro": "通过设置 IsEditor 属性来设置组件直接显示为富文本编辑框",
+ "EditorIsEditorIntro": "通过设置 IsEditor 属性来设置组件直接显示为富文本编辑框，上传图片时可以通过 OnFileUpload 回调方法获得图片信息",
"EditorHeightTitle": "自定义高度",
"EditorHeightIntro": "通过设置 Height 属性来设置组件高度",
"EditorOnValueChangedTitle": "双向绑定",
@@ -2575,7 +2588,8 @@
"DoMethodAsyncButton2": "将段落修改为 H2",
"DoMethodAsyncButton3": "添加一张图片",
"DoMethodAsyncButton4": "获得组件内容",
- "DoMethodAsyncPasteHTML": "这里是外部按钮插入的内容"
+ "DoMethodAsyncPasteHTML": "这里是外部按钮插入的内容",
+ "OnFileUploadAttribute": "文件上传回调方法"
},
"BootstrapBlazor.Server.Components.Samples.EditorForms": {
"Title": "EditorForm 表单组件",
@@ -2627,7 +2641,10 @@
"TestName": "张三",
"TestAddress": "测试地址",
"AutoGenerateDescription": "本例中通过设置 AutoGenerateAllItem 值为 false，关闭自动生成功能，通过手动增加两个 EditorItem 编辑项来呈现表单编辑",
- "SkipValidateDescription": "在某些情况下表单中有些列的值可能是二级分类等等，需要知道一级分类的信息，这个时候一级分类需要额外的组件来呈现，如果 Select，而这个组件是与当前上下文绑定模型 Model 无关的，这种需求中通过设置 SkipValidate 值为 true，关闭此组件的模型验证功能即可"
+ "SkipValidateDescription": "在某些情况下表单中有些列的值可能是二级分类等等，需要知道一级分类的信息，这个时候一级分类需要额外的组件来呈现，如果 Select，而这个组件是与当前上下文绑定模型 Model 无关的，这种需求中通过设置 SkipValidate 值为 true，关闭此组件的模型验证功能即可",
+ "IsDisplayTitle": "只读表单",
+ "IsDisplayIntro": "通过设置 IsDisplay=\"true\" 使整个表单不可编辑"
+
},
"BootstrapBlazor.Server.Components.Samples.FloatingLabels": {
"FloatingLabelsTitle": "FloatingLabel 输入框",
@@ -4846,7 +4863,11 @@
"SocketAutoConnect": "自动重连",
"SocketDataEntity": "通讯数据转实体类",
"NetworkMonitor": "网络状态 NetworkMonitor",
- "Toolbar": "工具栏 Toolbar"
+ "Toolbar": "工具栏 Toolbar",
+ "OpcDaService": "OpcDaServer 服务",
+ "Navbar": "导航栏 Navbar",
+ "TaskDashBoard": "任务管理器 TaskDashBoard",
+ "Dom2ImageService": "节点转图片服务 IDom2HtmlService"
},
"BootstrapBlazor.Server.Components.Samples.Table.TablesHeader": {
"TablesHeaderTitle": "表头分组功能",
@@ -4873,6 +4894,7 @@
"SelectTreesClientValidationIntro": "组件内置 ValidateForm 可设置验证规则",
"SelectTreesEditTitle": "可输入",
"SelectTreesEditIntro": "通过设置 IsEditable=\"true\" 可设置下拉框选择后文本框可输入",
+ "SelectTreesEditDesc": "设置 IsEditable=\"true\" 后，文本框显示的内容为 TreeView 选中节点的 Value 值，输入值可以不在 Items 集合中",
"SelectTreesIsPopoverTitle": "悬浮弹窗",
"SelectTreesIsPopoverIntro": "通过设置 IsPopover 参数，组件使用 popover 渲染 UI 防止由于父容器设置 overflow: hidden; 使弹窗无法显示问题",
"SelectTreesClientValidationButtonText": "提交"
@@ -5699,7 +5721,11 @@
"SetFilterInCodeIntro": "示例展示如何通过代码设置过滤条件",
"SetFilterInCodeButtonText1": "名称包含01",
"SetFilterInCodeButtonText2": "重置条件",
- "TablesFilterTemplateDescription": "FilterTemplate 类型为 RenderFragment 其值为自定义组件，组件必须继承 FilterBase 本例中最后一列 数量列 通过筛选模板使用自定义组件 CustomerFilter [传送门] CustomerFilter 组件源码
注意事项：
- 自定义过滤组件使用
FilterProvider 包裹，FilterProvider必须在 FilterTemplate 节点下 - 通过
FilterProvider 组件的参数可微调过滤器；例如通过设置 ShowMoreButton 控制是否显示 + - 符号 "
+ "TablesFilterTemplateDescription": "FilterTemplate 类型为 RenderFragment 其值为自定义组件，组件必须继承 FilterBase 本例中最后一列 数量列 通过筛选模板使用自定义组件 CustomerFilter [传送门] CustomerFilter 组件源码
注意事项：
- 自定义过滤组件使用
FilterProvider 包裹，FilterProvider必须在 FilterTemplate 节点下 - 通过
FilterProvider 组件的参数可微调过滤器；例如通过设置 ShowMoreButton 控制是否显示 + - 符号 v9.6.2 版本前，使用 OnFilterValueChanged 触发过滤回调，重构后使用 OnFilterAsync 触发过滤回调方法DataTypeConverterAttribute 标签开启数据自动转换功能"
+ "NormalIntro": "通过 DataTypeConverterAttribute 标签开启数据自动转换功能",
+ "ConfigTitle": "数据实体类映射配置",
+ "ConfigIntro": "使用 ConfigureDataConverters 方法对实体类进行映射配置将接收到的数据自动转化"
},
"BootstrapBlazor.Server.Components.Samples.NetworkMonitors": {
"NetworkMonitorTitle": "NetworkMonitor 网络状态",
@@ -7158,5 +7186,33 @@
"ToolbarSubTitle": "是按钮或其他应用程序特定工具的容器",
"NormalTitle": "基本用法",
"NormalIntro": ""
+ },
+ "BootstrapBlazor.Server.Components.Samples.OpcDa": {
+ "OpcDaTitle": "OpcDa Server 服务",
+ "OpcDaDescription": "连接 OpcDa Server 获得 PLC 实时数据",
+ "OpcDaNormalTitle": "基本用法",
+ "OpcDaNormalIntro": "通过注入服务 IOpcDaServer 获得实例，调用 Read 方法获得 PLC 位号值"
+ },
+ "BootstrapBlazor.Server.Components.Samples.Navbars": {
+ "NavbarTitle": "Navbar 导航栏",
+ "NavbarDescription": "是网站开发中用于定义顶部导航区域或主页快速启动区域的结构化组件",
+ "NormalTitle": "基本用法",
+ "NormalIntro": "通过设置 NavbarBrand NavbarToggleButton NavbarCollapse NavbarGroup NavbarItem 对其内部元素布局"
+ },
+ "BootstrapBlazor.Server.Components.Samples.TaskBoard": {
+ "TaskBoardTitle": "Task DashBoard 任务管理器",
+ "TaskBoardIntro": "后台任务看板",
+ "TaskBoardNormalTitle": "基本用法",
+ "TaskBoardNormalIntro": "本组件提供后台任务调度触发器详细信息"
+ },
+ "BootstrapBlazor.Server.Components.Samples.Dom2Images": {
+ "Dom2ImageTitle": "Dom2Image 元素转图片",
+ "Dom2ImageIntro": "将 Html 片段导出为图片",
+ "Dom2ImageNormalTitle": "基本用法",
+ "Dom2ImageNormalIntro": "通过指定 Selector 将此节点转成图片",
+ "Dom2ImageDesc": "由于底层使用的是 SnapDOM 实际使用过程中遇到问题请参考项目 Issue",
+ "Dom2ImageButtonText": "转换",
+ "Dom2ImageDownloadText": "下载",
+ "Dom2ImageFullText": "长截图"
}
}
diff --git a/src/BootstrapBlazor.Server/Services/MockOnlineContributor.cs b/src/BootstrapBlazor.Server/Services/MockOnlineContributor.cs
deleted file mode 100644
index 0a60295454c..00000000000
--- a/src/BootstrapBlazor.Server/Services/MockOnlineContributor.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-// 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(argo@live.ca) Website: https://www.blazor.zone
-
-using Longbow.Tasks;
-
-namespace BootstrapBlazor.Server.Services;
-
-class MockOnlineContributor(IDispatchService dispatchService) : BackgroundService
-{
- ///
- /// 运行任务
- ///
- ///
- /// ()
- {
- Name = "OnlineSheet-Demo",
- Entry = new Contributor()
- {
- Name = "Argo Zhang",
- Avatar = "/images/Argo-C.png",
- Description = "正在更新单元格 A8",
- Data = new UniverSheetData()
- {
- CommandName = "UpdateRange",
- Data = new
- {
- Range = "A8",
- Value = $"{DateTime.Now: yyyy-MM-dd HH:mm:ss} Argo 更新此单元格"
- }
- }
- }
- });
- return Task.CompletedTask;
- }, TriggerBuilder.Build(Cron.Secondly(5)));
-
- return Task.CompletedTask;
- }
-}
-
-///
-/// Contributor
-///
-public class Contributor
-{
- ///
- /// Gets or sets Name
- ///
- public string? Name { get; set; }
-
- ///
- /// Gets or sets Avatar
- ///
- public string? Avatar { get; set; }
-
- ///
- /// Gets or sets Description
- ///
- public string? Description { get; set; }
-
- ///
- /// Gets or sets Sheet data
- ///
- public UniverSheetData? Data { get; set; }
-}
diff --git a/src/BootstrapBlazor.Server/docs.json b/src/BootstrapBlazor.Server/docs.json
index f95c8aa73ef..b69bf4d3956 100644
--- a/src/BootstrapBlazor.Server/docs.json
+++ b/src/BootstrapBlazor.Server/docs.json
@@ -90,6 +90,7 @@
"html-renderer": "HtmlRenderers",
"html2image": "Html2Images",
"html2pdf": "Html2Pdfs",
+ "dom2image": "Dom2Images",
"label": "Labels",
"layout": "Layouts",
"light": "Lights",
@@ -249,7 +250,10 @@
"socket/auto-connect": "Sockets\\AutoReconnects",
"socket/data-entity": "Sockets\\DataEntities",
"network-monitor": "NetworkMonitors",
- "toolbar": "Toolbars"
+ "toolbar": "Toolbars",
+ "opc-da": "OpcDa",
+ "navbar": "Navbars",
+ "task-board": "TaskBoard"
},
"video": {
"table": "BV1ap4y1x7Qn?p=1",
diff --git a/src/BootstrapBlazor.Server/wwwroot/css/site.css b/src/BootstrapBlazor.Server/wwwroot/css/site.css
index 8a26f0039b2..9672ae82968 100644
--- a/src/BootstrapBlazor.Server/wwwroot/css/site.css
+++ b/src/BootstrapBlazor.Server/wwwroot/css/site.css
@@ -52,7 +52,7 @@ html .search-dialog-mask {
--bb-global-search-main-max-height: calc(100vh - 310px);
}
-.navbar {
+.navbar-header {
--bs-navbar-color: rgba(255,255,255,.85);
--bs-navbar-hover-color: rgb(255,255,255);
}
diff --git a/src/BootstrapBlazor.Server/wwwroot/images/log.svg b/src/BootstrapBlazor.Server/wwwroot/images/log.svg
deleted file mode 100644
index ddef642801d..00000000000
--- a/src/BootstrapBlazor.Server/wwwroot/images/log.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
index 996a9012576..c66fc2b2b96 100644
--- a/src/BootstrapBlazor/BootstrapBlazor.csproj
+++ b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
- 9.9.1
+ 9.10.0
diff --git a/src/BootstrapBlazor/Components/Breadcrumb/Breadcrumb.razor b/src/BootstrapBlazor/Components/Breadcrumb/Breadcrumb.razor
index 9fc96613e83..1d744c44023 100644
--- a/src/BootstrapBlazor/Components/Breadcrumb/Breadcrumb.razor
+++ b/src/BootstrapBlazor/Components/Breadcrumb/Breadcrumb.razor
@@ -1,20 +1,20 @@
@namespace BootstrapBlazor.Components
@inherits BootstrapComponentBase
-
-
+
+
+
@code {
RenderFragment RenderItem => item =>
- @-
+ @
-
@if (!string.IsNullOrEmpty(item.Url))
{
@item.Text
@@ -24,4 +24,4 @@
@item.Text
}
;
-}
\ No newline at end of file
+}
diff --git a/src/BootstrapBlazor/Components/Breadcrumb/Breadcrumb.razor.cs b/src/BootstrapBlazor/Components/Breadcrumb/Breadcrumb.razor.cs
index c790638bc16..84961d8ea67 100644
--- a/src/BootstrapBlazor/Components/Breadcrumb/Breadcrumb.razor.cs
+++ b/src/BootstrapBlazor/Components/Breadcrumb/Breadcrumb.razor.cs
@@ -14,11 +14,20 @@ public sealed partial class Breadcrumb
/// 获得/设置 数据集
///
[Parameter]
- public IEnumerable Value { get; set; } = Enumerable.Empty();
+ [NotNull]
+ public IEnumerable? Value { get; set; }
- private string? GetItemClassName(BreadcrumbItem item) => CssBuilder.Default("breadcrumb-item")
+ private static string? GetItemClassString(BreadcrumbItem item) => CssBuilder.Default("breadcrumb-item")
+ .AddClass(item.CssClass)
.Build();
- private string? CurrentPage(BreadcrumbItem item) => CssBuilder.Default()
- .Build();
+ ///
+ ///
+ protected override void OnParametersSet()
+ {
+ base.OnParametersSet();
+
+ Value ??= [];
+ }
}
diff --git a/src/BootstrapBlazor/Components/Breadcrumb/BreadcrumbItem.cs b/src/BootstrapBlazor/Components/Breadcrumb/BreadcrumbItem.cs
index 24635d4f8aa..c9d275198e7 100644
--- a/src/BootstrapBlazor/Components/Breadcrumb/BreadcrumbItem.cs
+++ b/src/BootstrapBlazor/Components/Breadcrumb/BreadcrumbItem.cs
@@ -6,28 +6,25 @@
namespace BootstrapBlazor.Components;
///
-/// BreadcrumbItem 实体类
+/// BreadcrumbItem Class
///
-public class BreadcrumbItem
+///
+///
+///
+public class BreadcrumbItem(string text, string? url = null, string? cssClass = null)
{
///
- /// 获得/设置 导航地址
+ /// 获得/设置 显示文字
///
- public string? Url { get; }
+ public string Text { get; } = text;
///
- /// 获得/设置 显示文字
+ /// 获得/设置 导航地址
///
- public string Text { get; }
+ public string? Url { get; } = url;
///
- /// 构造函数
+ /// 获得/设置 样式名称
///
- ///
- ///
- public BreadcrumbItem(string text, string? url = null)
- {
- Text = text;
- Url = url;
- }
+ public string? CssClass { get; } = cssClass;
}
diff --git a/src/BootstrapBlazor/Components/Button/Button.razor.cs b/src/BootstrapBlazor/Components/Button/Button.razor.cs
index 60d91762c6e..b573dfee3ff 100644
--- a/src/BootstrapBlazor/Components/Button/Button.razor.cs
+++ b/src/BootstrapBlazor/Components/Button/Button.razor.cs
@@ -22,10 +22,8 @@ public partial class Button : ButtonBase
protected ElementReference ButtonElement { get; set; }
///
- /// OnAfterRenderAsync 方法
+ ///
- ///
- ///
- /// 处理点击方法
- ///
- /// ? OnClickWithoutRender { get; set; }
///
- /// 获得/设置 按钮颜色
+ /// 获得/设置 按钮颜色 默认
[Parameter]
public virtual Color Color { get; set; } = Color.Primary;
@@ -231,6 +231,26 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
}
}
+ ///
+ /// 处理点击方法
+ ///
+ ///
/// 设置按钮是否可用状态
///
diff --git a/src/BootstrapBlazor/Components/Button/LinkButton.cs b/src/BootstrapBlazor/Components/Button/LinkButton.cs
new file mode 100644
index 00000000000..9f56a2d8651
--- /dev/null
+++ b/src/BootstrapBlazor/Components/Button/LinkButton.cs
@@ -0,0 +1,137 @@
+// 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(argo@live.ca) Website: https://www.blazor.zone
+
+using Microsoft.AspNetCore.Components.Rendering;
+using Microsoft.AspNetCore.Components.Web;
+
+namespace BootstrapBlazor.Components;
+
+///
+/// LinkButton 组件
+///
+public class LinkButton : ButtonBase
+{
+ ///
+ /// 获得/设置 Url 默认为 #
+ ///
+ [Parameter]
+ public string? Url { get; set; }
+
+ ///
+ /// 获得/设置 A 标签 target 参数 默认 null
+ ///
+ [Parameter]
+ public string? Target { get; set; }
+
+ ///
+ /// 获得/设置 显示图片地址 默认为 null
+ ///
+ [Parameter]
+ public string? ImageUrl { get; set; }
+
+ ///
+ /// The css class of img element default value null
+ ///
+ [Parameter]
+ public string? ImageCss { get; set; }
+
+ ///
+ /// 获得/设置 是否为垂直布局 默认 false
+ ///
+ [Parameter]
+ public bool IsVertical { get; set; }
+
+ private bool Prevent => (Url?.StartsWith('#') ?? true) || IsDisabled;
+
+ private string TagName => IsDisabled ? "button" : "a";
+
+ private string? UrlString => IsDisabled ? null : Url;
+
+ private string? ClassString => CssBuilder.Default("btn link-button")
+ .AddClass("btn-vertical", IsVertical)
+ .AddClass($"btn-outline-{Color.ToDescriptionString()}", IsOutline)
+ .AddClass($"link-{Color.ToDescriptionString()}", Color != Color.None && !IsOutline && !IsDisabled)
+ .AddClass($"btn-{Size.ToDescriptionString()}", Size != Size.None)
+ .AddClass("btn-block", IsBlock)
+ .AddClass("btn-round", ButtonStyle == ButtonStyle.Round)
+ .AddClass("btn-circle", ButtonStyle == ButtonStyle.Circle)
+ .AddClassFromAttributes(AdditionalAttributes)
+ .Build();
+
+ private bool TriggerClick => !IsDisabled || (string.IsNullOrEmpty(Url));
+
+ ///
+ ///
+ ///
+ protected override void BuildRenderTree(RenderTreeBuilder builder)
+ {
+ builder.OpenElement(0, TagName);
+ builder.AddAttribute(10, "class", ClassString);
+ builder.AddAttribute(20, "href", UrlString);
+ builder.AddAttribute(30, "target", Target);
+ builder.AddAttribute(40, "disabled", Disabled);
+ builder.AddAttribute(50, "aria-disabled", DisabledString);
+ builder.AddAttribute(60, "tabindex", Tab);
+ builder.AddAttribute(70, "id", Id);
+ builder.AddAttribute(80, "role", "button");
+ builder.AddMultipleAttributes(90, AdditionalAttributes);
+
+ if (TriggerClick)
+ {
+ builder.AddAttribute(100, "onclick", EventCallback.Factory.Create(this, OnClickButton));
+ builder.AddEventPreventDefaultAttribute(10, "onclick", Prevent);
+ builder.AddEventStopPropagationAttribute(11, "onclick", StopPropagation);
+ }
+
+ if (!string.IsNullOrEmpty(Icon))
+ {
+ builder.AddContent(110, new MarkupString($""));
+ }
+
+ if (!string.IsNullOrEmpty(ImageUrl))
+ {
+ builder.AddContent(120, AddImage());
+ }
+
+ if (!string.IsNullOrEmpty(Text))
+ {
+ builder.AddContent(130, new MarkupString($"{Text}"));
+ }
+
+ builder.AddContent(140, ChildContent);
+ builder.CloseElement();
+ }
+
+ private RenderFragment AddImage() => builder =>
+ {
+ builder.OpenElement(0, "img");
+ builder.AddAttribute(10, "alt", "img");
+ if (!string.IsNullOrEmpty(ImageCss))
+ {
+ builder.AddAttribute(20, "class", ImageCss);
+ }
+ builder.AddAttribute(30, "src", ImageUrl);
+ builder.CloseElement();
+ };
+
+ private async Task OnClickButton()
+ {
+ if (IsAsync)
+ {
+ IsAsyncLoading = true;
+ IsDisabled = true;
+ }
+
+ await HandlerClick();
+
+ // 恢复按钮
+ if (IsAsync)
+ {
+ IsDisabled = IsKeepDisabled;
+ IsAsyncLoading = false;
+ }
+ }
+}
diff --git a/src/BootstrapBlazor/Components/Button/LinkButton.razor b/src/BootstrapBlazor/Components/Button/LinkButton.razor
deleted file mode 100644
index 0032536b39f..00000000000
--- a/src/BootstrapBlazor/Components/Button/LinkButton.razor
+++ /dev/null
@@ -1,18 +0,0 @@
-@namespace BootstrapBlazor.Components
-@inherits ButtonBase
-
-
- @if (!string.IsNullOrEmpty(Icon))
- {
-
- }
- @if (!string.IsNullOrEmpty(ImageUrl))
- {
- 
- }
- @if (!string.IsNullOrEmpty(Text))
- {
- @Text
- }
- @ChildContent
-
diff --git a/src/BootstrapBlazor/Components/Button/LinkButton.razor.cs b/src/BootstrapBlazor/Components/Button/LinkButton.razor.cs
deleted file mode 100644
index 9225eb98cdc..00000000000
--- a/src/BootstrapBlazor/Components/Button/LinkButton.razor.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-// 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(argo@live.ca) Website: https://www.blazor.zone
-
-namespace BootstrapBlazor.Components;
-
-///
-/// LinkButton 组件
-///
-public partial class LinkButton
-{
- ///
- /// 获得/设置 Url 默认为 #
- ///
- [Parameter]
- public string? Url { get; set; }
-
- ///
- /// 获得/设置 A 标签 target 参数 默认 null
- ///
- [Parameter]
- public string? Target { get; set; }
-
- ///
- /// 获得/设置 显示图片地址 默认为 null
- ///
- [Parameter]
- public string? ImageUrl { get; set; }
-
- ///
- /// The css class of img element default value null
- ///
- [Parameter]
- public string? ImageCss { get; set; }
-
- ///
- /// 获得/设置 是否为垂直布局 默认 false
- ///
- [Parameter]
- public bool IsVertical { get; set; }
-
- private bool Prevent => (Url?.StartsWith('#') ?? true) || IsDisabled;
-
- private string TagName => IsDisabled ? "button" : "a";
-
- private string? UrlString => IsDisabled ? null : Url;
-
- private string? ClassString => CssBuilder.Default("btn link-button")
- .AddClass("btn-vertical", IsVertical)
- .AddClass($"btn-outline-{Color.ToDescriptionString()}", IsOutline)
- .AddClass($"link-{Color.ToDescriptionString()}", Color != Color.None && !IsOutline && !IsDisabled)
- .AddClass($"btn-{Size.ToDescriptionString()}", Size != Size.None)
- .AddClass("btn-block", IsBlock)
- .AddClass("btn-round", ButtonStyle == ButtonStyle.Round)
- .AddClass("btn-circle", ButtonStyle == ButtonStyle.Circle)
- .AddClassFromAttributes(AdditionalAttributes)
- .Build();
-
- private bool TriggerClick => !IsDisabled || (string.IsNullOrEmpty(Url));
-
- private async Task OnClickButton()
- {
- if (OnClickWithoutRender != null)
- {
- await OnClickWithoutRender();
- }
- if (OnClick.HasDelegate)
- {
- await OnClick.InvokeAsync();
- }
- }
-}
diff --git a/src/BootstrapBlazor/Components/Button/ToggleButton.razor.cs b/src/BootstrapBlazor/Components/Button/ToggleButton.razor.cs
index 3400c7f1246..a08cb2f21f5 100644
--- a/src/BootstrapBlazor/Components/Button/ToggleButton.razor.cs
+++ b/src/BootstrapBlazor/Components/Button/ToggleButton.razor.cs
@@ -50,7 +50,10 @@ private async Task OnClickButton()
}
}
- private async Task HandlerClick()
+ ///
+ ///
+ protected override async Task HandlerClick()
{
IsActive = !IsActive;
if (OnClickWithoutRender != null)
diff --git a/src/BootstrapBlazor/Components/Card/Card.razor.cs b/src/BootstrapBlazor/Components/Card/Card.razor.cs
index 3db0a913999..bdd362a3bd5 100644
--- a/src/BootstrapBlazor/Components/Card/Card.razor.cs
+++ b/src/BootstrapBlazor/Components/Card/Card.razor.cs
@@ -128,6 +128,7 @@ public partial class Card
private string? HeaderStyleString => CssBuilder.Default()
.AddStyle("--bs-card-cap-padding-y", HeaderPaddingY)
+ .AddStyleFromAttributes(AdditionalAttributes)
.Build();
///
diff --git a/src/BootstrapBlazor/Components/ContextMenu/ContextMenu.razor b/src/BootstrapBlazor/Components/ContextMenu/ContextMenu.razor
index ab11b13f27e..64d0b0843ae 100644
--- a/src/BootstrapBlazor/Components/ContextMenu/ContextMenu.razor
+++ b/src/BootstrapBlazor/Components/ContextMenu/ContextMenu.razor
@@ -16,7 +16,7 @@
else if (context is ContextMenuItem item)
{
var disabled = GetItemTriggerClick(item);
-
@item.Text
diff --git a/src/BootstrapBlazor/Components/DateTimePicker/DatePickerBody.razor b/src/BootstrapBlazor/Components/DateTimePicker/DatePickerBody.razor
index da506968ab3..8db866aa238 100644
--- a/src/BootstrapBlazor/Components/DateTimePicker/DatePickerBody.razor
+++ b/src/BootstrapBlazor/Components/DateTimePicker/DatePickerBody.razor
@@ -37,10 +37,10 @@
}
-
- @YearString
- @MonthString
- @if (IsDateTimeMode)
+
+ @YearString
+ @MonthString
+ @if (IsDateTimeMode && PickTimeMode == PickTimeMode.Clock)
{
@CurrentTime.ToString(TimeFormat)
}
@@ -80,12 +80,12 @@
else if (IsDisabled(day))
{
- @if(ShowLunar)
+ @if (ShowLunar)
{
@text
@GetLunarText(day)
}
- else if(DayDisabledTemplate != null)
+ else if (DayDisabledTemplate != null)
{
@DayDisabledTemplate(day)
}
@@ -155,7 +155,8 @@
@ChildContent
-
@@ -164,6 +165,18 @@
+ @if (IsDateTimeMode && PickTimeMode == PickTimeMode.Dropdown)
+ {
+
+ @TimePlaceHolder
+
+
- /// 获得/设置 是否显示时刻选择框
- ///
- private bool ShowTimePicker { get; set; }
+ private bool _showClockPicker;
private string? ClassString => CssBuilder.Default("picker-panel")
.AddClass("is-sidebar", ShowSidebar)
@@ -71,7 +68,7 @@ private DateTime StartDate
.Build();
private string? WrapperClassString => CssBuilder.Default("picker-panel-body-main-wrapper")
- .AddClass("is-open", ShowTimePicker)
+ .AddClass("is-open", _showClockPicker)
.Build();
private bool IsDisabled(DateTime day) => day < MinValue || day > MaxValue || IsDisableDay(day);
@@ -394,6 +391,12 @@ public bool AllowNull
[Parameter]
public DayOfWeek FirstDayOfWeek { get; set; } = DayOfWeek.Sunday;
+ ///
+ /// 获得/设置 选择时间方式 默认使用
+ [Parameter]
+ public PickTimeMode PickTimeMode { get; set; } = PickTimeMode.Dropdown;
+
[Inject]
[NotNull]
private ICalendarFestivals? CalendarFestivals { get; set; }
@@ -465,6 +468,10 @@ public bool AllowNull
private bool IsDateTimeMode => ViewMode == DatePickerViewMode.DateTime && CurrentViewMode == DatePickerViewMode.DateTime;
+ private string? HeaderLabelString => CssBuilder.Default("d-flex align-items-center justify-content-center flex-fill")
+ .AddClass("picker-panel-header-bar", ViewMode == DatePickerViewMode.DateTime)
+ .Build();
+
private readonly Dictionary> _monthDisabledDaysCache = [];
///
@@ -590,6 +597,7 @@ private async Task OnValueChanged()
///
private async Task OnClickPrevYear()
{
+ _showTimePicker = false;
CurrentDate = CurrentViewMode == DatePickerViewMode.Year
? GetSafeYearDateTime(CurrentDate, -20)
: GetSafeYearDateTime(CurrentDate, -1);
@@ -609,6 +617,7 @@ private async Task OnClickPrevYear()
///
private async Task OnClickPrevMonth()
{
+ _showTimePicker = false;
CurrentDate = CurrentDate.GetSafeMonthDateTime(-1);
_render = false;
@@ -626,6 +635,7 @@ private async Task OnClickPrevMonth()
///
private async Task OnClickNextYear()
{
+ _showTimePicker = false;
CurrentDate = CurrentViewMode == DatePickerViewMode.Year
? GetSafeYearDateTime(CurrentDate, 20)
: GetSafeYearDateTime(CurrentDate, 1);
@@ -645,6 +655,7 @@ private async Task OnClickNextYear()
///
private async Task OnClickNextMonth()
{
+ _showTimePicker = false;
CurrentDate = CurrentDate.GetSafeMonthDateTime(1);
_render = false;
@@ -690,6 +701,35 @@ private async Task OnTimeChanged(TimeSpan time)
}
}
+ private string? TimePickerClassString => CssBuilder.Default("picker-panel-time")
+ .AddClass("show", _showTimePicker)
+ .Build();
+
+ private bool _showTimePicker;
+
+ private Task OnConfirmTime(TimeSpan time)
+ {
+ _showTimePicker = false;
+ CurrentTime = time;
+ StateHasChanged();
+ return Task.CompletedTask;
+ }
+
+ private Task OnCloseTime()
+ {
+ _showTimePicker = false;
+ StateHasChanged();
+ return Task.CompletedTask;
+ }
+
+ private void OnShowTimePicker()
+ {
+ _showTimePicker = true;
+ StateHasChanged();
+ }
+
+ private bool HasSeconds => TimeFormat.Contains('s');
+
private bool ShouldConfirm => !IsDateTimeMode && (AutoClose || ShowFooter == false);
///
@@ -698,6 +738,7 @@ private async Task OnTimeChanged(TimeSpan time)
///
private async Task SwitchView(DatePickerViewMode view)
{
+ _showTimePicker = false;
if (AllowSwitchModes[ViewMode].Contains(view))
{
CurrentViewMode = view;
@@ -716,12 +757,13 @@ private async Task SwitchView(DatePickerViewMode view)
private void SwitchTimeView()
{
- ShowTimePicker = true;
+ _showClockPicker = true;
}
internal void SwitchDateView()
{
- ShowTimePicker = false;
+ _showClockPicker = false;
+ _showTimePicker = false;
StateHasChanged();
}
@@ -847,7 +889,8 @@ private async Task ClickConfirmButton()
private async Task ClickClearButton()
{
// 关闭 TimerPicker
- ShowTimePicker = false;
+ _showClockPicker = false;
+ _showTimePicker = false;
CurrentDate = DateTime.MinValue;
CurrentTime = TimeSpan.Zero;
@@ -872,7 +915,8 @@ private async Task OnClickSidebarButton(DateTime d)
private void ResetTimePickerPanel()
{
// 关闭 TimerPicker
- ShowTimePicker = false;
+ _showClockPicker = false;
+ _showTimePicker = false;
TimePickerPanel?.Reset();
}
diff --git a/src/BootstrapBlazor/Components/DateTimePicker/DatePickerBody.razor.scss b/src/BootstrapBlazor/Components/DateTimePicker/DatePickerBody.razor.scss
index 46b222956a8..a5aa64fc7d5 100644
--- a/src/BootstrapBlazor/Components/DateTimePicker/DatePickerBody.razor.scss
+++ b/src/BootstrapBlazor/Components/DateTimePicker/DatePickerBody.razor.scss
@@ -1,4 +1,4 @@
-.picker-panel {
+.picker-panel {
--bb-picker-panel-body-width: 320px;
--bb-picker-hover-color: #409eff;
--bb-picker-panel-side-width: 0;
@@ -62,6 +62,12 @@
}
}
+ .picker-panel-header-bar {
+ .picker-panel-header-label {
+ font-size: 14px;
+ }
+ }
+
.picker-panel-header-label {
font-size: 16px;
font-weight: 500;
@@ -85,9 +91,12 @@
table {
table-layout: fixed;
width: 100%;
- font-size: 12px;
user-select: none;
+ .date-table-row {
+ font-size: 12px;
+ }
+
td {
text-align: center;
@@ -313,6 +322,33 @@
}
}
+.picker-panel-time {
+ display: flex;
+ justify-content: space-between;
+ flex-wrap: nowrap;
+ padding: 4px 1rem;
+ border-top: var(--bs-border-width) solid var(--bs-border-color);
+ position: relative;
+
+ .form-control {
+ font-size: 14px;
+ width: 178px;
+ cursor: pointer;
+ padding: 3px 8px;
+ text-align: center;
+ }
+
+ .bb-time-picker {
+ position: absolute;
+ bottom: 2.5rem;
+ right: 1rem;
+ }
+
+ &:not(.show) .bb-time-picker {
+ display: none;
+ }
+}
+
.picker-panel-footer {
border-top: var(--bs-border-width) solid var(--bs-border-color);
padding: 4px;
diff --git a/src/BootstrapBlazor/Components/DateTimePicker/DateTimePicker.razor b/src/BootstrapBlazor/Components/DateTimePicker/DateTimePicker.razor
index 8391db6a7a2..32af2f35364 100644
--- a/src/BootstrapBlazor/Components/DateTimePicker/DateTimePicker.razor
+++ b/src/BootstrapBlazor/Components/DateTimePicker/DateTimePicker.razor
@@ -8,7 +8,9 @@
+ /// 获得/设置 选择时间方式 默认使用
+ [Parameter]
+ public PickTimeMode PickTimeMode { get; set; } = PickTimeMode.Dropdown;
+
///
/// 获得/设置 是否显示快捷侧边栏 默认不显示
///
diff --git a/src/BootstrapBlazor/Components/DateTimePicker/PickTimeMode.cs b/src/BootstrapBlazor/Components/DateTimePicker/PickTimeMode.cs
new file mode 100644
index 00000000000..71cffe69f79
--- /dev/null
+++ b/src/BootstrapBlazor/Components/DateTimePicker/PickTimeMode.cs
@@ -0,0 +1,22 @@
+// 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(argo@live.ca) Website: https://www.blazor.zone
+
+namespace BootstrapBlazor.Components;
+
+///
+///
+public enum PickTimeMode
+{
+ ///
+ /// 使用 Dropdown 下拉方式选择时间
+ ///
+ Dropdown,
+
+ ///
+ /// 使用 Clock 拖拽指针方式选择时间
+ ///
+ Clock
+}
diff --git a/src/BootstrapBlazor/Components/DateTimeRange/DateTimeRange.razor.cs b/src/BootstrapBlazor/Components/DateTimeRange/DateTimeRange.razor.cs
index 7a3e6ed4d4f..70e320f5ff6 100644
--- a/src/BootstrapBlazor/Components/DateTimeRange/DateTimeRange.razor.cs
+++ b/src/BootstrapBlazor/Components/DateTimeRange/DateTimeRange.razor.cs
@@ -322,10 +322,10 @@ protected override void OnParametersSet()
SidebarItems ??=
[
- new() { Text = Localizer["Last7Days"], StartDateTime = DateTime.Today.AddDays(-7), EndDateTime = DateTime.Today.AddDays(1).AddSeconds(-1) },
- new() { Text = Localizer["Last30Days"], StartDateTime = DateTime.Today.AddDays(-30), EndDateTime = DateTime.Today.AddDays(1).AddSeconds(-1) },
- new() { Text = Localizer["ThisMonth"], StartDateTime = DateTime.Today.AddDays(1 - DateTime.Today.Day), EndDateTime = DateTime.Today.AddDays(1 - DateTime.Today.Day).AddMonths(1).AddSeconds(-1) },
- new() { Text = Localizer["LastMonth"], StartDateTime = DateTime.Today.AddDays(1- DateTime.Today.Day).AddMonths(-1), EndDateTime = DateTime.Today.AddDays(1- DateTime.Today.Day).AddSeconds(-1) },
+ new() { Text = Localizer["Last7Days"], StartDateTime = DateTime.Today.AddDays(-7), EndDateTime = DateTime.Today.AddDays(1).AddMilliseconds(-1) },
+ new() { Text = Localizer["Last30Days"], StartDateTime = DateTime.Today.AddDays(-30), EndDateTime = DateTime.Today.AddDays(1).AddMilliseconds(-1) },
+ new() { Text = Localizer["ThisMonth"], StartDateTime = DateTime.Today.AddDays(1 - DateTime.Today.Day), EndDateTime = DateTime.Today.AddDays(1 - DateTime.Today.Day).AddMonths(1).AddMilliseconds(-1) },
+ new() { Text = Localizer["LastMonth"], StartDateTime = DateTime.Today.AddDays(1- DateTime.Today.Day).AddMonths(-1), EndDateTime = DateTime.Today.AddDays(1- DateTime.Today.Day).AddMilliseconds(-1) },
];
ResetBodyValue();
@@ -478,7 +478,7 @@ private async Task UpdateValue(DateTime d)
// 结束时间为空
if (d < SelectedValue.Start)
{
- SelectedValue.End = SelectedValue.Start;
+ SelectedValue.End = SelectedValue.Start.AddDays(1).AddMilliseconds(-1);
SelectedValue.Start = d;
}
else
diff --git a/src/BootstrapBlazor/Components/Download/Download.cs b/src/BootstrapBlazor/Components/Download/Download.cs
index 787a592d944..b6639ac7d56 100644
--- a/src/BootstrapBlazor/Components/Download/Download.cs
+++ b/src/BootstrapBlazor/Components/Download/Download.cs
@@ -3,6 +3,8 @@
// See the LICENSE file in the project root for more information.
// Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
+using System;
+
namespace BootstrapBlazor.Components;
///
@@ -38,13 +40,13 @@ protected virtual async Task DownloadFromStream(DownloadOption option)
throw new InvalidOperationException($"the {nameof(option.FileStream)} is null");
}
-#if NET5_0
- // net 5.0 not support
- await Task.CompletedTask;
-#elif NET6_0_OR_GREATER
+ if (string.IsNullOrEmpty(option.FileName))
+ {
+ throw new InvalidOperationException($"the {nameof(option.FileName)} is null or empty");
+ }
+
using var streamRef = new DotNetStreamReference(option.FileStream);
await InvokeVoidAsync("downloadFileFromStream", option.FileName, streamRef);
-#endif
}
///
@@ -59,6 +61,11 @@ protected virtual async Task DownloadFromUrl(DownloadOption option)
throw new InvalidOperationException($"{nameof(option.Url)} not set");
}
+ if (string.IsNullOrEmpty(option.FileName))
+ {
+ throw new InvalidOperationException($"the {nameof(option.FileName)} is null or empty");
+ }
+
await InvokeVoidAsync("downloadFileFromUrl", option.FileName, option.Url);
}
diff --git a/src/BootstrapBlazor/Components/Dropdown/Dropdown.razor b/src/BootstrapBlazor/Components/Dropdown/Dropdown.razor
index d2b72b8b57f..742bbc4dd3d 100644
--- a/src/BootstrapBlazor/Components/Dropdown/Dropdown.razor
+++ b/src/BootstrapBlazor/Components/Dropdown/Dropdown.razor
@@ -9,7 +9,7 @@
}
+ TriggerClick="ShowSplit" OnClick="OnClickButton" PreventDefault="false" StopPropagation="false">
@if (ButtonTemplate == null)
{
@if (_isAsyncLoading)
diff --git a/src/BootstrapBlazor/Components/Dropdown/Dropdown.razor.cs b/src/BootstrapBlazor/Components/Dropdown/Dropdown.razor.cs
index b2ebb6f141c..a2d3592e62c 100644
--- a/src/BootstrapBlazor/Components/Dropdown/Dropdown.razor.cs
+++ b/src/BootstrapBlazor/Components/Dropdown/Dropdown.razor.cs
@@ -28,7 +28,6 @@ public partial class Dropdown
///
.Build();
///
- /// 获得/设置 颜色 默认 Color.None 无设置
+ /// 获得/设置 颜色 默认 Color.Primary 无设置
///
[Parameter]
- public Color Color { get; set; }
+ public Color Color { get; set; } = Color.Primary;
///
/// 获得/设置 绑定数据集
diff --git a/src/BootstrapBlazor/Components/Dropdown/Dropdown.razor.scss b/src/BootstrapBlazor/Components/Dropdown/Dropdown.razor.scss
index 20a30229440..daa6bf9ac34 100644
--- a/src/BootstrapBlazor/Components/Dropdown/Dropdown.razor.scss
+++ b/src/BootstrapBlazor/Components/Dropdown/Dropdown.razor.scss
@@ -1,3 +1,9 @@
[data-bs-theme='dark'] .dropdown-menu {
--bs-dropdown-bg: #{$bs-dropdown-bg-dark};
}
+
+.dropdown-item {
+ > i + span {
+ margin-inline-start: 0.25rem;
+ }
+}
diff --git a/src/BootstrapBlazor/Components/EditorForm/EditorForm.razor b/src/BootstrapBlazor/Components/EditorForm/EditorForm.razor
index fecb677a7bf..b5998b52ca8 100644
--- a/src/BootstrapBlazor/Components/EditorForm/EditorForm.razor
+++ b/src/BootstrapBlazor/Components/EditorForm/EditorForm.razor
@@ -2,41 +2,43 @@
@typeparam TModel
@inherits BootstrapComponentBase
-
+
@FieldItems?.Invoke(Model)
- @if (ShowUnsetGroupItemsOnTop)
- {
- if (UnsetGroupItems.Any())
+
+ @if (ShowUnsetGroupItemsOnTop)
{
- @RenderUnsetGroupItems
+ if (UnsetGroupItems.Any())
+ {
+ @RenderUnsetGroupItems
+ }
+ @foreach (var g in GroupItems)
+ {
+ @RenderGroupItems(g)
+ }
}
- @foreach (var g in GroupItems)
+ else
{
- @RenderGroupItems(g)
+ @foreach (var g in GroupItems)
+ {
+ @RenderGroupItems(g)
+ }
+ if (UnsetGroupItems.Any())
+ {
+ @RenderUnsetGroupItems
+ }
}
- }
- else
+
+
+ @if (Buttons != null)
{
- @foreach (var g in GroupItems)
- {
- @RenderGroupItems(g)
- }
- if (UnsetGroupItems.Any())
- {
- @RenderUnsetGroupItems
- }
+
}
-
- @if (Buttons != null)
- {
-
- }
@code
diff --git a/src/BootstrapBlazor/Components/EditorForm/EditorForm.razor.cs b/src/BootstrapBlazor/Components/EditorForm/EditorForm.razor.cs
index ba9621f029d..43956eef2db 100644
--- a/src/BootstrapBlazor/Components/EditorForm/EditorForm.razor.cs
+++ b/src/BootstrapBlazor/Components/EditorForm/EditorForm.razor.cs
@@ -11,12 +11,10 @@ namespace BootstrapBlazor.Components;
///
/// 编辑表单基类
///
-#if NET6_0_OR_GREATER
[CascadingTypeParameter(nameof(TModel))]
-#endif
public partial class EditorForm : IShowLabel
{
- private string? ClassString => CssBuilder.Default("bb-editor form-body")
+ private string? ClassString => CssBuilder.Default("bb-editor")
.AddClassFromAttributes(AdditionalAttributes)
.Build();
diff --git a/src/BootstrapBlazor/Components/EditorForm/EditorForm.razor.scss b/src/BootstrapBlazor/Components/EditorForm/EditorForm.razor.scss
index a16410be159..e90496b074b 100644
--- a/src/BootstrapBlazor/Components/EditorForm/EditorForm.razor.scss
+++ b/src/BootstrapBlazor/Components/EditorForm/EditorForm.razor.scss
@@ -1,4 +1,4 @@
-.bb-editor {
+.bb-editor {
position: relative;
.ef-loading {
@@ -9,8 +9,4 @@
bottom: 0;
background-color: var(--bs-body-bg);
}
-
- .bb-editor-footer {
- margin-block-start: 1rem;
- }
}
diff --git a/src/BootstrapBlazor/Components/Input/BootstrapInputGroupLabel.razor.cs b/src/BootstrapBlazor/Components/Input/BootstrapInputGroupLabel.cs
similarity index 71%
rename from src/BootstrapBlazor/Components/Input/BootstrapInputGroupLabel.razor.cs
rename to src/BootstrapBlazor/Components/Input/BootstrapInputGroupLabel.cs
index 8b1cdf0d3bf..b85fe8a7ef5 100644
--- a/src/BootstrapBlazor/Components/Input/BootstrapInputGroupLabel.razor.cs
+++ b/src/BootstrapBlazor/Components/Input/BootstrapInputGroupLabel.cs
@@ -3,12 +3,14 @@
// See the LICENSE file in the project root for more information.
// Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone
+using Microsoft.AspNetCore.Components.Rendering;
+
namespace BootstrapBlazor.Components;
///
/// BootstrapInputGroupLabel 组件
///
-public partial class BootstrapInputGroupLabel
+public sealed class BootstrapInputGroupLabel : DisplayBase
{
private string? ClassString => CssBuilder.Default()
.AddClass("input-group-text", IsInputGroupLabel)
@@ -54,7 +56,7 @@ public partial class BootstrapInputGroupLabel
private bool IsInputGroupLabel => InputGroup != null;
///
- /// OnParametersSet 方法
+ ///
protected override void OnParametersSet()
{
@@ -65,4 +67,26 @@ protected override void OnParametersSet()
DisplayText ??= FieldIdentifier?.GetDisplayName();
}
}
+
+ ///
+ ///
+ ///
+ protected override void BuildRenderTree(RenderTreeBuilder builder)
+ {
+ builder.OpenElement(0, TagName);
+ builder.AddMultipleAttributes(10, AdditionalAttributes);
+ builder.AddAttribute(20, "class", ClassString);
+ builder.AddAttribute(30, "style", StyleString);
+ builder.AddAttribute(40, "required", Required);
+ if (ChildContent != null)
+ {
+ builder.AddContent(50, ChildContent);
+ }
+ else
+ {
+ builder.AddContent(60, DisplayText);
+ }
+ builder.CloseElement();
+ }
}
diff --git a/src/BootstrapBlazor/Components/Input/BootstrapInputGroupLabel.razor b/src/BootstrapBlazor/Components/Input/BootstrapInputGroupLabel.razor
deleted file mode 100644
index c616b00fcd9..00000000000
--- a/src/BootstrapBlazor/Components/Input/BootstrapInputGroupLabel.razor
+++ /dev/null
@@ -1,13 +0,0 @@
-@namespace BootstrapBlazor.Components
-@inherits DisplayBase
-
-
- @if (ChildContent != null)
- {
- @ChildContent
- }
- else
- {
- @DisplayText
- }
-
diff --git a/src/BootstrapBlazor/Components/Label/BootstrapLabel.razor.cs b/src/BootstrapBlazor/Components/Label/BootstrapLabel.razor.cs
index 8221930a009..e0118c6d65e 100644
--- a/src/BootstrapBlazor/Components/Label/BootstrapLabel.razor.cs
+++ b/src/BootstrapBlazor/Components/Label/BootstrapLabel.razor.cs
@@ -40,6 +40,7 @@ public partial class BootstrapLabel
private string? StyleString => CssBuilder.Default()
.AddStyle($"--bb-row-label-width", $"{LabelWidth}px", LabelWidth.HasValue)
+ .AddStyleFromAttributes(AdditionalAttributes)
.Build();
///
diff --git a/src/BootstrapBlazor/Components/Layout/Layout.razor b/src/BootstrapBlazor/Components/Layout/Layout.razor
index bd76cfaa9b6..65fd1443dee 100644
--- a/src/BootstrapBlazor/Components/Layout/Layout.razor
+++ b/src/BootstrapBlazor/Components/Layout/Layout.razor
@@ -5,7 +5,7 @@
@if (_init)
{
- @if (IsAuthenticated)
+ @if (_authenticated)
{
@if (Side == null)
@@ -126,8 +126,8 @@
}
else
{
-
+
@HandlerMain()
}
@@ -135,7 +135,7 @@
RenderFragment RenderTab =>
@
+ EnableErrorLogger="@EnableLogger" ErrorLoggerToastTitle="@ErrorLoggerToastTitle">
;
RenderFragment RenderFooter =>
diff --git a/src/BootstrapBlazor/Components/Layout/Layout.razor.cs b/src/BootstrapBlazor/Components/Layout/Layout.razor.cs
index 477057934e6..32c498f9f52 100644
--- a/src/BootstrapBlazor/Components/Layout/Layout.razor.cs
+++ b/src/BootstrapBlazor/Components/Layout/Layout.razor.cs
@@ -361,6 +361,12 @@ public partial class Layout : IHandlerException, ITabHeader
[Parameter]
public bool ShowTabInHeader { get; set; }
+ ///
+ /// 获得/设置 是否跳过认证逻辑 默认 false
+ ///
+ [Parameter]
+ public bool SkipAuthenticate { get; set; }
+
[Inject]
[NotNull]
private NavigationManager? Navigation { get; set; }
@@ -374,7 +380,7 @@ public partial class Layout : IHandlerException, ITabHeader
///
/// 获得/设置 是否已授权
///
- private bool IsAuthenticated { get; set; }
+ private bool _authenticated;
///
/// 获得 组件样式
@@ -501,15 +507,15 @@ public partial class Layout : IHandlerException, ITabHeader
private IOptionsMonitor? Options { get; set; }
private bool _init;
- private LayoutHeader? _layoutHeader = null;
+ private LayoutHeader? _layoutHeader;
private ITabHeader? TabHeader => ShowTabInHeader ? this : null;
- private bool _enableErrorLogger => EnableErrorLogger ?? Options.CurrentValue.EnableErrorLogger;
+ private bool EnableLogger => EnableErrorLogger ?? Options.CurrentValue.EnableErrorLogger;
- private bool _showToast => ShowErrorLoggerToast ?? Options.CurrentValue.ShowErrorLoggerToast;
+ private bool ShowToast => ShowErrorLoggerToast ?? Options.CurrentValue.ShowErrorLoggerToast;
- private bool _enableILogger => EnableErrorLoggerILogger ?? Options.CurrentValue.EnableErrorLoggerILogger;
+ private bool EnableILogger => EnableErrorLoggerILogger ?? Options.CurrentValue.EnableErrorLoggerILogger;
///
///
+ @_options.ChildContent
+
}
diff --git a/src/BootstrapBlazor/Components/Mask/Mask.razor.cs b/src/BootstrapBlazor/Components/Mask/Mask.razor.cs
index c2d5d0fe0cc..2d41b845588 100644
--- a/src/BootstrapBlazor/Components/Mask/Mask.razor.cs
+++ b/src/BootstrapBlazor/Components/Mask/Mask.razor.cs
@@ -58,4 +58,9 @@ private Task Show(MaskOption? option)
StateHasChanged();
return Task.CompletedTask;
}
+
+ private Task CloseAsync()
+ {
+ return Show(null);
+ }
}
diff --git a/src/BootstrapBlazor/Components/Navbar/Navbar.razor b/src/BootstrapBlazor/Components/Navbar/Navbar.razor
new file mode 100644
index 00000000000..a5258b46909
--- /dev/null
+++ b/src/BootstrapBlazor/Components/Navbar/Navbar.razor
@@ -0,0 +1,8 @@
+@namespace BootstrapBlazor.Components
+@inherits BootstrapComponentBase
+
+
diff --git a/src/BootstrapBlazor/Components/Navbar/Navbar.razor.cs b/src/BootstrapBlazor/Components/Navbar/Navbar.razor.cs
new file mode 100644
index 00000000000..ba60ee368a7
--- /dev/null
+++ b/src/BootstrapBlazor/Components/Navbar/Navbar.razor.cs
@@ -0,0 +1,42 @@
+// 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(argo@live.ca) Website: https://www.blazor.zone
+
+namespace BootstrapBlazor.Components;
+
+///
+/// Navbar 组件
+///
+public partial class Navbar
+{
+ ///
+ /// 获得/设置 组件大小 默认
+ [Parameter]
+ public Size Size { get; set; } = Size.Medium;
+
+ ///
+ /// 获得/设置 背景色样式名称 默认 null 未设置
+ ///
+ [Parameter]
+ public string? BackgroundColorCssClass { get; set; }
+
+ ///
+ /// 获得/设置 子组件模板
+ ///
+ [Parameter]
+ public RenderFragment? ChildContent { get; set; }
+
+ ///
+ /// 获得 组件样式
+ ///
+ private string? ClassString => CssBuilder.Default("navbar")
+ .AddClass($"navbar-expand", Size == Size.None)
+ .AddClass($"navbar-expand-{Size.ToDescriptionString()}", Size != Size.None)
+ .AddClass(BackgroundColorCssClass)
+ .AddClass("bg-body-tertiary", string.IsNullOrEmpty(BackgroundColorCssClass))
+ .AddClassFromAttributes(AdditionalAttributes)
+ .Build();
+}
+
diff --git a/src/BootstrapBlazor/Components/Navbar/Navbar.razor.scss b/src/BootstrapBlazor/Components/Navbar/Navbar.razor.scss
new file mode 100644
index 00000000000..7c3244bef06
--- /dev/null
+++ b/src/BootstrapBlazor/Components/Navbar/Navbar.razor.scss
@@ -0,0 +1,108 @@
+.navbar {
+ --bs-navbar-toggler-focus-width: 1px;
+}
+
+.nav-link:focus-visible {
+ box-shadow: none;
+}
+
+.navbar-nav {
+ --bs-nav-link-padding-x: .5rem;
+ margin-block-start: .5rem;
+}
+
+.navbar-nav:not(:last-child) {
+ margin-block-end: .5rem;
+}
+
+.navbar-expand {
+ .navbar-nav:last-child {
+ margin-block-start: 0;
+ margin-inline-start: .5rem;
+ }
+}
+
+@media (min-width: 576px) {
+ .navbar-expand-sm {
+ .navbar-nav {
+ margin-block-start: 0;
+ margin-block-end: 0;
+ }
+
+ .navbar-nav:last-child {
+ margin-inline-start: .5rem;
+ }
+
+ .navbar-nav:not(:last-child) {
+ margin-inline-end: auto;
+ }
+ }
+}
+
+@media (min-width: 768px) {
+ .navbar-expand-md {
+ .navbar-nav {
+ margin-block-start: 0;
+ margin-block-end: 0;
+ }
+
+ .navbar-nav:last-child {
+ margin-inline-start: .5rem;
+ }
+
+ .navbar-nav:not(:last-child) {
+ margin-inline-end: auto;
+ }
+ }
+}
+
+@media (min-width: 992px) {
+ .navbar-expand-lg {
+ .navbar-nav {
+ margin-block-start: 0;
+ margin-block-end: 0;
+ }
+
+ .navbar-nav:last-child {
+ margin-inline-start: .5rem;
+ }
+
+ .navbar-nav:not(:last-child) {
+ margin-inline-end: auto;
+ }
+ }
+}
+
+@media (min-width: 1200px) {
+ .navbar-expand-xl {
+ .navbar-nav {
+ margin-block-start: 0;
+ margin-block-end: 0;
+ }
+
+ .navbar-nav:last-child {
+ margin-inline-start: .5rem;
+ }
+
+ .navbar-nav:not(:last-child) {
+ margin-inline-end: auto;
+ }
+ }
+}
+
+@media (min-width: 1400px) {
+ .navbar-expand-xxl {
+ .navbar-nav {
+ margin-block-start: 0;
+ margin-block-end: 0;
+ }
+
+ .navbar-nav:last-child {
+ margin-inline-start: .5rem;
+ }
+
+ .navbar-nav:not(:last-child) {
+ margin-inline-end: auto;
+ }
+ }
+}
diff --git a/src/BootstrapBlazor/Components/Navbar/NavbarBrand.razor b/src/BootstrapBlazor/Components/Navbar/NavbarBrand.razor
new file mode 100644
index 00000000000..529836ec984
--- /dev/null
+++ b/src/BootstrapBlazor/Components/Navbar/NavbarBrand.razor
@@ -0,0 +1,6 @@
+@namespace BootstrapBlazor.Components
+@inherits BootstrapComponentBase
+
+
+ @ChildContent
+
diff --git a/src/BootstrapBlazor/Components/Navbar/NavbarBrand.razor.cs b/src/BootstrapBlazor/Components/Navbar/NavbarBrand.razor.cs
new file mode 100644
index 00000000000..8428b8f2242
--- /dev/null
+++ b/src/BootstrapBlazor/Components/Navbar/NavbarBrand.razor.cs
@@ -0,0 +1,22 @@
+// 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(argo@live.ca) Website: https://www.blazor.zone
+
+namespace BootstrapBlazor.Components;
+
+///
+/// NavBrand 组件
+///
+public partial class NavbarBrand
+{
+ ///
+ /// 获得/设置 子组件模板
+ ///
+ [Parameter]
+ public RenderFragment? ChildContent { get; set; }
+
+ private string? ClassString => CssBuilder.Default("navbar-brand")
+ .AddClassFromAttributes(AdditionalAttributes)
+ .Build();
+}
diff --git a/src/BootstrapBlazor/Components/Navbar/NavbarCollapse.razor b/src/BootstrapBlazor/Components/Navbar/NavbarCollapse.razor
new file mode 100644
index 00000000000..deed7046e66
--- /dev/null
+++ b/src/BootstrapBlazor/Components/Navbar/NavbarCollapse.razor
@@ -0,0 +1,6 @@
+@namespace BootstrapBlazor.Components
+@inherits IdComponentBase
+
+
+ @ChildContent
+
diff --git a/src/BootstrapBlazor/Components/Navbar/NavbarCollapse.razor.cs b/src/BootstrapBlazor/Components/Navbar/NavbarCollapse.razor.cs
new file mode 100644
index 00000000000..09d37d38d3e
--- /dev/null
+++ b/src/BootstrapBlazor/Components/Navbar/NavbarCollapse.razor.cs
@@ -0,0 +1,22 @@
+// 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(argo@live.ca) Website: https://www.blazor.zone
+
+namespace BootstrapBlazor.Components;
+
+///
+/// NavbarCollapse 组件用于在导航栏中适配响应式布局
+///
+public partial class NavbarCollapse
+{
+ ///
+ /// 获得/设置 子组件模板
+ ///
+ [Parameter]
+ public RenderFragment? ChildContent { get; set; }
+
+ private string? ClassString => CssBuilder.Default("collapse navbar-collapse")
+ .AddClassFromAttributes(AdditionalAttributes)
+ .Build();
+}
diff --git a/src/BootstrapBlazor/Components/Navbar/NavbarDropdown.razor b/src/BootstrapBlazor/Components/Navbar/NavbarDropdown.razor
new file mode 100644
index 00000000000..eaac691d4bc
--- /dev/null
+++ b/src/BootstrapBlazor/Components/Navbar/NavbarDropdown.razor
@@ -0,0 +1,11 @@
+@namespace BootstrapBlazor.Components
+@inherits BootstrapComponentBase
+
+
+
+ @Text
+
+
+ @ChildContent
+
+
diff --git a/src/BootstrapBlazor/Components/Navbar/NavbarDropdown.razor.cs b/src/BootstrapBlazor/Components/Navbar/NavbarDropdown.razor.cs
new file mode 100644
index 00000000000..70f6880167d
--- /dev/null
+++ b/src/BootstrapBlazor/Components/Navbar/NavbarDropdown.razor.cs
@@ -0,0 +1,48 @@
+// 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(argo@live.ca) Website: https://www.blazor.zone
+
+namespace BootstrapBlazor.Components;
+
+///
+/// NavbarDropdown 组件用于在导航栏中创建下拉菜单
+///
+public partial class NavbarDropdown
+{
+ ///
+ /// 获得/设置 子组件模板
+ ///
+ [Parameter]
+ public RenderFragment? ChildContent { get; set; }
+
+ ///
+ /// 获得/设置 Dropdown 菜单标题文本
+ ///
+ [Parameter]
+ public string? Text { get; set; }
+
+ ///
+ /// 获得/设置 获取菜单对齐方式 默认 none 未设置
+ ///
+ [Parameter]
+ public Alignment MenuAlignment { get; set; }
+
+ ///
+ /// 获得/设置 下拉选项方向 默认 Dropdown 向下
+ ///
+ [Parameter]
+ public Direction Direction { get; set; }
+
+ private string? ClassString => CssBuilder.Default("nav-item")
+ .AddClass(Direction.ToDescriptionString())
+ .AddClassFromAttributes(AdditionalAttributes)
+ .Build();
+
+ ///
+ /// 菜单对齐方式样式
+ ///
+ private string? MenuAlignmentClass => CssBuilder.Default("dropdown-menu shadow")
+ .AddClass($"dropdown-menu-{MenuAlignment.ToDescriptionString()}", MenuAlignment == Alignment.Right)
+ .Build();
+}
diff --git a/src/BootstrapBlazor/Components/Navbar/NavbarDropdownDivider.razor b/src/BootstrapBlazor/Components/Navbar/NavbarDropdownDivider.razor
new file mode 100644
index 00000000000..a8bc1334f34
--- /dev/null
+++ b/src/BootstrapBlazor/Components/Navbar/NavbarDropdownDivider.razor
@@ -0,0 +1,4 @@
+@namespace BootstrapBlazor.Components
+@inherits BootstrapComponentBase
+
+
+
+ @ChildContent
+
+
diff --git a/src/BootstrapBlazor/Components/Navbar/NavbarDropdownItem.razor.cs b/src/BootstrapBlazor/Components/Navbar/NavbarDropdownItem.razor.cs
new file mode 100644
index 00000000000..61eb0944fac
--- /dev/null
+++ b/src/BootstrapBlazor/Components/Navbar/NavbarDropdownItem.razor.cs
@@ -0,0 +1,30 @@
+// 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(argo@live.ca) Website: https://www.blazor.zone
+
+namespace BootstrapBlazor.Components;
+
+///
+/// NavbarDropdownItem 组件用于在导航栏下拉菜单中创建菜单项
+///
+public partial class NavbarDropdownItem
+{
+ ///
+ /// 获得/设置 子组件模板
+ ///
+ [Parameter]
+ public RenderFragment? ChildContent { get; set; }
+
+ ///
+ /// 获得/设置 菜单项文本
+ ///
+ [Parameter]
+ public string? Url { get; set; }
+
+ ///
+ /// 获得/设置 A 标签 target 参数 默认 null
+ ///
+ [Parameter]
+ public string? Target { get; set; }
+}
diff --git a/src/BootstrapBlazor/Components/Navbar/NavbarGroup.razor b/src/BootstrapBlazor/Components/Navbar/NavbarGroup.razor
new file mode 100644
index 00000000000..470a443dc9e
--- /dev/null
+++ b/src/BootstrapBlazor/Components/Navbar/NavbarGroup.razor
@@ -0,0 +1,6 @@
+@namespace BootstrapBlazor.Components
+@inherits BootstrapComponentBase
+
+
+ @ChildContent
+
diff --git a/src/BootstrapBlazor/Components/Navbar/NavbarGroup.razor.cs b/src/BootstrapBlazor/Components/Navbar/NavbarGroup.razor.cs
new file mode 100644
index 00000000000..469a497b427
--- /dev/null
+++ b/src/BootstrapBlazor/Components/Navbar/NavbarGroup.razor.cs
@@ -0,0 +1,50 @@
+// 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(argo@live.ca) Website: https://www.blazor.zone
+
+namespace BootstrapBlazor.Components;
+
+///
+/// NavbarGroup 组件用于在导航栏中分组
+///
+public partial class NavbarGroup
+{
+ ///
+ /// 获得/设置 子组件模板
+ ///
+ [Parameter]
+ public RenderFragment? ChildContent { get; set; }
+
+ ///
+ /// 获得/设置 是否启用滚动
+ ///
+ [Parameter]
+ public bool IsScrolling { get; set; }
+
+ ///
+ /// 获得/设置 高度值 默认 200px;
+ ///
+ [Parameter]
+ public string? Height { get; set; }
+
+ private string? ClassString => CssBuilder.Default("navbar-nav")
+ .AddClass("navbar-nav-scroll", IsScrolling)
+ .AddClassFromAttributes(AdditionalAttributes)
+ .Build();
+
+ private string? StyleString => CssBuilder.Default()
+ .AddStyle("--bs-scroll-height", Height, IsScrolling)
+ .AddStyleFromAttributes(AdditionalAttributes)
+ .Build();
+
+ ///
+ ///
+ protected override void OnParametersSet()
+ {
+ base.OnParametersSet();
+
+ Height ??= "200px";
+ }
+}
diff --git a/src/BootstrapBlazor/Components/Navbar/NavbarItem.razor b/src/BootstrapBlazor/Components/Navbar/NavbarItem.razor
new file mode 100644
index 00000000000..529836ec984
--- /dev/null
+++ b/src/BootstrapBlazor/Components/Navbar/NavbarItem.razor
@@ -0,0 +1,6 @@
+@namespace BootstrapBlazor.Components
+@inherits BootstrapComponentBase
+
+
+ @ChildContent
+
diff --git a/src/BootstrapBlazor/Components/Navbar/NavbarItem.razor.cs b/src/BootstrapBlazor/Components/Navbar/NavbarItem.razor.cs
new file mode 100644
index 00000000000..102f34842e4
--- /dev/null
+++ b/src/BootstrapBlazor/Components/Navbar/NavbarItem.razor.cs
@@ -0,0 +1,22 @@
+// 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(argo@live.ca) Website: https://www.blazor.zone
+
+namespace BootstrapBlazor.Components;
+
+///
+/// NavbarItem 组件用于在导航栏中添加子组件
+///
+public partial class NavbarItem
+{
+ ///
+ /// 获得/设置 子组件模板
+ ///
+ [Parameter]
+ public RenderFragment? ChildContent { get; set; }
+
+ private string? ClassString => CssBuilder.Default("navbar-item")
+ .AddClassFromAttributes(AdditionalAttributes)
+ .Build();
+}
diff --git a/src/BootstrapBlazor/Components/Navbar/NavbarLink.razor b/src/BootstrapBlazor/Components/Navbar/NavbarLink.razor
new file mode 100644
index 00000000000..5e161dc1e62
--- /dev/null
+++ b/src/BootstrapBlazor/Components/Navbar/NavbarLink.razor
@@ -0,0 +1,24 @@
+@namespace BootstrapBlazor.Components
+@inherits ButtonBase
+
+
diff --git a/src/BootstrapBlazor/Components/Navbar/NavbarLink.razor.cs b/src/BootstrapBlazor/Components/Navbar/NavbarLink.razor.cs
new file mode 100644
index 00000000000..ac5415f82d7
--- /dev/null
+++ b/src/BootstrapBlazor/Components/Navbar/NavbarLink.razor.cs
@@ -0,0 +1,59 @@
+// 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(argo@live.ca) Website: https://www.blazor.zone
+
+namespace BootstrapBlazor.Components;
+
+///
+/// NavbarLink 组件用于在导航栏中添加链接
+///
+public partial class NavbarLink
+{
+ ///
+ /// 获得/设置 Url 默认为 #
+ ///
+ [Parameter]
+ public string? Url { get; set; }
+
+ ///
+ /// 获得/设置 A 标签 target 参数 默认 null
+ ///
+ [Parameter]
+ public string? Target { get; set; }
+
+ ///
+ /// 获得/设置 显示图片地址 默认为 null
+ ///
+ [Parameter]
+ public string? ImageUrl { get; set; }
+
+ ///
+ /// The css class of img element default value null
+ ///
+ [Parameter]
+ public string? ImageCss { get; set; }
+
+ private string? ClassString => CssBuilder.Default("nav-link")
+ .AddClass("disabled", IsDisabled)
+ .AddClassFromAttributes(AdditionalAttributes)
+ .Build();
+
+ private async Task OnClickButton()
+ {
+ if (IsAsync)
+ {
+ IsAsyncLoading = true;
+ IsDisabled = true;
+ }
+
+ await HandlerClick();
+
+ // 恢复按钮
+ if (IsAsync)
+ {
+ IsDisabled = IsKeepDisabled;
+ IsAsyncLoading = false;
+ }
+ }
+}
diff --git a/src/BootstrapBlazor/Components/Navbar/NavbarToggleButton.razor b/src/BootstrapBlazor/Components/Navbar/NavbarToggleButton.razor
new file mode 100644
index 00000000000..c3b115ffbde
--- /dev/null
+++ b/src/BootstrapBlazor/Components/Navbar/NavbarToggleButton.razor
@@ -0,0 +1,14 @@
+@namespace BootstrapBlazor.Components
+@inherits BootstrapComponentBase
+
+
diff --git a/src/BootstrapBlazor/Components/Navbar/NavbarToggleButton.razor.cs b/src/BootstrapBlazor/Components/Navbar/NavbarToggleButton.razor.cs
new file mode 100644
index 00000000000..155ee401c80
--- /dev/null
+++ b/src/BootstrapBlazor/Components/Navbar/NavbarToggleButton.razor.cs
@@ -0,0 +1,28 @@
+// 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(argo@live.ca) Website: https://www.blazor.zone
+
+namespace BootstrapBlazor.Components;
+
+///
+/// NavbarToggleButton 组件
+///
+public partial class NavbarToggleButton
+{
+ ///
+ /// 获得/设置 联动组件选择器 默认 null
+ ///
+ [Parameter]
+ public string? Target { get; set; }
+
+ ///
+ /// 获得/设置 子组件模板
+ ///
+ [Parameter]
+ public RenderFragment? ChildContent { get; set; }
+
+ private string? ClassString => CssBuilder.Default("navbar-toggler")
+ .AddClassFromAttributes(AdditionalAttributes)
+ .Build();
+}
diff --git a/src/BootstrapBlazor/Components/Popover/Popover.razor b/src/BootstrapBlazor/Components/Popover/Popover.razor
index b2751275abc..318ac5215ef 100644
--- a/src/BootstrapBlazor/Components/Popover/Popover.razor
+++ b/src/BootstrapBlazor/Components/Popover/Popover.razor
@@ -4,7 +4,8 @@
diff --git a/src/BootstrapBlazor/Components/Popover/Popover.razor.cs b/src/BootstrapBlazor/Components/Popover/Popover.razor.cs
index c30c51a9328..32cdc4d947c 100644
--- a/src/BootstrapBlazor/Components/Popover/Popover.razor.cs
+++ b/src/BootstrapBlazor/Components/Popover/Popover.razor.cs
@@ -30,10 +30,11 @@ public partial class Popover
private string? _lastContent;
- ///
- ///
- protected override string? CustomClassString => CssBuilder.Default(CustomClass)
+ private string? ClassString => CssBuilder.Default("bb-popover")
+ .AddClassFromAttributes(AdditionalAttributes)
+ .Build();
+
+ private string? CustomClassString => CssBuilder.Default(CustomClass)
.AddClass("shadow", ShowShadow)
.Build();
diff --git a/src/BootstrapBlazor/Components/Popover/Popover.razor.js b/src/BootstrapBlazor/Components/Popover/Popover.razor.js
index 6dd1bfd2339..5994ab60cbd 100644
--- a/src/BootstrapBlazor/Components/Popover/Popover.razor.js
+++ b/src/BootstrapBlazor/Components/Popover/Popover.razor.js
@@ -9,6 +9,42 @@ export function init(id, options) {
}
}
+export function show(id, delay) {
+ const el = document.getElementById(id)
+ if (el) {
+ const pop = bootstrap.Popover.getInstance(el);
+ if (pop) {
+ setTimeout(() => {
+ pop.show();
+ }, delay || 0);
+ }
+ }
+}
+
+export function hide(id, delay) {
+ const el = document.getElementById(id)
+ if (el) {
+ const pop = bootstrap.Popover.getInstance(el);
+ if (pop) {
+ setTimeout(() => {
+ pop.hide();
+ }, delay || 0);
+ }
+ }
+}
+
+export function toggle(id, delay) {
+ const el = document.getElementById(id)
+ if (el) {
+ const pop = bootstrap.Popover.getInstance(el);
+ if (pop) {
+ setTimeout(() => {
+ pop.toggle();
+ }, delay || 0);
+ }
+ }
+}
+
export function dispose(id) {
const el = document.getElementById(id)
if (el) {
diff --git a/src/BootstrapBlazor/Components/Reconnector/ReconnectorContent.razor b/src/BootstrapBlazor/Components/Reconnector/ReconnectorContent.razor
index 12b9dc62504..bbec66f16c0 100644
--- a/src/BootstrapBlazor/Components/Reconnector/ReconnectorContent.razor
+++ b/src/BootstrapBlazor/Components/Reconnector/ReconnectorContent.razor
@@ -2,7 +2,7 @@
@inherits BootstrapModuleComponentBase
@attribute [BootstrapModuleAutoLoader("Reconnector/ReconnectorContent.razor.js", AutoInvokeDispose = false)]
-
+
@if (ReconnectingTemplate != null)
{
diff --git a/src/BootstrapBlazor/Components/Select/MultiSelect.razor b/src/BootstrapBlazor/Components/Select/MultiSelect.razor
index 7b3edeb05e6..07d68f2a590 100644
--- a/src/BootstrapBlazor/Components/Select/MultiSelect.razor
+++ b/src/BootstrapBlazor/Components/Select/MultiSelect.razor
@@ -67,9 +67,9 @@
diff --git a/src/BootstrapBlazor/Components/Select/SelectTree.razor b/src/BootstrapBlazor/Components/Select/SelectTree.razor
index b5582d0aab4..b7649e13151 100644
--- a/src/BootstrapBlazor/Components/Select/SelectTree.razor
+++ b/src/BootstrapBlazor/Components/Select/SelectTree.razor
@@ -15,12 +15,12 @@
}
else
{
-
+
}
-
-@code {
-
-}
diff --git a/src/BootstrapBlazor/Components/Toolbar/Toolbar.razor b/src/BootstrapBlazor/Components/Toolbar/Toolbar.razor
index 0f10c7c9c89..cc675fd80fe 100644
--- a/src/BootstrapBlazor/Components/Toolbar/Toolbar.razor
+++ b/src/BootstrapBlazor/Components/Toolbar/Toolbar.razor
@@ -2,7 +2,5 @@
@inherits IdComponentBase
-
- @ChildContent
-
+ @ChildContent
diff --git a/src/BootstrapBlazor/Components/Toolbar/Toolbar.razor.cs b/src/BootstrapBlazor/Components/Toolbar/Toolbar.razor.cs
index ace5911447f..fdac101cc0b 100644
--- a/src/BootstrapBlazor/Components/Toolbar/Toolbar.razor.cs
+++ b/src/BootstrapBlazor/Components/Toolbar/Toolbar.razor.cs
@@ -30,16 +30,4 @@ public partial class Toolbar
.AddStyle("flex-wrap", "wrap", IsWrap)
.AddStyleFromAttributes(AdditionalAttributes)
.Build();
-
- private readonly List _components = [];
-
- ///
- /// 添加按钮到工具栏方法
- ///
- public void Add(ComponentBase component) => _components.Add(component);
-
- ///
- /// 移除按钮到工具栏方法
- ///
- public void Remove(ComponentBase component) => _components.Remove(component);
}
diff --git a/src/BootstrapBlazor/Components/Toolbar/ToolbarButtonGroup.razor b/src/BootstrapBlazor/Components/Toolbar/ToolbarButtonGroup.razor
index aaba15b99e2..e1d11d6a5c2 100644
--- a/src/BootstrapBlazor/Components/Toolbar/ToolbarButtonGroup.razor
+++ b/src/BootstrapBlazor/Components/Toolbar/ToolbarButtonGroup.razor
@@ -1,5 +1,6 @@
@namespace BootstrapBlazor.Components
+@inherits BootstrapComponentBase
-