diff --git a/src/component/Detail/detailRight/editPrintElement.vue b/src/component/Detail/detailRight/editPrintElement.vue index 2e51f2ea..7c319f06 100644 --- a/src/component/Detail/detailRight/editPrintElement.vue +++ b/src/component/Detail/detailRight/editPrintElement.vue @@ -174,7 +174,6 @@ export default defineComponent({ type:props.type, imgDomIndex:-1, direction:'',//判断点的那条边 - printZIndex:2,//印花优先级 sketchWH:{ width:0, height:0, @@ -247,6 +246,11 @@ export default defineComponent({ const addPrintELement = async (data:any)=>{ if(!editPrintElementData.isSketchLoad)return let {scale,location} = await setScaleLocation(data) + let allElementPrint = [ + ...(editPrintElementData.selectDetail.printObject.prints || []), + ...(editPrintElementData.selectDetail.trims.prints || []), + ] + let printIndex = Math.max(...allElementPrint.map(item => item.priority)) + 1 let item = { angle:0, designType:data.designType, @@ -255,7 +259,7 @@ export default defineComponent({ location:editPrintElementData.stateOverallSingle == 'single'?location:[0,0], minIOPath:data.minIOPath || data.originalUrl, path:data.url, - priority:editPrintElementData.printZIndex, + priority:printIndex, scale, globalCompositeOperation:'', } @@ -286,7 +290,7 @@ export default defineComponent({ angle : item.pattern.transform.rotateZ, // angle : !this.overallSingle ? 0:item.pattern.transform.rotateZ, location : location, - priority:index, + priority:item.priority, scale: scale, designType:item.designType, level2Type:item.level2Type, @@ -301,10 +305,14 @@ export default defineComponent({ if(editPrintElementData.printStyleList[props.type].single.length>0){ sort(editPrintElementData.printStyleList[props.type].single) } + if(editPrintElementData.printStyleList[props.type].overall.length>0){ + sort(editPrintElementData.printStyleList[props.type].overall) + } editPrintElementData.printStyleList[props.type].overall.forEach((item:any)=>{ data.push(setData(item,index)) index++ }) + console.log(editPrintElementData.printStyleList[props.type].single) editPrintElementData.printStyleList[props.type].single.forEach((item:any)=>{ data.push(setData(item,index)) index++ @@ -357,7 +365,6 @@ export default defineComponent({ }, designOpenrtionBtn:false } - editPrintElementData.printZIndex++ item.pattern = pattern if(item.object){ @@ -518,7 +525,6 @@ export default defineComponent({ let scale = Number(editPrintElementDom.imgDom.children[0].style.transform?.split('scale(')[1]?.split(')')[0]) let rotateZ = Number(editPrintElementDom.imgDom.children[0].style.transform?.split('rotateZ(')[1]?.split('deg')[0]) editPrintElementData.printStyleList[props.type][editPrintElementData.stateOverallSingle][index].pattern.designOpenrtionBtn = true - // editPrintElementData.printStyleList[props.type][editPrintElementData.stateOverallSingle][index].pattern.style.zIndex = editPrintElementData.printZIndex++ editPrintElementData.printStyleList[props.type][editPrintElementData.stateOverallSingle][index].pattern.transform = { scale:scale, rotateZ:rotateZ?rotateZ:0, @@ -652,7 +658,6 @@ export default defineComponent({ top:editPrintElementDom.imgDom.offsetTop+'px', height:editPrintElementDom.imgDom.offsetHeight+'px', width:editPrintElementDom.imgDom.offsetWidth+'px', - // zIndex:editPrintElementData.printZIndex } document.removeEventListener('mousemove',sizeMouseMove) document.removeEventListener('touchmove',sizeTouchmove) @@ -836,6 +841,7 @@ export default defineComponent({ collItemSize.elList.forEach((elItem:any)=>{ let clothesIndex = arr.findIndex((item:any)=>item.uniqueId == elItem.uniqueId) arr[clothesIndex].pattern.style.zIndex = elItem.sort + arr[clothesIndex].priority = elItem.id.split('_')[0] // let clothesId = editPrintElementData.designDetail.clothes[clothesIndex].id // editPrintElementData.designDetail.clothes[clothesIndex].priority = elItem.sort // let frontIndex = editPrintElementData.frontBack_.front.findIndex((item:any)=>item.id == clothesId) @@ -856,7 +862,7 @@ export default defineComponent({ let arr:any = editPrintElementData.printStyleList[props.type][editPrintElementData.stateOverallSingle] arr.forEach((item,index) => {item.uniqueId = `${Date.now()}_${index}`}); - + console.log(arr) const sortedArray = [...arr].sort((a, b) => a.priority - b.priority); const sortMap = {} as any; sortedArray.forEach((item, index) => {