Skip to content

Commit aaab04c

Browse files
committed
fix: 修复render模式为always时aside窗口隐藏异常
1 parent 693f452 commit aaab04c

3 files changed

Lines changed: 9 additions & 3 deletions

File tree

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,8 @@
248248
height: 100% !important;
249249
}
250250

251-
.bb-dockview .dv-resize-container-drawer:not(.active) {
251+
.bb-dockview .dv-resize-container-drawer:not(.active),
252+
.bb-dockview .dv-render-overlay-float-drawer:not(.active) {
252253
z-index: -1 !important;
253254
}
254255

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,7 @@ const createDrawerHandle = (floatingGroup, isRight) => {
369369
const className = isRight ? 'bb-resize-container-right' : 'bb-resize-container-left'
370370
floatingGroup.element.parentElement.classList.add('dv-resize-container-drawer')
371371
floatingGroup.element.parentElement.classList.add(className)
372+
floatingGroup.activePanel.view.content.element.parentElement.classList.add('dv-render-overlay-float-drawer')
372373
createDrawerBtn(floatingGroup, isRight)
373374
}
374375

@@ -393,7 +394,7 @@ const createDrawerBtn = (floatingGroup, isRight) => {
393394
if (params.floatType == 'drawer' && item.group != floatingGroup) {
394395
item.group.element.parentElement.classList.remove('active')
395396
if (activePanel?.renderer == 'always' && parentElement) {
396-
parentElement.classList.remove('active');
397+
item.group.activePanel.view.content.element.parentElement.classList.remove('active');
397398
}
398399
}
399400
})
@@ -533,6 +534,8 @@ const observeOverlayChange = (overlay, group) => {
533534
parentEle.classList.remove('dv-resize-container-drawer')
534535
parentEle.classList.remove('bb-resize-container-right')
535536
parentEle.classList.remove('bb-resize-container-left')
537+
group.activePanel.view.content.element.parentElement.classList.remove('active')
538+
group.activePanel.view.content.element.parentElement.classList.remove('dv-render-overlay-float-drawer')
536539
group.removePropsOfParams('floatType')
537540
group.removePropsOfParams('direction')
538541
group.header.rightActionsContainer.classList.remove('bb-show-autohide')
@@ -589,6 +592,8 @@ const dock = (group, floatType) => {
589592
group.removePropsOfParams('floatType')
590593
group.removePropsOfParams('direction')
591594
removeDrawerBtn(group)
595+
group.activePanel.view.content.element.parentElement.classList.remove('active')
596+
group.activePanel.view.content.element.parentElement.classList.remove('dv-render-overlay-float-drawer')
592597
}
593598
else {
594599
group.setParams({ rect })

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ const initDockview = (dockview, options, template) => {
124124
observeGroup(group)
125125
})
126126
dockview.element.querySelector('&>.dv-dockview>.dv-branch-node').addEventListener('click', function (e) {
127-
this.parentElement.querySelectorAll('&>.dv-resize-container-drawer').forEach(item => {
127+
this.parentElement.querySelectorAll('&>.dv-resize-container-drawer, &>.dv-render-overlay-float-drawer').forEach(item => {
128128
item.classList.remove('active')
129129
})
130130
this.closest('.bb-dockview').querySelectorAll('&>.bb-dockview-aside>.bb-dockview-aside-button').forEach(item => {

0 commit comments

Comments
 (0)