diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index ca08fc5a..7be84916 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -190,7 +190,9 @@ 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() - detailData.canvasKey += 1 + if(newValue?.id && oldValue?.id && (newValue.id != oldValue.id)){ + detailData.canvasKey += 1 + } // privewDetail(oldValue) },{immediate: true}) provide('getCanvasIfEdit',detailData.getCanvasIfEdit) diff --git a/src/component/Detail/canvas/index.vue b/src/component/Detail/canvas/index.vue index d5ff8c8a..c3e24d92 100644 --- a/src/component/Detail/canvas/index.vue +++ b/src/component/Detail/canvas/index.vue @@ -285,7 +285,7 @@ export default defineComponent({ }) } - const editSketchCanvasInit = (value:any)=>{ + const editSketchCanvasInit = async (value:any)=>{ detailData.canvasInstance = value detailData.getCanvasIfEdit.fun = getCanvasLength detailData.isShowMark = false @@ -343,7 +343,7 @@ export default defineComponent({ const canvasLoadJsonSuccess = async ()=>{ let otherData = await props.updateOtherLayers() await updateOtherLayers(otherData) - await setUndivideLayer() + setUndivideLayer() } const setUndivideLayer = async ()=>{ await new Promise(async (resolve, reject) => { @@ -355,6 +355,7 @@ export default defineComponent({ isContainNormalLayer:false, width:props.sketchSize.width, height:props.sketchSize.height}).then((rv)=>{ + console.log('====================',rv) detailData.selectDetail.undividedLayerColor = rv }) // } @@ -394,6 +395,7 @@ export default defineComponent({ // privewDetail() }) onMounted(()=>{ + console.log('==========================',detailData.canvasLoad) nextTick(async ()=>{ // detailData.currentView = 'canvasEditor' const sessionCanvasList = sessionStorage.getItem('canvasList'); diff --git a/src/component/Detail/detailRight/editPrintElement.vue b/src/component/Detail/detailRight/editPrintElement.vue index 033bc1e6..2518fef5 100644 --- a/src/component/Detail/detailRight/editPrintElement.vue +++ b/src/component/Detail/detailRight/editPrintElement.vue @@ -373,6 +373,9 @@ export default defineComponent({ gapX: 0, gapY: 0, } + if(props.type == 'element'){ + item.object.blendMode = 'source-over' + } } if(item.ifSingle){ editPrintElementData.printStyleList[props.type].single.push(item)