public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-16 05:50:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复多个图表连续设置标题生效目标错误问题 #13237

Browse Source
This commit is contained in:
wangjiahao
2024-11-29 18:56:00 +08:00
parent 0eb5d48457
commit 53da15dfd7
2 changed files with 31 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/core-frontend/src/components/visualization/DvSidebar.vue
View File

@@ -8,7 +8,7 @@ import Icon from '../icon-custom/src/Icon.vue'
const dvMainStore = dvMainStoreWithOut()
const { canvasCollapse } = storeToRefs(dvMainStore)
let componentNameEdit = ref(false)
let inputComponentName = ref('')
let inputComponentName = ref({ id: null, name: null })
let componentNameInputAttr = ref(null)
import dvInfoSvg from '@/assets/svg/dv-info.svg'
import { useI18n } from '@/hooks/web/useI18n'
@@ -75,25 +75,32 @@ const slideStyle = computed(() => {
const closeEditComponentName = () => {
componentNameEdit.value = false
if (!inputComponentName.value || !inputComponentName.value.trim()) {
if (props.element.id !== inputComponentName.value.id) {
return
}
if (inputComponentName.value.trim() === view.value.title) {
if (!inputComponentName.value.name || !inputComponentName.value.name.trim()) {
return
}
if (inputComponentName.value.trim().length > 64 || inputComponentName.value.trim().length < 2) {
if (inputComponentName.value.name.trim() === view.value.title) {
return
}
if (
inputComponentName.value.name.trim().length > 64 ||
inputComponentName.value.name.trim().length < 2
) {
ElMessage.warning('名称字段长度2-64个字符')
editComponentName()
return
}
view.value.title = inputComponentName.value
inputComponentName.value = ''
view.value.title = inputComponentName.value.name
inputComponentName.value.name = ''
}
const editComponentName = () => {
if (isViewTitle.value) {
componentNameEdit.value = true
inputComponentName.value = view.value.title
inputComponentName.value.name = view.value.title
inputComponentName.value.id = view.value.id
nextTick(() => {
componentNameInputAttr.value.focus()
})
@@ -175,7 +182,7 @@ const onComponentNameChange = () => {
<Teleport v-if="componentNameEdit" :to="'#attr-slide-component-name' + slideIndex">
<input
ref="componentNameInputAttr"
v-model="inputComponentName"
v-model="inputComponentName.name"
width="100%"
:effect="themeInfo"
@change="onComponentNameChange"

24
core/core-frontend/src/views/chart/components/editor/index.vue
View File

@@ -89,7 +89,7 @@ const {
} = storeToRefs(dvMainStore)
const router = useRouter()
let componentNameEdit = ref(false)
let inputComponentName = ref('')
let inputComponentName = ref({ id: null, name: null })
let componentNameInput = ref(null)
const { t } = useI18n()
@@ -131,24 +131,32 @@ const onComponentNameChange = () => {
const closeEditComponentName = () => {
componentNameEdit.value = false
if (!inputComponentName.value || !inputComponentName.value.trim()) {
if (curComponent.value.id !== inputComponentName.value.id) {
return
}
if (inputComponentName.value.trim() === view.value.title) {
if (!inputComponentName.value.name || !inputComponentName.value.name.trim()) {
return
}
if (inputComponentName.value.trim().length > 64 || inputComponentName.value.trim().length < 2) {
if (inputComponentName.value.name.trim() === view.value.title) {
return
}
if (
inputComponentName.value.name.trim().length > 64 ||
inputComponentName.value.name.trim().length < 2
) {
ElMessage.warning('名称字段长度2-64个字符')
editComponentName()
return
}
view.value.title = inputComponentName.value
inputComponentName.value = ''
view.value.title = inputComponentName.value.name
inputComponentName.value.name = ''
inputComponentName.value.id = ''
}
const editComponentName = () => {
componentNameEdit.value = true
inputComponentName.value = view.value.title
inputComponentName.value.name = view.value.title
inputComponentName.value.id = view.value.id
nextTick(() => {
componentNameInput.value.focus()
})
@@ -3873,7 +3881,7 @@ const deleteChartFieldItem = id => {
<Teleport v-if="componentNameEdit" :to="'#component-name'">
<input
ref="componentNameInput"
v-model="inputComponentName"
v-model="inputComponentName.name"
:effect="themes"
width="100%"
@change="onComponentNameChange"