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

Merge pull request #6478 from dataease/pr@dev-v2@refactor_panel-tab

Browse Source 
refactor: 优化Tab移除操作，修复组件操作按钮区域可能被遮挡问题
This commit is contained in:
王嘉豪 2023-11-01 15:29:17 +08:00 committed by GitHub
commit a0e3be4f2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-frontend/src/components/visualization/ComponentEditBar.vue
View File

@ -287,7 +287,7 @@ const showEditPosition = computed(() => {
if (showPosition.value === 'canvas') { if (showPosition.value === 'canvas') {
const baseLeft = element.value.x - 1 const baseLeft = element.value.x - 1
const baseRight = pcMatrixCount.value.x - (element.value.x + element.value.sizeX - 1) const baseRight = pcMatrixCount.value.x - (element.value.x + element.value.sizeX - 1)
if (baseLeft === 0 && baseRight === 0) { if ((baseLeft === 0 && baseRight === 0) || baseRight < 0) {
return 'bar-main-right-inner' return 'bar-main-right-inner'
} else if (baseRight === 0) { } else if (baseRight === 0) {
return 'bar-main-left-outer' return 'bar-main-left-outer'

18
core/core-frontend/src/views/canvas/DeCanvas.vue
View File

@ -175,14 +175,16 @@ const addItemBox = component => {
} }
const moveOutFromTab = component => { const moveOutFromTab = component => {
component.canvasId = canvasId.value setTimeout(() => {
dvMainStore.addComponent({ component.canvasId = canvasId.value
component, dvMainStore.addComponent({
index: undefined, component,
isFromGroup: true, index: undefined,
componentData: componentData.value isFromGroup: true,
}) componentData: componentData.value
addItemBox(component) })
addItemBox(component)
}, 500)
} }
// 全局监听按键事件 // 全局监听按键事件