diff --git a/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue b/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue index 582eadac04..95be965a74 100644 --- a/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue +++ b/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue @@ -491,7 +491,6 @@ const getSelectArea = () => { } const handleContextMenu = e => { - console.log('====handleContextMenu===') // 仪表板和预览状态不显示菜单和组创建 if (dashboardActive.value || editMode.value === 'preview') { return @@ -1363,11 +1362,7 @@ const linkageSetOpen = item => { } const contextMenuShow = computed(() => { - if (curComponent.value) { - return curComponent.value.canvasId === canvasId.value - } else { - return isMainCanvas(canvasId.value) - } + return isMainCanvas(canvasId.value) }) const markLineShow = computed(() => isMainCanvas(canvasId.value)) diff --git a/core/core-frontend/src/store/modules/data-visualization/common.ts b/core/core-frontend/src/store/modules/data-visualization/common.ts index ff51a9b921..2b7af19d3c 100644 --- a/core/core-frontend/src/store/modules/data-visualization/common.ts +++ b/core/core-frontend/src/store/modules/data-visualization/common.ts @@ -7,6 +7,7 @@ export const getCurInfo = () => { if (curComponent.value) { const curComponentId = curComponent.value.id let curIndex = 0 + let curTabIndex = 0 let curComponentData = componentData.value componentData.value.forEach((component, index) => { if (curComponentId === component.id) { @@ -20,9 +21,21 @@ export const getCurInfo = () => { } }) } + if (component.component === 'DeTabs') { + component.propValue.forEach((tabItem, tabIndex) => { + curTabIndex = tabIndex + tabItem.componentData.forEach((tabComponent, subIndex) => { + if (curComponentId === tabComponent.id) { + curIndex = subIndex + curComponentData = tabItem.componentData + } + }) + }) + } }) return { index: curIndex, + tabIndex: curTabIndex, componentData: curComponentData } }