diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index 71816a17..7e229bdb 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -619,13 +619,13 @@ export default defineComponent({ } } if(detailData.currentDetailType == 'print'){ - otherData.printObject = detailData.selectDetail.newDetail?.print?.length>0?{prints:detailData.selectDetail.newDetail?.print}:detailData.selectDetail.printObject || null + otherData.printObject = {prints:detailData.selectDetail.newDetail?.print} } if(detailData.currentDetailType == 'element'){ - otherData.trims = detailData.selectDetail.newDetail?.element?.length>0?detailData.selectDetail.newDetail?.element:detailData.selectDetail.trims || null + otherData.trims = detailData.selectDetail.newDetail?.element } } - console.log(otherData,'=======',detailData.selectDetail) + console.log(JSON.parse(JSON.stringify(otherData)),'=======',JSON.parse(JSON.stringify(detailData.selectDetail))) return otherData } const uploadElement = async ()=>{//取出画布数据更新到detail diff --git a/src/component/Detail/canvas/index.vue b/src/component/Detail/canvas/index.vue index e12f7884..676a11ab 100644 --- a/src/component/Detail/canvas/index.vue +++ b/src/component/Detail/canvas/index.vue @@ -181,13 +181,13 @@ export default defineComponent({ if(oldSelectDetail?.partialDesign)oldSelectDetail.partialDesign.partialDesignBase64 = rv }) //包含平铺图层 single+overall模式的图 - await detailDom.editCanvas.exportImage({isContainFixed:true,isPrintTrimsNoRepeat:true,isPrintTrimsRepeat:true,isContainNormalLayer:false}).then((rv)=>{ - oldSelectDetail.undividedLayerWithSinglePrint = rv - }) + // await detailDom.editCanvas.exportImage({isContainFixed:true,isPrintTrimsNoRepeat:true,isPrintTrimsRepeat:true,isContainNormalLayer:false}).then((rv)=>{ + // oldSelectDetail.undividedLayerWithSinglePrint = rv + // }) //不包含平铺图层overall模式的图 - await detailDom.editCanvas.exportImage({isContainFixed:true,isPrintTrimsNoRepeat:false,isPrintTrimsRepeat:true,isContainNormalLayer:false}).then((rv)=>{ - oldSelectDetail.undividedLayer = rv - }) + // await detailDom.editCanvas.exportImage({isContainFixed:true,isPrintTrimsNoRepeat:false,isPrintTrimsRepeat:true,isContainNormalLayer:false}).then((rv)=>{ + // oldSelectDetail.undividedLayer = rv + // }) res('') }) } @@ -336,11 +336,16 @@ export default defineComponent({ const canvasLoadJsonSuccess = async ()=>{ let otherData = await props.updateOtherLayers() updateOtherLayers(otherData) - if(detailData.selectDetail.undividedLayerColor){ + if(!detailData.selectDetail.undividedLayerColor){ await detailDom.editCanvas.exportImage({isContainFixed:true,isPrintTrimsRepeat:false,isPrintTrimsNoRepeat:false,isContainNormalLayer:false}).then((rv)=>{ detailData.selectDetail.undividedLayerColor = rv }) } + if(!detailData.selectDetail.undividedLayer){ + await detailDom.editCanvas.exportImage({isContainFixed:true,isPrintTrimsNoRepeat:false,isPrintTrimsRepeat:true,isContainNormalLayer:false}).then((rv)=>{ + detailData.selectDetail.undividedLayer = rv + }) + } } const submitBase64Data = ()=>{ diff --git a/src/component/Detail/detailRight/editPrintElement.vue b/src/component/Detail/detailRight/editPrintElement.vue index 8ee209a3..4c9beacc 100644 --- a/src/component/Detail/detailRight/editPrintElement.vue +++ b/src/component/Detail/detailRight/editPrintElement.vue @@ -385,12 +385,15 @@ export default defineComponent({ item.token = Date.now().toString() + (editPrintElementData.printStyleList[props.type].overall.length + '') // editPrintElementData.printStyleList[props.type].overall = [] editPrintElementData.printStyleList[props.type].overall.push(item) - editPrintElementDom.pingpuRef.updataList([ - { - action: ACTIONS.ADD, - data: item, - }, - ]); + setTimeout(()=>{ + editPrintElementDom.pingpuRef.updataList([ + { + action: ACTIONS.ADD, + data: item, + }, + ]); + }) + } } const setPosition = ()=>{