From 8fd4099ad293d323e10371d6a79e8d6ad1fd28a0 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Wed, 26 Feb 2025 08:24:34 +0800 Subject: [PATCH 1/7] =?UTF-8?q?style:=20=E5=A2=9E=E5=8A=A0=E5=8A=A8?= =?UTF-8?q?=E7=94=BB=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Layout/LayoutSplitebar.razor.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/BootstrapBlazor/Components/Layout/LayoutSplitebar.razor.scss b/src/BootstrapBlazor/Components/Layout/LayoutSplitebar.razor.scss index 35f2e1ea2de..80c69b03506 100644 --- a/src/BootstrapBlazor/Components/Layout/LayoutSplitebar.razor.scss +++ b/src/BootstrapBlazor/Components/Layout/LayoutSplitebar.razor.scss @@ -13,6 +13,7 @@ cursor: col-resize; background-color: transparent; border-radius: 4px; + transition: background .3s linear; &:hover { background-color: var(--bb-sidebar-body-hover-bg); From 8a7fa0278b34907b8f120cd61e83f5c16c94bd69 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Wed, 26 Feb 2025 09:29:15 +0800 Subject: [PATCH 2/7] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BootstrapBlazor/Components/Layout/Layout.razor | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/BootstrapBlazor/Components/Layout/Layout.razor b/src/BootstrapBlazor/Components/Layout/Layout.razor index eacaaaa0b23..c0beaaddaca 100644 --- a/src/BootstrapBlazor/Components/Layout/Layout.razor +++ b/src/BootstrapBlazor/Components/Layout/Layout.razor @@ -2,9 +2,9 @@ @inherits BootstrapModuleComponentBase @attribute [BootstrapModuleAutoLoader(JSObjectReference = true)] - - @if (_init) - { +@if (_init) +{ + @if (IsAuthenticated) {
@@ -60,8 +60,8 @@ { @RenderMain } - } - + +} @code { RenderFragment RenderHeader => collapse => From 42d85831069e25de244d2eb10e21c0f92cf41633 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Wed, 26 Feb 2025 10:40:27 +0800 Subject: [PATCH 3/7] chore: bump version 9.3.1-beta35 --- src/BootstrapBlazor/BootstrapBlazor.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj index 6a509ca7282..1d7a9aaff1b 100644 --- a/src/BootstrapBlazor/BootstrapBlazor.csproj +++ b/src/BootstrapBlazor/BootstrapBlazor.csproj @@ -1,7 +1,7 @@ - 9.3.1-beta34 + 9.3.1-beta35 From 9f67f23db9597cf118a000d314ce4997ee5d7a48 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Wed, 26 Feb 2025 11:23:10 +0800 Subject: [PATCH 4/7] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Layout/LayoutSplitebar.razor.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/BootstrapBlazor/Components/Layout/LayoutSplitebar.razor.js b/src/BootstrapBlazor/Components/Layout/LayoutSplitebar.razor.js index 035061cec3d..3778d904e80 100644 --- a/src/BootstrapBlazor/Components/Layout/LayoutSplitebar.razor.js +++ b/src/BootstrapBlazor/Components/Layout/LayoutSplitebar.razor.js @@ -6,8 +6,8 @@ export function init(id) { return; } - const min = parseFloat(el.getAttribute("data-bb-min") ?? "0"); - const max = parseFloat(el.getAttribute("data-bb-max") ?? "0"); + const min = parseFloat(el.getAttribute("data-bb-min") ?? "-1"); + const max = parseFloat(el.getAttribute("data-bb-max") ?? "-1"); const selector = el.getAttribute("data-bb-selector") ?? ".layout"; const section = document.querySelector(selector); const bar = el.querySelector(".layout-splitebar-body"); @@ -23,9 +23,13 @@ export function init(id) { const eventX = e.clientX || (e.touches.length > 0 && e.touches[0].clientX) const moveX = eventX - originX const newWidth = width + moveX - if (newWidth >= min && newWidth <= max) { - section.style.setProperty('--bb-layout-sidebar-width', `${newWidth}px`) + if (min > -1 && newWidth < min) { + newWidth = min } + if (max > -1 && newWidth > max) { + newWidth = max + } + section.style.setProperty('--bb-layout-sidebar-width', `${newWidth}px`) }, e => { bar.classList.remove('drag') From 790190c6dbc9ca7463209e02a3599f45831cc263 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Wed, 26 Feb 2025 11:48:45 +0800 Subject: [PATCH 5/7] =?UTF-8?q?refactor:=20=E6=94=AF=E6=8C=81=E4=B8=BB?= =?UTF-8?q?=E9=A2=98=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Layout/LayoutSplitebar.razor.scss | 2 ++ src/BootstrapBlazor/wwwroot/scss/theme/bootstrapblazor.scss | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/src/BootstrapBlazor/Components/Layout/LayoutSplitebar.razor.scss b/src/BootstrapBlazor/Components/Layout/LayoutSplitebar.razor.scss index 80c69b03506..35aaa7368a8 100644 --- a/src/BootstrapBlazor/Components/Layout/LayoutSplitebar.razor.scss +++ b/src/BootstrapBlazor/Components/Layout/LayoutSplitebar.razor.scss @@ -8,6 +8,8 @@ display: none; .layout-splitebar-body { + --bb-splitebar-body-hover-bg: #{$bb-splitebar-body-hover-bg}; + --bb-splitebar-body-drag-hover-bg: #{$bb-splitebar-body-drag-hover-bg}; position: absolute; inset: 0px -2px; cursor: col-resize; diff --git a/src/BootstrapBlazor/wwwroot/scss/theme/bootstrapblazor.scss b/src/BootstrapBlazor/wwwroot/scss/theme/bootstrapblazor.scss index fbfb33dbe0b..f52ebcf2aa1 100644 --- a/src/BootstrapBlazor/wwwroot/scss/theme/bootstrapblazor.scss +++ b/src/BootstrapBlazor/wwwroot/scss/theme/bootstrapblazor.scss @@ -346,6 +346,10 @@ $bb-layout-menu-item-hover-bg: #409eff; $bb-layout-logo-border-color: #d5d5d5; $bb-layout-logo-bg: #0e77e3; +// LayoutSplitebar +$bb-splitebar-body-hover-bg: rgba(175, 184, 193, 0.2); +$bb-splitebar-body-drag-hover-bg: rgb(9, 105, 218); + // Light $bb-light-bg: radial-gradient(circle, #fff, #aaa, #333); $bb-light-danger-start-color: #e17777; From b1dc2257f85c45eeb821f4f72b02177adcc42ecd Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Wed, 26 Feb 2025 11:49:12 +0800 Subject: [PATCH 6/7] =?UTF-8?q?refactor:=20=E6=94=AF=E6=8C=81=20Layout=20?= =?UTF-8?q?=E6=94=B6=E7=BC=A9=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Layout/Layout.razor.scss | 6 ++++-- .../Components/Layout/LayoutSplitebar.razor.js | 4 ++-- .../Layout/LayoutSplitebar.razor.scss | 17 +++++++++++++---- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/BootstrapBlazor/Components/Layout/Layout.razor.scss b/src/BootstrapBlazor/Components/Layout/Layout.razor.scss index 2872c7bcd8b..f3ba3749e23 100644 --- a/src/BootstrapBlazor/Components/Layout/Layout.razor.scss +++ b/src/BootstrapBlazor/Components/Layout/Layout.razor.scss @@ -84,7 +84,6 @@ } .has-sidebar { - /*left-right*/ position: relative; flex: 1; @@ -267,7 +266,6 @@ position: relative; width: var(--bb-layout-sidebar-width); transform: translateX(0); - transition: width .3s linear; flex-shrink: 0; .layout-menu { @@ -275,6 +273,10 @@ } } + &:not(.drag) .layout-side { + transition: width .3s linear; + } + &.has-sidebar { .layout-side { &.is-fixed-header { diff --git a/src/BootstrapBlazor/Components/Layout/LayoutSplitebar.razor.js b/src/BootstrapBlazor/Components/Layout/LayoutSplitebar.razor.js index 3778d904e80..6ef2597d88f 100644 --- a/src/BootstrapBlazor/Components/Layout/LayoutSplitebar.razor.js +++ b/src/BootstrapBlazor/Components/Layout/LayoutSplitebar.razor.js @@ -15,7 +15,7 @@ export function init(id) { let width = 0; Drag.drag(bar, e => { - bar.classList.add('drag') + section.classList.add('drag') width = parseInt(getComputedStyle(section).getPropertyValue('--bb-layout-sidebar-width')) originX = e.clientX || e.touches[0].clientX }, @@ -32,7 +32,7 @@ export function init(id) { section.style.setProperty('--bb-layout-sidebar-width', `${newWidth}px`) }, e => { - bar.classList.remove('drag') + section.classList.remove('drag') } ) } diff --git a/src/BootstrapBlazor/Components/Layout/LayoutSplitebar.razor.scss b/src/BootstrapBlazor/Components/Layout/LayoutSplitebar.razor.scss index 35aaa7368a8..b834f110aa7 100644 --- a/src/BootstrapBlazor/Components/Layout/LayoutSplitebar.razor.scss +++ b/src/BootstrapBlazor/Components/Layout/LayoutSplitebar.razor.scss @@ -18,16 +18,25 @@ transition: background .3s linear; &:hover { - background-color: var(--bb-sidebar-body-hover-bg); + background-color: var(--bb-splitebar-body-hover-bg); } + } +} - &.drag, - &.drag:hover { - background-color: var(--bb-sidebar-body-drag-hover-bg); +.drag { + .layout-splitebar { + .layout-splitebar-body:hover { + background-color: var(--bb-splitebar-body-drag-hover-bg); } } } +.is-collapsed { + .layout-splitebar-body { + display: none; + } +} + @media(min-width: 768px) { .layout-splitebar { display: block; From 37ca3bb967f95a7e56df72f97fdfe1d33da610a3 Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Wed, 26 Feb 2025 11:52:09 +0800 Subject: [PATCH 7/7] =?UTF-8?q?refactor:=20=E5=A2=9E=E5=8A=A0=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E4=BF=9D=E6=8A=A4=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Components/Layout/LayoutSplitebar.razor.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/BootstrapBlazor/Components/Layout/LayoutSplitebar.razor.js b/src/BootstrapBlazor/Components/Layout/LayoutSplitebar.razor.js index 6ef2597d88f..84f5bd89170 100644 --- a/src/BootstrapBlazor/Components/Layout/LayoutSplitebar.razor.js +++ b/src/BootstrapBlazor/Components/Layout/LayoutSplitebar.razor.js @@ -10,6 +10,11 @@ export function init(id) { const max = parseFloat(el.getAttribute("data-bb-max") ?? "-1"); const selector = el.getAttribute("data-bb-selector") ?? ".layout"; const section = document.querySelector(selector); + if (section === null) { + log.warning(`LayoutSplitebar: selector ${selector} not found`); + return; + } + const bar = el.querySelector(".layout-splitebar-body"); let originX = 0; let width = 0;