Merge branch 'master' into feat-univerSheet

Author: ArgoZhang

.github/workflows/issue-check-inactive.yml

@@ -0,0 +1,26 @@
+name: Issue Check Inactive
+
+on:
+  schedule:
+    - cron: "0 0 */15 * *"
+
+permissions:
+  contents: read
+
+jobs:
+  issue-check-inactive:
+    permissions:
+      issues: write
+    runs-on: ubuntu-latest
+    steps:
+      - name: check-inactive
+        uses: actions-cool/issues-helper@v3
+        with:
+          actions: 'check-inactive'
+          token: ${{ secrets.GITHUB_TOKEN }}
+          inactive-label: 'inactive'
+          inactive-day: 3
+          body: |
+            Since the issue was labeled with `invalid`, but no response in 3 days. This issue will be closed. If you have any questions, you can comment and reply.
+
+            由于该 issue 被标记为不合规工程，却 3 天未收到回应。现关闭 issue，若有任何问题，可评论回复。

.github/workflows/issue-close-required.yml

@@ -0,0 +1,26 @@
+name: Issue Close Require
+
+on:
+  schedule:
+    - cron: "0 0 * * *"
+
+permissions:
+  contents: read
+
+jobs:
+  issue-close-require:
+    permissions:
+      issues: write
+    runs-on: ubuntu-latest
+    steps:
+      - name: needs repro project
+        uses: actions-cool/issues-helper@v3
+        with:
+          actions: 'close-issues'
+          token: ${{ secrets.GITHUB_TOKEN }}
+          labels: 'need-repro-project'
+          inactive-day: 3
+          body: |
+            Since the issue was labeled with `need-repro-project`, but no response in 3 days. This issue will be closed. If you have any questions, you can comment and reply.
+
+            由于该 issue 被标记为需要复现工程，却 3 天未收到回应。现关闭 issue，若有任何问题，可评论回复。

src/components/BootstrapBlazor.BootstrapIcon/BootstrapBlazor.BootstrapIcon.csproj

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

src/components/BootstrapBlazor.BootstrapIcon/wwwroot/css/bs.css

@@ -54,3 +54,7 @@
         transform: rotate(360deg);
     }
 }
+
+.bi-arrows-fullscreen::before {
+    transform: scale(0.8);
+}

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

@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
+<Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>9.1.2</Version>
+    <Version>9.1.8</Version>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BootstrapBlazor" Version="$(BBVersion)" />
+    <PackageReference Include="BootstrapBlazor" Version="9.4.12" />
   </ItemGroup>
 
   <ItemGroup>

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

@@ -10,15 +10,13 @@ namespace BootstrapBlazor.Components;
 /// <summary>
 /// DockViewV2 组件
 /// </summary>
-public partial class DockViewV2
+public partial class DockViewV2 : IDisposable
 {
     /// <summary>
     /// 获得/设置 DockView 名称 默认 null 用于本地存储识别
     /// </summary>
     [Parameter]
-#if NET6_0_OR_GREATER
     [EditorRequired]
-#endif
     [NotNull]
     public string? Name { get; set; }
 
@@ -139,15 +137,18 @@ public partial class DockViewV2
     [NotNull]
     private IConfiguration? Configuration { get; set; }
 
+    [Inject]
+    [NotNull]
+    private IThemeProvider? ThemeProviderService { get; set; }
+
     private string? ClassString => CssBuilder.Default("bb-dockview")
-        .AddClass(Theme.ToDescriptionString())
         .AddClassFromAttributes(AdditionalAttributes)
         .Build();
 
     private readonly List<DockViewComponentBase> _components = [];
 
     [NotNull]
-    private DockViewOptions? _options = default!;
+    private DockViewOptions? _options = null;
 
     /// <summary>
     /// <inheritdoc/>
@@ -158,6 +159,8 @@ protected override void OnInitialized()
 
         var section = Configuration.GetSection(nameof(DockViewOptions));
         _options = section.Exists() ? section.Get<DockViewOptions>() : new();
+
+        ThemeProviderService.ThemeChangedAsync += OnThemeChangedAsync;
     }
 
     /// <summary>
@@ -193,6 +196,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),
@@ -224,6 +228,12 @@ public async Task Reset(string? layoutConfig = null)
     /// <returns></returns>
     public Task<string?> SaveLayout() => InvokeAsync<string?>("save", Id);
 
