From cd7d572e4391cc62b63d631faa77038cfc0d076f Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Thu, 22 Jan 2026 14:30:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=A6=96=E6=AC=A1=E6=89=93?= =?UTF-8?q?=E5=BC=80detail=20=E5=BA=94=E8=AF=A5=E4=BD=BF=E7=94=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=95=B0=E6=8D=AE=E8=80=8C=E4=B8=8D=E6=98=AFnew?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Detail/DesignDetail.vue | 30 +++++++++++-------- src/component/Detail/canvas/index.vue | 2 +- .../Detail/detailLeft/colorBox/index.vue | 1 - src/lang/en.ts | 2 +- 4 files changed, 19 insertions(+), 16 deletions(-) diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index ff753391..6f72c68c 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -331,15 +331,15 @@ export default defineComponent({ } const setClothes = async (list:any,str:string)=>{ let clothesList:any = [] - await uploadElement() if(detailData.isEditPattern.value == 'editSketch')await detailDom.canvasBox.submitBase64Data().then((rv)=>{ detailData.selectDetail.sketchString = rv }) if(detailDom.detailRight?.privewDetail)await (detailDom.detailRight as any).privewDetail() if(detailDom.canvasBox && (detailData.currentDetailType != 'sketch' || detailData.isEditPattern.value == 'canvasEditor')){ - let otherData = await updateOtherLayers('single') + let otherData = await updateOtherLayers(detailData.isEditPattern.value == 'canvasEditor'?'all':'single') await detailDom.canvasBox.updateOtherLayers(otherData) await detailDom.canvasBox.privewDetail() + await uploadElement() } for(let i = 0;i{ + detailData.loadingShow = true let workspace = store.state.Workspace.probjects let clothes:any = await setClothes(detailData.designDetail.clothes,'sub') let data = { @@ -494,7 +498,6 @@ export default defineComponent({ processId:userDetail.value.userId, probjectId:store.state.Workspace.probjects.id, } - detailData.loadingShow = true Https.axiosPost(Https.httpUrls.designSingle, data).then(async (rv)=>{ saveCanvasJSONToSession() // store.commit('DesignDetail/setPraeview',rv) @@ -526,8 +529,9 @@ export default defineComponent({ } const previwe = async ()=>{ detailData.loadingShow = true - if((detailData.currentDetailType == 'sketch' && !detailData.isEditPattern.value) || detailData.isEditPattern.value == 'editSketch'){ + if((detailData.currentDetailType == 'models' && !detailData.isEditPattern.value) || (detailData.currentDetailType == 'sketch' && !detailData.isEditPattern.value) || detailData.isEditPattern.value == 'editSketch'){ await getSubmitData('preview') + if(detailData.currentDetailType == 'models' && !detailData.isEditPattern.value)return await getSketchSize() detailDom.canvasBox.changeSketchUpdateFrontBack = async ()=>{ await detailDom.canvasBox.privewDetail() @@ -633,14 +637,14 @@ export default defineComponent({ }); }) } - const updateOtherLayers = async (str:any='all')=>{//更新到画布图层 + const updateOtherLayers = async (str:any='all',type:any='noFirst')=>{//更新到画布图层 let otherData:any = {} if(detailDom.detailRight?.privewDetail)await (detailDom.detailRight as any).privewDetail() if(str == 'all'){ otherData = { - color: detailData.selectDetail.newDetail?.color?.r?detailData.selectDetail.newDetail?.color:detailData.selectDetail.color, - printObject: detailData.selectDetail.newDetail?.print?.length>0?{prints:detailData.selectDetail.newDetail?.print}:detailData.selectDetail.printObject || null, - trims: detailData.selectDetail.newDetail?.element?.length>0?detailData.selectDetail.newDetail?.element:detailData.selectDetail.trims || null, + color: type == 'first'? detailData.selectDetail.color:detailData.selectDetail.newDetail?.color, + printObject: type == 'first'? detailData.selectDetail.printObject || null:{prints:detailData.selectDetail.newDetail?.print}, + trims: type == 'first'? detailData.selectDetail.trims || null:{prints:detailData.selectDetail.newDetail?.element}, } }else if(str == 'single'){ otherData = { @@ -661,10 +665,10 @@ 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?{prints:detailData.selectDetail.newDetail?.element}:detailData.selectDetail.trims || null + otherData.trims = {prints:detailData.selectDetail.newDetail?.element || []} } } return otherData diff --git a/src/component/Detail/canvas/index.vue b/src/component/Detail/canvas/index.vue index bcca72b7..3cdf8d69 100644 --- a/src/component/Detail/canvas/index.vue +++ b/src/component/Detail/canvas/index.vue @@ -338,7 +338,7 @@ export default defineComponent({ // },3000) // } const canvasLoadJsonSuccess = async ()=>{ - let otherData = await props.updateOtherLayers() + let otherData = await props.updateOtherLayers('all','first') await updateOtherLayers(otherData) if(detailData.changeSketchUpdateFrontBack){ await detailData.changeSketchUpdateFrontBack() diff --git a/src/component/Detail/detailLeft/colorBox/index.vue b/src/component/Detail/detailLeft/colorBox/index.vue index d278d1ce..382330b5 100644 --- a/src/component/Detail/detailLeft/colorBox/index.vue +++ b/src/component/Detail/detailLeft/colorBox/index.vue @@ -145,7 +145,6 @@ export default defineComponent({ colorData.selectDetail.color.rgba?.g == color?.rgba?.g && colorData.selectDetail.color.rgba?.b == color?.rgba?.b || (JSON.stringify(colorData.selectDetail.color.gradient) == JSON.stringify(color?.gradient) && colorData.selectDetail.color.gradient) - && colorData.selectDetail.color.rgba?.r ){ console.log(123) isNoSelect = true diff --git a/src/lang/en.ts b/src/lang/en.ts index 1794a793..ae823e1e 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -1184,7 +1184,7 @@ export default { CanvasTitle: { ModifySketch: 'Modify Sketch', ModifyItem: 'Modify Item', - RedGreen: 'Front and back section', + RedGreen: 'Edit Front and Back Section', }, Canvas: { Canvas: 'Canvas',