diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index 3f0e7ca4..0814af8e 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -759,7 +759,6 @@ export default defineComponent({ const uploadSelectDetail = async ()=>{//更新选中的detail // await detailDom.canvasBox.saveCanvas() const allInfo = await (detailDom.canvasBox as any).getCanvasElement() - console.log(allInfo) let color:any = {} if(allInfo.color?.color?.rgba || allInfo.color?.color?.gradient){ let canvasColor = allInfo.color.color; diff --git a/src/component/Detail/canvas/index.vue b/src/component/Detail/canvas/index.vue index 5451aeea..6023a4e6 100644 --- a/src/component/Detail/canvas/index.vue +++ b/src/component/Detail/canvas/index.vue @@ -12,7 +12,6 @@ is-edit :clothingImageUrl="selectDetail.path" :clothingImageUrl2="selectDetail.maskUrl || selectDetail.layersObject[0].maskUrl" - :clothingMinIOPath="selectDetail.minIOPath" showFixedLayer :canvasJSON="canvasJSON" @canvasLoadJsonSuccess="canvasLoadJsonSuccess" diff --git a/src/component/Detail/detailRight/editPrintElement.vue b/src/component/Detail/detailRight/editPrintElement.vue index 4fcf2db0..ae2b63a8 100644 --- a/src/component/Detail/detailRight/editPrintElement.vue +++ b/src/component/Detail/detailRight/editPrintElement.vue @@ -273,7 +273,7 @@ export default defineComponent({ minIOPath:data.minIOPath || data.originalUrl, path:data.url, priority:printIndex, - scale, + scale:editPrintElementData.stateOverallSingle == 'single'?scale:[1,1], globalCompositeOperation:'', } getItemPosition(item) @@ -361,7 +361,7 @@ export default defineComponent({ //overall left = item.location[0] / editPrintElementData.sketchWH.scale[0] top = item.location[1] / editPrintElementData.sketchWH.scale[1] - item.scale = [1,1] + item.scale = item.scale || [1,1] } let pattern = { centers:{left:0,top:0}, diff --git a/src/component/Detail/detailRight/overallSetting/RepeatSetting.vue b/src/component/Detail/detailRight/overallSetting/RepeatSetting.vue index 05a30feb..b7c6d5ab 100644 --- a/src/component/Detail/detailRight/overallSetting/RepeatSetting.vue +++ b/src/component/Detail/detailRight/overallSetting/RepeatSetting.vue @@ -25,7 +25,7 @@
Gap X Gap Y { // let scaleValue = props.object?.scale/10; // return props.object?.scale/10; - return props.object?.scale[0] * 100; + return (props.object?.scale[0] * 100).toFixed(0); }); const scalePrint = computed(() => { let index = sketchWH.value[0] > sketchWH.value[1]?0:1;