From 3c51d3fe85c8c4bcf9b2f3d7970d34795158f945 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 20 May 2024 14:45:43 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9detail=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E7=94=BB=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Detail/DesignDetail.vue | 16 ++++++++++------ src/component/HomePage/ExportModel.vue | 4 ++++ src/lang/en.ts | 2 +- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index cd244575..4a38a6ea 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -38,13 +38,14 @@
-
+ + + +
@@ -427,7 +428,7 @@ export default defineComponent({ this.designItemId = data.design.designItemId this.designOutfitId = data.design.designOutfitId let url = Https.httpUrls.getDesignDetail + `?designItemId=${data.design.designItemId}&designPythonOutfitId=${data.design.designOutfitId}` - // let url = Https.httpUrls.getDesignDetail + `?designItemId=45192&designPythonOutfitId=44898` + // let url = Https.httpUrls.getDesignDetail + `?designItemId=40660&designPythonOutfitId=40366` this.parentData = data this.loadingShow = true Https.axiosGet(url).then( @@ -1194,6 +1195,9 @@ export default defineComponent({ position: relative; width: auto; max-height: 100%; + + top: 50%; + transform: translateY(-50%); } &.active{ width: 100%; diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue index 24db1548..cee91a2f 100644 --- a/src/component/HomePage/ExportModel.vue +++ b/src/component/HomePage/ExportModel.vue @@ -626,6 +626,7 @@ export default defineComponent({ //设置导出 let setExport = async () => { + initAligningGuidelines(canvas,false) var imageDataURL = canvas.toDataURL({ format: "png", // 导出格式为 PNG quality: 1, // 图片质量为 1（最高质量） @@ -724,10 +725,13 @@ export default defineComponent({ if(driver__.value.driver){ driverObj__.moveNext() } + initAligningGuidelines(canvas,true) + }) .catch((res) => { // message.warning(t('HomeView.jsContent3')); isShowMark = false; + initAligningGuidelines(canvas,true) }); }; //关闭画布 diff --git a/src/lang/en.ts b/src/lang/en.ts index 58163e6d..468dcf15 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -55,7 +55,7 @@ export default { HDExport:'UpScale', Export:'Export', SR:'Please select the picture that requires upscale', - requiresCredits:'Performing upscale image requires a {data} integral', + requiresCredits:'Performing upscale image requires a {data} credits', Scale:'Scale', Cancel:'Cancel', jsContent1:'Canvas edit content is not saved, whether to leave the page', From a8fec3e5afdcd49f470160fe2f6a40e89f6644c1 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 20 May 2024 15:10:17 +0800 Subject: [PATCH 2/5] fix --- src/component/Detail/DesignDetail.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index 4a38a6ea..327fe1e6 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -38,7 +38,7 @@
- + @@ -1195,7 +1195,7 @@ export default defineComponent({ position: relative; width: auto; max-height: 100%; - + top: 50%; transform: translateY(-50%); } From 2424fcd74ec42f394b25b29374fe4e5627f6e934 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Tue, 21 May 2024 10:55:06 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E7=94=BB=E5=B8=83=E9=83=A8=E5=88=86=E4=BA=A4=E4=BA=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/HomePage/ExportModel.vue | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue index cee91a2f..f096c149 100644 --- a/src/component/HomePage/ExportModel.vue +++ b/src/component/HomePage/ExportModel.vue @@ -384,6 +384,13 @@ export default defineComponent({ canvas.on("mouse:out", event=>setCanvasOut(event)); canvas.on("mouse:down", event=>setCanvasDown(event)); canvas.on("mouse:up", event=>setCanvasUp(event)); + + //双击 + canvas.on("mouse:dblclick", event=>{ + if(operation.value == 'fold'){ + foldEnd('Enter') + } + }); // canvas.on('path:created', (event)=>{updateCanvasState()}); // canvas.on("selection:created", (event)=>{setZIndex(event)}); // canvas.on('object:removed', function() { @@ -1115,6 +1122,7 @@ export default defineComponent({ let uploadImage = (event)=>{ let input = document.querySelector('.uploadImage input') const file = event.target.files[0]; + setOperation('move') if (file) { const reader = new FileReader(); reader.onload = (e) => { @@ -1246,7 +1254,7 @@ export default defineComponent({ canvas.isDrawingMode = true let eraser = new fabric.EraserBrush(canvas) canvas.freeDrawingBrush = eraser - brushIndicator.set({fill: '#FFF'}); + brushIndicator.set({fill: '#fff'}); canvas.requestRenderAll(); canvas.freeDrawingBrush.isEraser = true canvas.freeDrawingBrush.width = canvasPencilWidth.value; @@ -1354,6 +1362,7 @@ export default defineComponent({ } //设置再画布上移动 let setCanvasMove = (event)=>{ + var pointer = canvas.getPointer(event.e); if(canvas.isDrawingMode){ canvas.setCursor('none'); @@ -1376,6 +1385,7 @@ export default defineComponent({ } //设置再画布上按下 let setCanvasDown = (event)=>{ + // brushIndicator.set({fill: '#FFF',strokeWidth:0}); //设置移动端按下添加元素 if(isMoible && present.checked){ present.checked = false From 1b48411eb5ca1d423419b74043e77b1a4949b0ec Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Tue, 21 May 2024 16:00:27 +0800 Subject: [PATCH 4/5] fix --- src/component/Administrator/TestClickData.vue | 4 +-- src/component/HomePage/ExportModel.vue | 31 ++++++++++--------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/src/component/Administrator/TestClickData.vue b/src/component/Administrator/TestClickData.vue index c49ae706..b856ded0 100644 --- a/src/component/Administrator/TestClickData.vue +++ b/src/component/Administrator/TestClickData.vue @@ -4,7 +4,7 @@
- State: + State Time:
- Time: + End Time:
diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue index f096c149..6abe2dde 100644 --- a/src/component/HomePage/ExportModel.vue +++ b/src/component/HomePage/ExportModel.vue @@ -106,7 +106,7 @@