Merge branch 'master' into feat-mermaid-binding

Author: ArgoZhang

src/components/BootstrapBlazor.DockView/BootstrapBlazor.DockView.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>9.1.5</Version>
+    <Version>9.1.6</Version>
   </PropertyGroup>
 
   <PropertyGroup>

src/components/BootstrapBlazor.DockView/Components/DockViewConfig.cs

@@ -89,6 +89,11 @@ class DockViewConfig
     [JsonConverter(typeof(DockViewComponentConverter))]
     public List<DockViewComponentBase> Contents { get; set; } = [];
 
+    /// <summary>
+    /// 获得/设置 组件主题 默认 null 未设置
+    /// </summary>
+    public string? Theme { get; set; }
+
     /// <summary>
     /// 获得/设置 布局配置 默认 null 未设置
     /// </summary>

src/components/BootstrapBlazor.DockView/Components/DockViewV2.razor.cs

@@ -140,7 +140,6 @@ public partial class DockViewV2
     private IConfiguration? Configuration { get; set; }
 
     private string? ClassString => CssBuilder.Default("bb-dockview")
-        .AddClass(Theme.ToDescriptionString())
         .AddClassFromAttributes(AdditionalAttributes)
         .Build();
 
@@ -193,6 +192,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
         ShowMaximize = ShowMaximize,
         Renderer = Renderer,
         LayoutConfig = LayoutConfig,
+        Theme = Theme.ToDescriptionString(),
         InitializedCallback = nameof(InitializedCallbackAsync),
         PanelVisibleChangedCallback = nameof(PanelVisibleChangedCallbackAsync),
         LockChangedCallback = nameof(LockChangedCallbackAsync),

src/components/BootstrapBlazor.DockView/wwwroot/js/dockview-utils.js

@@ -6,17 +6,14 @@ import { getConfig, reloadFromConfig, loadPanelsFromLocalstorage, saveConfig } f
 import './dockview-extensions.js'
 
 const cerateDockview = (el, options) => {
-    // options.renderer = 'always'
-    // options.renderer = 'onlyWhenVisible'
     const template = el.querySelector('template');
     const dockview = new DockviewComponent(el, {
         parentElement: el,
-        theme: options.theme || {
-            name: "light",
-            className: "dockview-theme-light",
-            // gap: 3,
-            dndOverlayMounting: 'absolute', // 'absolute' | 'relative'
-            dndPanelOverlay: 'group', // 'content' | 'group'
+        theme: {
+            name: "bb-dockview",
+            className: options.theme || "dockview-theme-light",
+            dndOverlayMounting: 'absolute',
+            dndPanelOverlay: 'group'
         },
         disableTabsOverflowList: true,
         createComponent: option => new DockviewPanelContent(option)