Merge pull request #9870 from dataease/pr@dev-v2@style_iframe

Pr@dev v2@style iframe
This commit is contained in:
王嘉豪 2024-05-27 10:24:03 +08:00 committed by GitHub
commit 72b6478f8c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 4 deletions

View File

@ -90,7 +90,7 @@ const paste = () => {
}
const deleteComponent = () => {
if (curComponent.value) {
if (curComponent.value && !isGroupArea.value) {
const curInfo = getCurInfo()
dvMainStore.deleteComponentById(curComponent.value?.id, curInfo.componentData)
} else if (areaData.value.components.length) {
@ -153,6 +153,10 @@ const handleComposeMouseDown = e => {
const composeDivider = computed(() => {
return !(!curComponent || curComponent['isLock'] || curComponent['component'] != 'Group')
})
const isGroupArea = computed(() => {
return curComponent.value?.component === 'GroupArea'
})
</script>
<template>
@ -201,7 +205,7 @@ const composeDivider = computed(() => {
取消组合
</li>
<el-divider class="custom-divider" v-show="composeDivider" />
<template v-if="curComponent">
<template v-if="curComponent && !isGroupArea">
<template v-if="!curComponent['isLock']">
<li @click="upComponent">上移一层</li>
<li @click="downComponent">下移一层</li>

View File

@ -117,7 +117,6 @@ const destroyPlayer = () => {
justify-content: center;
background-color: rgba(245, 245, 220, 0.1);
font-size: 12px;
color: #000000;
}
.move-bg {

View File

@ -88,7 +88,6 @@ watch(
justify-content: center;
background-color: rgba(255, 255, 255, 0.1);
font-size: 12px;
color: #9ea6b2;
}
.player {