center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix(数据大屏): 修复组合移动在大屏那已经存在组合的情况下容易出现拖拽轨迹的问题

Browse Source
This commit is contained in:
wangjiahao 2024-04-18 10:01:55 +08:00
parent 07cf91cb32
commit 63d690e019
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/core-frontend/src/components/data-visualization/canvas/CanvasCore.vue
View File

@ -216,11 +216,10 @@ watch(
) )
watch( watch(
() => areaData.value.components, () => areaData.value.components.length,
() => { (val, oldVal) => {
groupAreaClickChange() groupAreaClickChange()
}, }
{ deep: true }
) )
const initWatermark = (waterDomId = 'editor-canvas-main') => { const initWatermark = (waterDomId = 'editor-canvas-main') => {
@ -1359,9 +1358,9 @@ const contextMenuShow = computed(() => {
const markLineShow = computed(() => isMainCanvas(canvasId.value)) const markLineShow = computed(() => isMainCanvas(canvasId.value))
// 点击事件导致选择区域变更 // 点击事件导致选择区域变更
const groupAreaClickChange = () => { const groupAreaClickChange = async () => {
let groupAreaCom let groupAreaCom
const groupAreaHis = componentData.value.filter(ele => ele.id === 100000001) const groupAreaHis = dvMainStore.componentData.filter(ele => ele.component === 'GroupArea')
if (groupAreaHis && groupAreaHis.length > 0) { if (groupAreaHis && groupAreaHis.length > 0) {
groupAreaCom = groupAreaHis[0] groupAreaCom = groupAreaHis[0]
} }
@ -1369,7 +1368,8 @@ const groupAreaClickChange = () => {
if (areaData.value.components.length > 1) { if (areaData.value.components.length > 1) {
// 重新计算边界 // 重新计算边界
composeStore.calcComposeArea() composeStore.calcComposeArea()
if (!groupAreaCom) { const hist2 = dvMainStore.componentData.filter(ele => ele.component === 'GroupArea')
if (groupAreaHis.length === 0) {
// 如果不存在 新建视括组件 // 如果不存在 新建视括组件
groupAreaCom = findNewComponent('GroupArea', 'GroupArea') groupAreaCom = findNewComponent('GroupArea', 'GroupArea')
dvMainStore.addComponent({ component: groupAreaCom, index: undefined }) dvMainStore.addComponent({ component: groupAreaCom, index: undefined })
@ -1379,7 +1379,9 @@ const groupAreaClickChange = () => {
groupAreaCom.style.width = areaData.value.style.width groupAreaCom.style.width = areaData.value.style.width
groupAreaCom.style.height = areaData.value.style.height groupAreaCom.style.height = areaData.value.style.height
} else if (groupAreaCom) { } else if (groupAreaCom) {
dvMainStore.deleteComponentById(100000001) groupAreaHis.forEach(ele => {
dvMainStore.deleteComponentById(ele.id)
})
} }
} }