github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-25 03:52:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: 修复图层重命名点击画布区域Blur未触发问题

Browse Source
This commit is contained in:
wangjiahao 2023-10-26 10:41:56 +08:00
parent 0df7211d40
commit 80211d8c84
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/core-frontend/src/components/data-visualization/RealTimeComponentList.vue
View File

@ -93,7 +93,9 @@ let nameEdit = ref(false)
let editComponentId = ref('') let editComponentId = ref('')
let inputName = ref('') let inputName = ref('')
let nameInput = ref(null) let nameInput = ref(null)
let curEditComponent = null
const editComponentName = item => { const editComponentName = item => {
curEditComponent = curComponent.value
editComponentId.value = `#component-label-${item.id}` editComponentId.value = `#component-label-${item.id}`
nameEdit.value = true nameEdit.value = true
inputName.value = item.name inputName.value = item.name
@ -106,11 +108,12 @@ const closeEditComponentName = () => {
if (!inputName.value || !inputName.value.trim()) { if (!inputName.value || !inputName.value.trim()) {
return return
} }
if (inputName.value.trim() === curComponent.value.name) { if (inputName.value.trim() === curEditComponent.name) {
return return
} }
curComponent.value.name = inputName.value curEditComponent.name = inputName.value
inputName.value = '' inputName.value = ''
curEditComponent = null
} }
const lock = () => { const lock = () => {

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

@ -252,7 +252,7 @@ const handleMouseDown = e => {
} }
// 如果没有选中组件 在画布上点击时需要调用 e.preventDefault() 防止触发 drop 事件 // 如果没有选中组件 在画布上点击时需要调用 e.preventDefault() 防止触发 drop 事件
if (!curComponent.value || isPreventDrop(curComponent.value.component)) { if (!curComponent.value || isPreventDrop(curComponent.value.component)) {
e.preventDefault() // e.preventDefault()
} }
hideArea() hideArea()
const rectInfo = editorMap.value[canvasId.value].getBoundingClientRect() const rectInfo = editorMap.value[canvasId.value].getBoundingClientRect()

6
core/core-frontend/src/components/data-visualization/canvas/Shape.vue
View File

@ -385,9 +385,9 @@ const handleMouseDownOnShape = e => {
nextTick(() => eventBus.emit('componentClick')) nextTick(() => eventBus.emit('componentClick'))
dvMainStore.setInEditorStatus(true) dvMainStore.setInEditorStatus(true)
dvMainStore.setClickComponentStatus(true) dvMainStore.setClickComponentStatus(true)
if (isPreventDrop(element.value.component)) { // if (isPreventDrop(element.value.component)) {
e.preventDefault() // e.preventDefault()
} // }
e.stopPropagation() e.stopPropagation()
if (element.value['isLock'] || !isEditMode.value) return if (element.value['isLock'] || !isEditMode.value) return

2
core/core-frontend/src/views/data-visualization/index.vue
View File

@ -113,7 +113,7 @@ const handleDragOver = e => {
} }
const handleMouseDown = e => { const handleMouseDown = e => {
e.stopPropagation() // e.stopPropagation()
dvMainStore.setClickComponentStatus(false) dvMainStore.setClickComponentStatus(false)
// 点击画布的空区域 提前清空curComponent 防止右击菜单内容抖动 // 点击画布的空区域 提前清空curComponent 防止右击菜单内容抖动
dvMainStore.setCurComponent({ component: null, index: null }) dvMainStore.setCurComponent({ component: null, index: null })