diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index 96baf9ff..20538dad 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -190,7 +190,7 @@ export default defineComponent({ watch(()=>detailData.selectDetail,async (newValue,oldValue)=>{ detailData.imgDomIndex = detailData.frontBack.front.findIndex((item:any)=>item.id == newValue.id) if(newValue?.path)await getSketchSize() - if(newValue?.id && (newValue.id != oldValue.id)){ + if(newValue?.id && (newValue?.id != oldValue?.id)){ store.commit('DesignDetail/changeCanvasKey') } // privewDetail(oldValue) diff --git a/src/component/Detail/detailRight/editPrintElement.vue b/src/component/Detail/detailRight/editPrintElement.vue index a93bd5fa..31d38a5a 100644 --- a/src/component/Detail/detailRight/editPrintElement.vue +++ b/src/component/Detail/detailRight/editPrintElement.vue @@ -379,9 +379,10 @@ export default defineComponent({ item.object.blendMode = 'source-over' } } - if(item.ifSingle){ + if(item.ifSingle && editPrintElementData.stateOverallSingle == 'single'){ editPrintElementData.printStyleList[props.type].single.push(item) - }else{ + } + if(!item.ifSingle && editPrintElementData.stateOverallSingle == 'overall'){ item.token = Date.now().toString() + (editPrintElementData.printStyleList[props.type].overall.length + '') // editPrintElementData.printStyleList[props.type].overall = [] editPrintElementData.printStyleList[props.type].overall.push(item) @@ -424,10 +425,10 @@ export default defineComponent({ editPrintElementData.printStyleList[props.type].single = [] editPrintElementData.printStyleList[props.type].overall = [] arr.forEach((item:any)=>{ - if(!item.ifSingle){ - editPrintElementData.stateOverallSingle = 'overall', - state = false - } + // if(!item.ifSingle){ + // editPrintElementData.stateOverallSingle = 'overall', + // state = false + // } getItemPosition(item) }) setItemPosition() @@ -471,16 +472,21 @@ export default defineComponent({ setPosition() },{immediate: true,}) watch(()=>editPrintElementData.stateOverallSingle,(newVal)=>{ - let arr = editPrintElementData.printStyleList[props.type][newVal] + let arr:any = editPrintElementData.selectDetail.newDetail?.print || editPrintElementData.selectDetail.printObject.prints + if(props.type == 'element'){ + arr = editPrintElementData.selectDetail.newDetail?.element || editPrintElementData.selectDetail.trims.prints + } + if(editPrintElementData.selectDetail.newDetail?.[editPrintElementData.currentDetailType]){ + arr = editPrintElementData.selectDetail.newDetail[editPrintElementData.currentDetailType] + } if(arr.length > 0){ editPrintElementData.imgDomIndex = 0 - if(newVal == 'overall'){ - editPrintElementData.printStyleList[props.type].single = [] - editPrintElementData.printStyleList[props.type].overall = [] + editPrintElementData.printStyleList[props.type][newVal] = [] + // editPrintElementData.printStyleList[props.type].single = [] + // editPrintElementData.printStyleList[props.type].overall = [] arr.forEach((item:any,index:number) => { getItemPosition(item) }); - } }else{ editPrintElementData.imgDomIndex = -1 }