Commit dbd4acb7 authored by zhengke's avatar zhengke

修复组件提示层级关系,解决滚动画布区域,顶部被滚出视线外

parent a8c3af0e
...@@ -122,4 +122,7 @@ window.addEventListener('unload', () => { ...@@ -122,4 +122,7 @@ window.addEventListener('unload', () => {
#app { #app {
height: 100%; height: 100%;
} }
.el-overlay{
z-index: 99999 !important;
}
</style> </style>
\ No newline at end of file
...@@ -202,17 +202,13 @@ const goBack = () =>{ ...@@ -202,17 +202,13 @@ const goBack = () =>{
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning', type: 'warning',
} }
) ).then(() => {
.then(() => {
searchData.value.TempId = 0 searchData.value.TempId = 0
marketStore.setMarket(true) marketStore.setMarket(true)
slidesStore.setSlides(list) slidesStore.setSlides(list)
layoutsStore.setLayouts([]) layoutsStore.setLayouts([])
CoverImgStore.setCoverImg(null) CoverImgStore.setCoverImg(null)
}) }).catch(() => {})
.catch(() => {
})
} }
// 导入PSD // 导入PSD
......
...@@ -195,7 +195,6 @@ const GetTripFiledData = async () =>{ ...@@ -195,7 +195,6 @@ const GetTripFiledData = async () =>{
cursors.push(temp) cursors.push(temp)
} }
if(y.TemplateDataSource.index!=null&&y.TemplateDataSource.index>=0){ if(y.TemplateDataSource.index!=null&&y.TemplateDataSource.index>=0){
console.log(value[oo],'-------')
if(value[oo].length>temp.index) value=value[oo][y.TemplateDataSource.index] if(value[oo].length>temp.index) value=value[oo][y.TemplateDataSource.index]
}else{ }else{
if(value[oo].length>temp.index) value=value[oo][temp.index] if(value[oo].length>temp.index) value=value[oo][temp.index]
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<EditorHeader class="layout-header" /> <EditorHeader class="layout-header" />
<div class="layout-content"> <div class="layout-content">
<Thumbnails class="layout-content-left" /> <Thumbnails class="layout-content-left" />
<div class="layout-content-center"> <div class="layout-content-center" style="overflow: hidden;">
<CanvasTool class="center-top" /> <CanvasTool class="center-top" />
<!-- :style="{ height: `calc(100% - ${remarkHeight + 40}px)` }" --> <!-- :style="{ height: `calc(100% - ${remarkHeight + 40}px)` }" -->
<Canvas class="center-body" :style="{ height: `calc(100% - 40px)`}" /> <Canvas class="center-body" :style="{ height: `calc(100% - 40px)`}" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment