starred/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2026-09-22 16:00:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: App menu and setting menu cannot be set as secondary menu (#10701)

Browse Source
This commit is contained in:
蘭
2025-10-20 21:47:32 +08:00
committed by GitHub
parent 07648367c1
commit 12e1a6a855
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/views/setting/panel/hidemenu/index.vue
+12 -3
View File
@@ -70,13 +70,17 @@ const acceptParams = (params: DialogProps): void => {
type Node = RenderContentContext['node'];
const allowDrag = (draggingNode: Node) => {
return !draggingNode.data.label.includes('Home-Menu') || draggingNode.level < 3;
const { label } = draggingNode.data;
const forbidden = ['Home-Menu'];
return draggingNode.level < 3 && !forbidden.some((key) => label.includes(key));
};
const allowDrop = (draggingNode: Node, dropNode: Node, type: AllowDropType) => {
if (dropNode.data.label === 'Home-Menu') {
return type !== 'prev' && type !== 'inner';
}
const label = draggingNode.data.label;
const restricted = ['App-Menu', 'Setting-Menu'];
const draggingHasChildren = draggingNode.childNodes?.length > 0;
const isDraggingTooDeep = draggingNode.level > 2;
const isDraggingFirstLevel = draggingNode.level === 1;
@@ -89,7 +93,7 @@ const allowDrop = (draggingNode: Node, dropNode: Node, type: AllowDropType) => {
return false;
}
if (isDropFirstLevel && dropHasChildren) {
if (isDropFirstLevel && dropHasChildren && !restricted.includes(label)) {
return type === 'inner' || type === 'prev' || type === 'next';
}
@@ -97,7 +101,12 @@ const allowDrop = (draggingNode: Node, dropNode: Node, type: AllowDropType) => {
return type === 'prev' || type === 'next';
}
if (isDraggingFirstLevel && draggingNode.childNodes?.length > 0 && dropNode.level !== 2) {
if (
isDraggingFirstLevel &&
draggingNode.childNodes?.length > 0 &&
dropNode.level !== 2 &&
!restricted.includes(label)
) {
return type === 'inner' || type === 'prev' || type === 'next';
}