Merge branch 'master' into feat-net10

# Conflicts:
#	src/components/BootstrapBlazor.CherryMarkdown/BootstrapBlazor.CherryMarkdown.csproj
#	src/components/BootstrapBlazor.Markdown/BootstrapBlazor.Markdown.csproj
#	src/components/BootstrapBlazor.Region/BootstrapBlazor.Region.csproj
#	src/components/BootstrapBlazor.SummerNote/BootstrapBlazor.SummerNote.csproj
#	src/components/BootstrapBlazor.Vditor/BootstrapBlazor.Vditor.csproj
#	test/UnitTestEditor/UnitTestEditor.csproj
#	test/UnitTestHoliday/UnitTestHoliday.csproj
#	test/UnitTestOpcDa/UnitTestOpcDa.csproj
#	test/UnitTestOpcUa/UnitTestOpcUa.csproj
#	test/UnitTestRegion/UnitTestRegion.csproj
#	test/UnitTestSvgIcon/UnitTestSvgIcon.csproj
#	tools/BootstrapBlazor.CssBundler/BootstrapBlazor.CssBundler.csproj

Author: ArgoZhang

BootstrapBlazor.Extensions.slnx

@@ -103,9 +103,6 @@
     <File Path="src/readme.md" />
     <File Path="src/SourceLink.targets" />
   </Folder>
-  <Folder Name="/src/tools/">
-    <Project Path="src/tools/BootstrapBlazor.CssBundler/BootstrapBlazor.CssBundler.csproj" />
-  </Folder>
   <Folder Name="/test/">
     <Project Path="test/UnitTestEditor/UnitTestEditor.csproj" />
     <Project Path="test/UnitTestHoliday/UnitTestHoliday.csproj" />
@@ -114,4 +111,10 @@
     <Project Path="test/UnitTestRegion/UnitTestRegion.csproj" Id="37e8696e-3ae5-468f-b6d9-0a8eb4e81876" />
     <Project Path="test/UnitTestSvgIcon/UnitTestSvgIcon.csproj" />
   </Folder>
+  <Folder Name="/test/props/">
+    <File Path="test/Directory.Build.props" />
+  </Folder>
+  <Folder Name="/tools/">
+    <Project Path="tools/BootstrapBlazor.CssBundler/BootstrapBlazor.CssBundler.csproj" />
+  </Folder>
 </Solution>

exclusion.dic

@@ -102,3 +102,4 @@ scrlang
 Validata
 Validatable
 Totp
+Vditor

src/components/BootstrapBlazor.CherryMarkdown/Components/CherryMarkdown/CherryMarkdown.razor

@@ -1,5 +1,9 @@
-@namespace BootstrapBlazor.Components
-@inherits BootstrapModuleComponentBase
+@namespace BootstrapBlazor.Components
+@inherits ValidateBase<string>
 @attribute [JSModuleAutoLoader("./_content/BootstrapBlazor.CherryMarkdown/Components/CherryMarkdown/CherryMarkdown.razor.js", JSObjectReference = true)]
 
-<div @attributes="@AdditionalAttributes" id="@Id"></div>
+@if (IsShowLabel)
+{
+    <BootstrapLabel required="@Required" for="@Id" ShowLabelTooltip="ShowLabelTooltip" Value="@DisplayText" />
+}
+<div @attributes="@AdditionalAttributes" id="@Id" class="@ClassString"></div>

src/components/BootstrapBlazor.CherryMarkdown/Components/CherryMarkdown/CherryMarkdown.razor.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Argo Zhang (argo@163.com). All rights reserved.
+// Copyright (c) Argo Zhang (argo@163.com). All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 // Website: https://www.blazor.zone or https://argozhang.github.io/
 
@@ -31,17 +31,6 @@ public partial class CherryMarkdown
     public bool IsSupportMath { get; set; } = true;
 
     private string? _lastValue;
-    /// <summary>
-    /// 获得/设置 组件值
-    /// </summary>
-    [Parameter]
-    public string? Value { get; set; }
-
-    /// <summary>
-    /// 获得/设置 组件值回调
-    /// </summary>
-    [Parameter]
-    public EventCallback<string?> ValueChanged { get; set; }
 
     /// <summary>
     /// 获得/设置 组件 Html 代码
@@ -73,6 +62,11 @@ public partial class CherryMarkdown
     [Parameter]
     public string? Language { get; set; }
 
+    private string? ClassString => CssBuilder.Default("bb-cherry-markdown")
+        .AddClass(CssClass)
+        .AddClass(ValidCss)
+        .Build();
+
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
@@ -112,9 +106,15 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
     /// <inheritdoc/>
     /// </summary>
     /// <returns></returns>
-    protected override Task InvokeInitAsync() => InvokeVoidAsync("init", Id, Interop,
-        new { Value, IsSupportMath, IsViewer, Locale = Language, Editor = EditorSettings ?? new(), Toolbars = ToolbarSettings ?? new() },
-        nameof(Upload));
+    protected override Task InvokeInitAsync() => InvokeVoidAsync("init", Id, Interop, new
+    {
+        Value,
+        IsSupportMath,
+        IsViewer,
+        Locale = Language,
+        Editor = EditorSettings ?? new(),
+        Toolbars = ToolbarSettings ?? new()
+    }, nameof(Upload));
 
     /// <summary>
     /// 文件上传回调

src/components/BootstrapBlazor.CherryMarkdown/Components/CherryMarkdown/CherryMarkdown.razor.js

@@ -1,4 +1,4 @@
-import '../../js/cherry-markdown.core.js'
+import '../../js/cherry-markdown.core.js'
 import { addLink, addScript } from '../../../BootstrapBlazor/modules/utility.js'
 import Data from '../../../BootstrapBlazor/modules/data.js'
 
@@ -8,7 +8,7 @@ export async function init(id, invoke, options, callback) {
         return;
     }
 
-    await addLink('./_content/BootstrapBlazor.CherryMarkdown/css/cherry-markdown.min.css')
+    await addLink('./_content/BootstrapBlazor.CherryMarkdown/css/cherry-markdown.css')
     if (options.isSupportMath) {
         await addScript('./_content/BootstrapBlazor.CherryMarkdown/js/katex.min.js')
         await addLink('./_content/BootstrapBlazor.CherryMarkdown/css/katex.min.css')
@@ -42,7 +42,7 @@ export async function init(id, invoke, options, callback) {
 
     options.editor = {
         theme: 'Default',
-        height: '100%',
+        height: "200px",
         defaultModel: 'edit&preview',
         convertWhenPaste: true,
         ...options.editor

src/components/BootstrapBlazor.CherryMarkdown/wwwroot/css/cherry-markdown.css

@@ -0,0 +1,18 @@
+@import url('cherry-markdown.min.css');
+
+.bb-cherry-markdown {
+}
+
+    .bb-cherry-markdown.is-valid {
+        border: 1px solid var(--bs-success);
+    }
+
+    .bb-cherry-markdown.is-invalid {
+        border: 1px solid var(--bs-danger);
+    }
+
+    .bb-cherry-markdown .cherry {
+        border: 1px solid var(--bs-border-color);
+        border-radius: var(--bs-border-radius);
+        overflow: hidden;
+    }