test/BootstrapBlazor3
1
0
Fork 0
mirror of https://gitee.com/LongbowEnterprise/BootstrapBlazor.git synced 2024-11-30 02:58:37 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

feat(DockView): add keep position function (#3840)

Browse Source 
* fix：修改添加panel的添加顺序

* fix：修改添加panel的添加顺序

* chore: bump version 8.0.1

---------

Co-authored-by: zhaijunlei <276318515@qq.com>
This commit is contained in:
Argo Zhang 2024-07-12 10:38:30 +08:00 committed by GitHub
parent fece7a2352
commit a8611fee14
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Extensions/Components/BootstrapBlazor.DockView/BootstrapBlazor.DockView.csproj
View File

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

1
src/Extensions/Components/BootstrapBlazor.DockView/wwwroot/js/dockview-core.esm.js
View File

@ -7840,6 +7840,7 @@ class DockviewComponent extends BaseGrid {
referenceGroup.model.openPanel(panel, {
skipSetActive: options.inactive,
skipSetGroupActive: options.inactive,
index: options.position.index
});
if (!options.inactive) {
this.doSetGroupAndPanelActive(referenceGroup);

15
src/Extensions/Components/BootstrapBlazor.DockView/wwwroot/js/dockview-group.js
View File

@ -24,9 +24,9 @@ const onAddGroup = group => {
createGroupActions(group);
}
const addGroupWithPanel = (dockview, panel, panels) => {
const addGroupWithPanel = (dockview, panel, panels, index) => {
if (panel.groupId) {
addPanelWidthGroupId(dockview, panel)
addPanelWidthGroupId(dockview, panel, index)
}
else {
addPanelWidthCreatGroup(dockview, panel, panels)
@ -34,7 +34,7 @@ const addGroupWithPanel = (dockview, panel, panels) => {
deletePanel(dockview, panel)
}
const addPanelWidthGroupId = (dockview, panel) => {
const addPanelWidthGroupId = (dockview, panel, index) => {
let group = dockview.api.getGroup(panel.groupId)
let { position = {}, currentPosition, height, isPackup, isMaximized } = panel.params || {}
if (!group) {
@ -65,7 +65,7 @@ const addPanelWidthGroupId = (dockview, panel) => {
id: panel.id,
title: panel.title,
component: panel.component,
position: { referenceGroup: group },
position: { referenceGroup: group, index: index || 0 },
params: { ...panel.params, isPackup, height, isMaximized, position }
})
dockview._panelVisibleChanged?.fire({ title: panel.title, status: true });
@ -411,9 +411,10 @@ const setWidth = (observerList) => {
let dropMenu = dropdown.querySelector('.dropdown-menu')
if (voidWidth === 0) {
if (tabsContainer.children.length <= 1) return
let lastTab = header.querySelector('.tabs-container>.inactive-tab:not(:has(+ .inactive-tab))')
let aEle = document.createElement('a')
let liEle = document.createElement('li')
const inactiveTabs = header.querySelectorAll('.tabs-container>.inactive-tab')
const lastTab = inactiveTabs[inactiveTabs.length - 1]
const aEle = document.createElement('a')
const liEle = document.createElement('li')
aEle.className = 'dropdown-item'
liEle.tabWidth = lastTab.offsetWidth;
aEle.append(lastTab)

3
src/Extensions/Components/BootstrapBlazor.DockView/wwwroot/js/dockview-panel.js
View File

@ -20,7 +20,8 @@ const onRemovePanel = event => {
height: event.group.element.parentElement.offsetHeight,
top: parseFloat(event.group.element.parentElement.style.top || 0),
left: parseFloat(event.group.element.parentElement.style.left || 0)
}
},
index: event.group.delPanelIndex
}
}
if (event.params.groupInvisible) {

7
src/Extensions/Components/BootstrapBlazor.DockView/wwwroot/js/dockview-utils.js
View File

@ -109,13 +109,18 @@ const toggleComponent = (dockview, options) => {
const pan = findContentFromPanels(localPanels, p);
if (pan === void 0) {
const panel = findContentFromPanels(dockview.params.panels, p);
addGroupWithPanel(dockview, panel || p, panels);
const groupPanels = panels.filter(p1 => p1.params.parentId == p.params.parentId)
const indexOfOptions = groupPanels.findIndex(p => p.id == panel.id)
const index = panel && panel.params.index
console.log(index, 'index');
addGroupWithPanel(dockview, panel || p, panels, index ?? indexOfOptions);
}
})
localPanels.forEach(item => {
let pan = findContentFromPanels(panels, item);
if (pan === void 0) {
item.group.delPanelIndex = item.group.panels.findIndex(p => p.id == item.id)
dockview.removePanel(item)
}
})