diff --git a/src/component/Canvas/CanvasEditor/managers/PartManager.js b/src/component/Canvas/CanvasEditor/managers/PartManager.js index 6d593eac..339cde7e 100644 --- a/src/component/Canvas/CanvasEditor/managers/PartManager.js +++ b/src/component/Canvas/CanvasEditor/managers/PartManager.js @@ -425,6 +425,7 @@ export class PartManager { // this.partGroup.add(path); this.canvas.add(path); this.canvas.renderAll(); + this.clearPart(); } /** 清空点位 */ clearPart() { diff --git a/src/component/Canvas/OverallCanvas/index.vue b/src/component/Canvas/OverallCanvas/index.vue index 0a6fad00..1e7e0d80 100644 --- a/src/component/Canvas/OverallCanvas/index.vue +++ b/src/component/Canvas/OverallCanvas/index.vue @@ -197,11 +197,11 @@ const cwidth = canvas.width; const cheight = canvas.height; let image = await urlToCanvas(item.path); - let offsetX = item.location[0]; - let offsetY = item.location[1]; let scaleX = ((cwidth / image.width) * item.scale[0]) / 5; let scaleY = ((cheight / image.height) * item.scale[1]) / 5; let scale = cwidth > cheight ? scaleX : scaleY; + let offsetX = item.location[0] * cwidth / props.width - (image.width * scale) / 2; + let offsetY = item.location[1] * cheight / props.height - (image.height * scale) / 2; let angle = item.angle; let gapX = item.object.gapX; let gapY = item.object.gapY; diff --git a/src/component/Detail/detailRight/editPrintElement.vue b/src/component/Detail/detailRight/editPrintElement.vue index f0fff224..3a3ef935 100644 --- a/src/component/Detail/detailRight/editPrintElement.vue +++ b/src/component/Detail/detailRight/editPrintElement.vue @@ -898,13 +898,14 @@ export default defineComponent({ } const inputFillOffset = (offset:any)=>{ let arr = editPrintElementData.printStyleList[props.type].overall - arr[editPrintElementData.imgDomIndex].location = [offset.left * offset.size[0] / 100,offset.top * offset.size[1] / 100] + let location = [offset.left * offset.size[0] / 100,offset.top * offset.size[1] / 100] + arr[editPrintElementData.imgDomIndex].location = location editPrintElementDom.pingpuRef.updataList([ { action: ACTIONS.UPDATE, token: arr[editPrintElementData.imgDomIndex].token, key: 'location[0]', - value: offset.left, + value: location[0], }, ]); editPrintElementDom.pingpuRef.updataList([ @@ -912,7 +913,7 @@ export default defineComponent({ action: ACTIONS.UPDATE, token: arr[editPrintElementData.imgDomIndex].token, key: 'location[1]', - value: offset.top, + value: location[1], }, ]); // editPrintElementData.overallDetail.offsetX = offset.left diff --git a/src/component/Detail/detailRight/overallSetting/RepeatSetting.vue b/src/component/Detail/detailRight/overallSetting/RepeatSetting.vue index a16ce2ae..b1142f27 100644 --- a/src/component/Detail/detailRight/overallSetting/RepeatSetting.vue +++ b/src/component/Detail/detailRight/overallSetting/RepeatSetting.vue @@ -92,6 +92,7 @@ let img = new Image(); let size = [0,0]; img.src = props.sketchPath; + console.log(props.sketchPath) await new Promise((resolve, reject) => { img.onload = () => { size = [img.width, img.height]