Merge pull request #11175 from dataease/pr@dev-v2@refactor_hidden-pop

refactor(数据大屏): 隐藏区域点击增加选中边框提示
This commit is contained in:
王嘉豪 2024-07-25 13:48:02 +08:00 committed by GitHub
commit ddba599c62
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 5 deletions

View File

@ -19,6 +19,10 @@ const props = defineProps({
type: Boolean,
default: false
},
popActive: {
type: Boolean,
default: false
},
canvasStyleData: {
type: Object,
required: true
@ -192,10 +196,6 @@ const onPointClick = param => {
emits('onPointClick', param)
}
const innerOutActive = computed(() => {
return config.value.category === 'hidden' && showPosition.value === 'popEdit'
})
const deepScale = computed(() => scale.value / 100)
</script>
@ -232,7 +232,7 @@ const deepScale = computed(() => scale.value / 100)
:style="{ color: config.commonBackground.innerImageColor }"
:name="commonBackgroundSvgInner"
></Board>
<div class="wrapper-inner-adaptor" :class="{ 'pop-wrapper-inner': innerOutActive }">
<div class="wrapper-inner-adaptor" :class="{ 'pop-wrapper-inner': popActive }">
<component
:is="findComponent(config['component'])"
:view="viewInfo"

View File

@ -18,6 +18,7 @@
:config="item"
:index="index"
:dv-info="dvInfo"
:pop-active="curActive(item)"
:show-position="showPosition"
:style="customPopStyle"
:scale="innerScale"
@ -49,6 +50,7 @@ import { snapshotStoreWithOut } from '@/store/modules/data-visualization/snapsho
import eventBus from '@/utils/eventBus'
import ComponentWrapper from '@/components/data-visualization/canvas/ComponentWrapper.vue'
import { ElMessage } from 'element-plus-secondary'
import { storeToRefs } from 'pinia'
const dvMainStore = dvMainStoreWithOut()
const snapshotStore = snapshotStoreWithOut()
const areaActive = ref(false)
@ -91,6 +93,7 @@ const props = defineProps({
})
const { canvasStyleData, popComponentData, canvasViewInfo, scale, canvasState } = toRefs(props)
const { curComponent } = storeToRefs(dvMainStore)
const baseStyle = computed(() => {
return {
fontSize: 30 * props.scale + 'px',
@ -102,6 +105,10 @@ const innerScale = computed(() =>
props.showPosition === 'preview' ? props.scale : props.scale * 100
)
const curActive = item => {
return curComponent.value?.id === item.id && props.showPosition === 'popEdit'
}
const handleDragOver = e => {
areaActive.value = true
e.preventDefault()