|
|
@@ -122,7 +122,7 @@
|
|
|
@add="handleChildAdd($event,item,index)"
|
|
|
@remove="handleChildRemove($event,item.child)"
|
|
|
handle=".drag-btn_c"
|
|
|
- style="display: flex;gap: 20px;align-items: flex-start;"
|
|
|
+ style="display: flex;gap: 3px;align-items: flex-start;"
|
|
|
>
|
|
|
<div
|
|
|
:class="['report-drag-item-wrap_child_content',activeId===child.id?'blue-bg':'']"
|
|
|
@@ -142,6 +142,8 @@
|
|
|
<div class="resize-drag-box_lb" @mousedown.stop="handleResizeC($event,index,cindex,'lb')"></div>
|
|
|
<div class="resize-drag-box_rb" @mousedown.stop="handleResizeC($event,index,cindex,'rb')"></div>
|
|
|
<component :is="getComponentName(child)" :compData="child"/>
|
|
|
+ <!-- -->
|
|
|
+ <div class="mark-box" v-if="isDragResize" style="position: absolute;left:0;right:0;top:0;bottom: 0;z-index: 10;"></div>
|
|
|
</div>
|
|
|
</draggable>
|
|
|
</div>
|
|
|
@@ -621,10 +623,10 @@ export default {
|
|
|
compType:compData.compType,
|
|
|
content:compData.content||'',
|
|
|
id:this.getCompId(compData.compType),
|
|
|
+ style:compData.compType==='chart'?'height:350px':'',
|
|
|
child:[]
|
|
|
})
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
console.log(obj);
|
|
|
|
|
|
@@ -681,8 +683,9 @@ export default {
|
|
|
}else{//删除子盒子
|
|
|
this.conList[pindex].child.splice(cindex,1)
|
|
|
if(this.conList[pindex].child.length===1){//只剩一个子盒子了则变成一个大盒子
|
|
|
+ const styleArr=this.conList[pindex].child[0].style.split(';').filter(s=>s&&(s.indexOf('width')===-1&&s.indexOf('flex')===-1)).join(';')
|
|
|
this.conList[pindex]=this.conList[pindex].child[0]
|
|
|
- this.conList[pindex].style='flex:1'
|
|
|
+ this.conList[pindex].style=styleArr
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
@@ -1426,6 +1429,7 @@ div{
|
|
|
position: absolute;
|
|
|
right: -15px;
|
|
|
top: 0;
|
|
|
+ z-index: 10;
|
|
|
.drag-btn::after{
|
|
|
content: '';
|
|
|
display: block;
|
