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 83c92aed55..1bcaa86c04 100644 --- a/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue +++ b/core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue @@ -47,6 +47,7 @@ import PopArea from '@/custom-component/pop-area/Component.vue' import DatasetParamsComponent from '@/components/visualization/DatasetParamsComponent.vue' import DeGrid from '@/components/data-visualization/DeGrid.vue' import DeGridScreen from '@/components/data-visualization/DeGridScreen.vue' +import GroupAreaShadow from '@/custom-component/group-area/ComponentShadow.vue' const snapshotStore = snapshotStoreWithOut() const dvMainStore = dvMainStoreWithOut() @@ -55,7 +56,7 @@ const contextmenuStore = contextmenuStoreWithOut() const { curComponent, dvInfo, editMode, tabMoveOutComponentId, canvasState } = storeToRefs(dvMainStore) -const { editorMap, areaData } = storeToRefs(composeStore) +const { editorMap, areaData, isCtrlOrCmdDown } = storeToRefs(composeStore) const emits = defineEmits(['scrollCanvasToTop']) const props = defineProps({ themes: { @@ -1471,6 +1472,19 @@ const dataVBatchOptAdaptor = () => { }) } +const itemShow = item => { + return ( + item.isShow && + (item.component !== 'GroupArea' || (item.component === 'GroupArea' && !isCtrlOrCmdDown.value)) + ) +} + +const groupAreaShadowShow = computed( + () => + componentData.value.length > 0 && + componentData.value[componentData.value.length - 1].component === 'GroupArea' && + isCtrlOrCmdDown.value +) // 点击事件导致选择区域变更 const groupAreaClickChange = async () => { let groupAreaCom @@ -1574,6 +1588,7 @@ defineExpose({ :style="editStyle" @contextmenu="handleContextMenu" > + ---{{ componentData[componentData.length - 1].component }} + +
+ + + + +