+    private Task OnThemeChangedAsync(string themeName)
+    {
+        Theme = themeName == "dark" ? DockViewTheme.Dark : DockViewTheme.Light;
+        return Task.CompletedTask;
+    }
+
     /// <summary>
     /// 标签页关闭回调方法 由 JavaScript 调用
     /// </summary>
@@ -271,4 +281,21 @@ public async Task SplitterCallbackAsync()
             await OnSplitterCallbackAsync();
         }
     }
+
+    private void Dispose(bool disposing)
+    {
+        if (disposing)
+        {
+            ThemeProviderService.ThemeChangedAsync -= OnThemeChangedAsync;
+        }
+    }
+
+    /// <summary>
+    /// <inheritdoc/>
+    /// </summary>
+    public void Dispose()
+    {
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
 }

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

@@ -1,6 +1,7 @@
-import { addLink } from '../../BootstrapBlazor/modules/utility.js'
+import { addLink, getTheme } from '../../BootstrapBlazor/modules/utility.js'
 import { cerateDockview } from '../js/dockview-utils.js'
 import Data from '../../BootstrapBlazor/modules/data.js'
+import EventHandler from "../../BootstrapBlazor/modules/event-handler.js"
 
 export async function init(id, invoke, options) {
     await addLink("./_content/BootstrapBlazor.DockView/css/dockview-bb.css")
@@ -9,8 +10,15 @@ export async function init(id, invoke, options) {
         return;
     }
 
-    const dockview = cerateDockview(el, options)
-    Data.set(id, { el, dockview });
+    if(options.theme === 'dockview-theme-light') {
+        let theme = getTheme();
+        if (theme === 'dark') {
+            options.theme = `dockview-theme-dark`;
+        }
+    }
+    const dockview = cerateDockview(el, options);
+    const updateTheme = e => dockview.switchTheme(e.theme);
+    Data.set(id, { el, dockview, updateTheme });
 
     dockview.on('initialized', () => {
         invoke.invokeMethodAsync(options.initializedCallback);
@@ -24,6 +32,8 @@ export async function init(id, invoke, options) {
     dockview.on('groupSizeChanged', () => {
         invoke.invokeMethodAsync(options.splitterCallback);
     });
+
+    EventHandler.on(document, 'changed.bb.theme', updateTheme);
 }
 
 export function update(id, options) {
@@ -57,6 +67,8 @@ export function dispose(id) {
     Data.remove(id);
 
     if (dock) {
+        EventHandler.off(document, 'changed.bb.theme', dock.updateTheme);
+
         const { dockview } = dock;
         if (dockview) {
             dockview.dispose();

src/components/BootstrapBlazor.DockView/wwwroot/css/dockview-bb.css

@@ -45,6 +45,13 @@
     position: relative;
 }
 
+.bb-dockview > div {
+    --dv-tabs-and-actions-container-height: 30px;
+    --bb-dockview-tab-line-height: 30px;
+    --bb-dockview-tab-padding: 0 3px;
+    --dv-tabs-and-actions-container-font-size: 12px;
+}
+
     .bb-dockview .bb-dockview-panel {
         height: 100%;
         width: 100%;
@@ -201,24 +208,6 @@
     transition-duration: .3s;
 }
 
-.ribbon-body.ribbon-body > div,
-.bb-dockview .dv-split-view-container,
-.bb-dockview .dv-split-view-container .dv-view-container .dv-view {
-    overflow: initial;
-}
-
-    .bb-dockview .dv-split-view-container .dv-view-container .dv-view.bb-maximize {
-        z-index: 99;
-    }
-
-    .bb-dockview .dv-split-view-container .dv-view-container > .dv-view > .dv-groupview:not(.empty) {
-        overflow: initial !important;
-    }
-
-.bb-dockview .dv-resize-container .dv-groupview .dv-tabs-and-actions-container {
-    z-index: 12;
-}
-
 .bb-dockview .bb-dockview-btn-wrapper {
     cursor: pointer;
     float: left;
@@ -275,5 +264,12 @@
 }
 
 .bb-dockview .dv-resize-container-drawer {
-    height: calc(100% + 1px) !important;
+    height: 100% !important;
+}
+
+.bb-dockview .dv-tabs-and-actions-container:has(.dropdown-item) .dv-scrollbar-horizontal {
+    display: none;
+}
+.bb-dockview .dv-tab.dv-inactive-tab .dv-default-tab .dv-default-tab-action {
+    visibility: visible;
 }