修复bug
This commit is contained in:
@@ -110,7 +110,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="scaleImage_content_imgBox" :class="{active:isComparison}">
|
<div class="scaleImage_content_imgBox" :class="{active:isComparison}">
|
||||||
<img v-if="isComparison" :src="scaleImageList[scaleImageIndex]?.sourceUrl">
|
<img v-if="isComparison" :src="scaleImageList[scaleImageIndex]?.sourceUrl">
|
||||||
<generalMiniCanvas v-if="isCanvas" :imgUrl="scaleImageList[scaleImageIndex]?.imgUrl" @submitBase64Data="submitBase64Data"></generalMiniCanvas>
|
<generalMiniCanvas v-if="isCanvas" :imgUrl="scaleImageList[scaleImageIndex]?.imgUrl || scaleImageList[scaleImageIndex]?.url" @submitBase64Data="submitBase64Data"></generalMiniCanvas>
|
||||||
<img v-else :src="scaleImageList[scaleImageIndex]?.imgUrl || scaleImageList[scaleImageIndex]?.url">
|
<img v-else :src="scaleImageList[scaleImageIndex]?.imgUrl || scaleImageList[scaleImageIndex]?.url">
|
||||||
|
|
||||||
<div class="img_operate_block" v-if="isLike">
|
<div class="img_operate_block" v-if="isLike">
|
||||||
@@ -169,8 +169,7 @@ export default defineComponent({
|
|||||||
},
|
},
|
||||||
workspace:{
|
workspace:{
|
||||||
type:Object,
|
type:Object,
|
||||||
default:{
|
default:false
|
||||||
}
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
setup(props:any,{emit}) {
|
setup(props:any,{emit}) {
|
||||||
@@ -360,7 +359,7 @@ export default defineComponent({
|
|||||||
})
|
})
|
||||||
let data = {
|
let data = {
|
||||||
"base64": rv,
|
"base64": rv,
|
||||||
"category": scaleImageList.value[scaleImageIndex.value]?.categoryValue,
|
"category": scaleImageList.value[scaleImageIndex.value]?.categoryValue || scaleImageList.value[scaleImageIndex.value]?.level2Type,
|
||||||
"gender": props.workspace.sexEnum.value,
|
"gender": props.workspace.sexEnum.value,
|
||||||
"originalId":scaleImageList.value[scaleImageIndex.value]?.id,
|
"originalId":scaleImageList.value[scaleImageIndex.value]?.id,
|
||||||
"isOverride":isOverlay,
|
"isOverride":isOverlay,
|
||||||
|
|||||||
@@ -192,18 +192,20 @@
|
|||||||
<div :class="['content_img_item_block', selectImgList.indexOf(img.id) > -1 ? 'select_item_img' :'']">
|
<div :class="['content_img_item_block', selectImgList.indexOf(img.id) > -1 ? 'select_item_img' :'']">
|
||||||
<img v-lazy="img.url" :key="img.url" :class="['content_img', ['Moodboard','Printboard'].indexOf(selectCode) > -1 ? 'board_content_img' :'']"/>
|
<img v-lazy="img.url" :key="img.url" :class="['content_img', ['Moodboard','Printboard'].indexOf(selectCode) > -1 ? 'board_content_img' :'']"/>
|
||||||
<div class="img_item_hover" v-show="selectCode != 'DesignElements'">
|
<div class="img_item_hover" v-show="selectCode != 'DesignElements'">
|
||||||
<div class="img_operate_content">
|
<div class="img_operate_content left">
|
||||||
<div class="img_operate_block" :title="t('LibraryPage.Point')" @click.stop="editPlacementClick(img)" v-show="selectCode === 'Models'">
|
<div class="img_operate_block" :title="t('LibraryPage.Point')" @click.stop="editPlacementClick(img)" v-show="selectCode === 'Models'">
|
||||||
<span class="icon iconfont icon-dianwei operate_icon"></span>
|
<span class="icon iconfont icon-dianwei operate_icon"></span>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="img_operate_block">
|
||||||
|
<i class="fi fi-bs-expand-arrows-alt" @click.stop="scaleImage(index,imgList,'library')"></i>
|
||||||
|
</div>
|
||||||
<div class="img_operate_block" :title="t('LibraryPage.Rename')" @click.stop="showRenameModal(img,'total')">
|
<div class="img_operate_block" :title="t('LibraryPage.Rename')" @click.stop="showRenameModal(img,'total')">
|
||||||
<span class="icon iconfont icon-tianxie operate_icon"></span>
|
<span class="icon iconfont icon-tianxie operate_icon"></span>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="img_operate_content right">
|
||||||
<div class="img_operate_block" :title="t('LibraryPage.Delete')" @click.stop="deleteSinglePic(img,index)">
|
<div class="img_operate_block" :title="t('LibraryPage.Delete')" @click.stop="deleteSinglePic(img,index)">
|
||||||
<span class="icon iconfont icon-shanchu operate_icon"></span>
|
<span class="icon iconfont icon-shanchu operate_icon"></span>
|
||||||
</div>
|
|
||||||
<div class="img_operate_block">
|
|
||||||
<i class="fi fi-bs-expand-arrows-alt" @click.stop="scaleImage(index,imgList,'library')"></i>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -409,13 +411,15 @@
|
|||||||
<img :class="['content_img', ['Moodboard','Printboard'].indexOf(selectCode) > -1 ? 'board_content_img' :'']" v-lazy="img.imgUrl">
|
<img :class="['content_img', ['Moodboard','Printboard'].indexOf(selectCode) > -1 ? 'board_content_img' :'']" v-lazy="img.imgUrl">
|
||||||
|
|
||||||
<div class="img_item_hover">
|
<div class="img_item_hover">
|
||||||
<div class="img_operate_content">
|
<div class="img_operate_content left">
|
||||||
<div class="img_operate_block" :title="t('LibraryPage.Delete')" @click.stop="deleteGenerate(index)">
|
<div class="img_operate_block" :title="t('LibraryPage.Delete')" @click.stop="deleteGenerate(index)">
|
||||||
<span class="icon iconfont icon-shanchu operate_icon"></span>
|
<span class="icon iconfont icon-shanchu operate_icon"></span>
|
||||||
</div>
|
</div>
|
||||||
<div class="img_operate_block">
|
<div class="img_operate_block">
|
||||||
<i class="fi fi-bs-expand-arrows-alt" @click.stop="scaleImage(index,generateList[selectCode],'generate')"></i>
|
<i class="fi fi-bs-expand-arrows-alt" @click.stop="scaleImage(index,generateList[selectCode],'generate')"></i>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="img_operate_content right">
|
||||||
<div class="img_operate_block">
|
<div class="img_operate_block">
|
||||||
<i v-if="!img.like" class="fi fi-rr-heart operate_icon" @click.stop="likeFile(img,'like')"></i>
|
<i v-if="!img.like" class="fi fi-rr-heart operate_icon" @click.stop="likeFile(img,'like')"></i>
|
||||||
<i v-else class="fi fi-sr-heart operate_icon" :adminLike="!!img.like" @click.stop="likeFile(img,'noLike')"></i>
|
<i v-else class="fi fi-sr-heart operate_icon" :adminLike="!!img.like" @click.stop="likeFile(img,'noLike')"></i>
|
||||||
@@ -2096,12 +2100,21 @@ export default defineComponent({
|
|||||||
|
|
||||||
.img_operate_content{
|
.img_operate_content{
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 50%;
|
// top: 50%;
|
||||||
left: 50%;
|
// left: 50%;
|
||||||
transform: translate(-50%,-50%);
|
// transform: translate(-50%,-50%);
|
||||||
max-width: 90%;
|
// max-width: 90%;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-wrap: wrap;
|
flex-direction: column;
|
||||||
|
top: 1rem;
|
||||||
|
&.left{
|
||||||
|
left: 1rem;
|
||||||
|
right: auto;
|
||||||
|
}
|
||||||
|
&.right{
|
||||||
|
right: 1rem;
|
||||||
|
left: auto;
|
||||||
|
}
|
||||||
>div{
|
>div{
|
||||||
margin-bottom: .5rem;
|
margin-bottom: .5rem;
|
||||||
margin-right: .5rem;
|
margin-right: .5rem;
|
||||||
|
|||||||
Reference in New Issue
Block a user