detail submit preview完善

This commit is contained in:
X1627315083
2026-01-15 17:14:11 +08:00
parent 28b6153ab0
commit 0d0de45a25
9 changed files with 390 additions and 185 deletions

View File

@@ -4,7 +4,7 @@
<div class="back" v-show="isEditPattern.value">
<i class="fi fi-br-angle-left" @click="setBack"></i>
</div>
<modelNav ref="modelNav" @canvasReload="()=>$emit('canvasReload')" @addSketch="()=>$emit('addSketch')" @sketchSysToLibrary="()=>$emit('sketchSysToLibrary')" @deleteItem="deleteItem"></modelNav>
<modelNav ref="modelNav" @addSketch="()=>$emit('addSketch')" @sketchSysToLibrary="()=>$emit('sketchSysToLibrary')" @deleteItem="deleteItem"></modelNav>
</div>
<div class="modelindex_right" ref="modelindexRight">
<div class="detail_btn">
@@ -32,7 +32,7 @@
</i>
</div>
<position ref="position" @modelOnLoad="()=>$emit('modelOnLoad')" @canvasReload="()=>$emit('canvasReload')" @addSketch="()=>$emit('addSketch')" :imgDesignImg=imgDesignImg></position>
<position ref="position" @addSketch="()=>$emit('addSketch')" :imgDesignImg=imgDesignImg></position>
</div>
</div>
@@ -51,7 +51,7 @@ export default defineComponent({
components:{
position,modelNav
},
emits:['detailEdit','canvasReload','addSketch','revocation','oppositeRevocation','modelOnLoad','sketchSysToLibrary'],
emits:['detailEdit','addSketch','revocation','oppositeRevocation','sketchSysToLibrary'],
setup(props,{emit}) {
const {t} = useI18n()
const store = useStore();
@@ -71,8 +71,8 @@ export default defineComponent({
modelindexRight:null as any,
modelNav:null as any,
})
const getSubmitData = (value:any,boolean)=>{
return getDetailListDom.position.getSubmitData(value,boolean)
const getSubmitData = (value:any)=>{
return getDetailListDom.position.getSubmitData(value,)
}
const showDesignImgDetail = (str:any)=>{
emit('detailEdit',str)

View File

@@ -34,7 +34,7 @@ export default defineComponent({
components:{
position,
},
emits:['canvasReload','addSketch','deleteItem','sketchSysToLibrary'],
emits:['addSketch','deleteItem','sketchSysToLibrary'],
props:{
},
setup(props,{emit}) {
@@ -79,25 +79,25 @@ export default defineComponent({
detailData.selectDetail?.id &&
detailData?.getCanvasIfEdit?.fun&&detailData?.getCanvasIfEdit?.fun() > 0
){
Modal.confirm({
title: t('collectionModal.jsContent6'),
icon: createVNode(ExclamationCircleOutlined),
okText: 'Yes',
cancelText: 'No',
mask:false,
centered:true,
onOk() {
resolve(true)
emit('canvasReload')
},
onCancel(){
resolve(false)
}
});
resolve()
// Modal.confirm({
// title: t('collectionModal.jsContent6'),
// icon: createVNode(ExclamationCircleOutlined),
// okText: 'Yes',
// cancelText: 'No',
// mask:false,
// centered:true,
// onOk() {
// resolve(true)
// emit('canvasReload')
// },
// onCancel(){
// resolve(false)
// }
// });
}else{
resolve(true)
if(detailData.selectDetail.id !== item.id){
emit('canvasReload')
}
}
}).then((rv)=>{
@@ -117,7 +117,6 @@ export default defineComponent({
const maxObj = detailData.designDetail.clothes.find(item => item.priority === maxValue);
store.commit('DesignDetail/setDesignColthes',maxObj.id)
}
emit('canvasReload')
emit('deleteItem')
}
const addSketch = ()=>{

View File

@@ -49,7 +49,7 @@ export default defineComponent({
type:Boolean,
}
},
emits:['canvasReload','addSketch','modelOnLoad'],
emits:['addSketch'],
setup(props,{emit}) {
const {t} = useI18n()
const store = useStore();
@@ -137,7 +137,6 @@ export default defineComponent({
}
});
setTimeout(() => {
emit('modelOnLoad')
initMoveableForSelected()
},500);
};
@@ -403,7 +402,7 @@ export default defineComponent({
const upDataDetail = async ()=>{
//同步到selectDetail数据中
// getDetailListData.designDetail
let {scale,offset,priority,transpose,rotate,position,imageSize} = await getSubmitData(selectItem.selectDetail,false)
let {scale,offset,priority,transpose,rotate,position,imageSize} = await getSubmitData(selectItem.selectDetail)
selectItem.selectDetail.layersObject[0].scale = scale
selectItem.selectDetail.layersObject[1].scale = scale
selectItem.selectDetail.layersObject[0].offset = offset
@@ -428,9 +427,9 @@ export default defineComponent({
});
return arr
}
const getSubmitData = async (value:any,isNoComputed)=>{
const getSubmitData = async (value:any)=>{
let parentNode = document.getElementsByClassName('molepositon')[0].getElementsByClassName("designOpenrtion_imgMask")[0].getBoundingClientRect()
if(!detailData.frontBack?.body?.layersObject?.[0]?.imageSize || isNoComputed){
if(!detailData.frontBack?.body?.layersObject?.[0]?.imageSize){
return{
scale:value.layersObject[0].scale,
offset:value.layersObject[0].offset,