From 6393952e527af53026c8ac9992e682c9826dfb7d Mon Sep 17 00:00:00 2001 From: wxd <1627315083@qq.com> Date: Fri, 13 Sep 2024 21:26:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Detail/DesignDetail.vue | 2 +- src/component/Detail/DesignDetailAlter.vue | 4 +- src/component/Detail/DesignElements.vue | 71 +++++++-------- src/component/Detail/DesignElementsMobile.vue | 87 ++++++++++--------- src/component/Detail/DesignPrintOperation.vue | 2 +- .../Detail/DesignPrintOperationMobile.vue | 6 +- src/component/LibraryPage/searchLabel.vue | 10 +-- src/lang/cn.ts | 1 + src/lang/en.ts | 1 + src/store/userHabit/userHabit.ts | 4 +- src/views/HomeView/library.vue | 14 ++- 11 files changed, 108 insertions(+), 94 deletions(-) diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index 0f997d21..17e9f000 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -123,7 +123,7 @@
-
Current Elements
+
{{ $t('DesignDetail.CurrentElements') }}
diff --git a/src/component/Detail/DesignDetailAlter.vue b/src/component/Detail/DesignDetailAlter.vue index b89506cf..e90622c1 100644 --- a/src/component/Detail/DesignDetailAlter.vue +++ b/src/component/Detail/DesignDetailAlter.vue @@ -589,8 +589,8 @@ export default defineComponent({ this.upload.level1Type = 'Sketchboard' this.uploadList = this.apparelList this.designTypeList = this.sketchCatecoryList - this.designType = this.current.type - // this.designType = this.designTypeList[0].value + // this.designType = this.current.type + this.designType = this.designTypeList[0].value }else if (num == 2){ this.selectCode = 'Printboard' this.upload.level1Type = 'Printboard' diff --git a/src/component/Detail/DesignElements.vue b/src/component/Detail/DesignElements.vue index 48cf7d8e..599ac3fb 100644 --- a/src/component/Detail/DesignElements.vue +++ b/src/component/Detail/DesignElements.vue @@ -277,8 +277,6 @@ export default defineComponent({ location:[0,0] }) this.refetchTemplate(currentIndex) - - }, //设置移动 itemMoveMousedown(index,event){ @@ -378,7 +376,6 @@ export default defineComponent({ //判断尺寸是否到边 this.printStyleList[this.imgDomIndex].style.width = width this.printStyleList[this.imgDomIndex].style.height = height - }, //鼠标抬起 sizeMouseup(e){ @@ -441,38 +438,44 @@ export default defineComponent({ await this.setPrintWH(item.path) this.designSelectElementsList let sketch = document.getElementsByClassName("designElements_modal")[0]?.getElementsByClassName('designElements_sketch')[0] - let sketchNum = this.sketch.width.replace(/rem/g,'')*10/sketch.offsetWidth - let scale - scale = (this.print.width.replace(/px/g,'')*sketchNum/this.print.width.replace(/px/g,'')) - let zIndex = 1 - let left = item.location[0]/sketchNum+'px' - let top = item.location[1]/sketchNum+'px' - if(sketch.offsetWidth < item.location[0]/sketchNum){ - left = sketch.offsetWidth +'px' - } - if(sketch.offsetHeight < item.location[1]/sketchNum){ - top = sketch.offsetHeight +'px' - } - this.printStyleList[index]={ - centers:{ - left:0, - top:0, - }, - style:{ - left:left, - top:top, - right:"auto", - bottom:"auto", - width:this.print.width.replace(/px/g,'')/sketchNum*item.scale+'px', - height:this.print.height.replace(/px/g,'')/sketchNum*item.scale+'px', - zIndex:zIndex++ - }, - transform:{ - // scale:scale<.2?.2:scale,//0.2-3 - rotateZ:item.angle, - }, - designElementsBtn:false + let sketchImg = new Image() + sketchImg.onload = ()=>{ + let sketchNum = this.sketch.width.replace(/rem/g,'')*10/sketch.offsetWidth + let scale + scale = (this.print.width.replace(/px/g,'')*sketchNum/this.print.width.replace(/px/g,'')) + let zIndex = 1 + let left = item.location[0]/sketchNum+'px' + let top = item.location[1]/sketchNum+'px' + if(sketch.offsetWidth < item.location[0]/sketchNum){ + left = sketch.offsetWidth +'px' + } + if(sketch.offsetHeight < item.location[1]/sketchNum){ + top = sketch.offsetHeight +'px' + } + this.printStyleList[index]={ + centers:{ + left:0, + top:0, + }, + style:{ + left:left, + top:top, + right:"auto", + bottom:"auto", + width:this.print.width.replace(/px/g,'')/sketchNum*item.scale+'px', + height:this.print.height.replace(/px/g,'')/sketchNum*item.scale+'px', + zIndex:zIndex++ + }, + transform:{ + // scale:scale<.2?.2:scale,//0.2-3 + rotateZ:item.angle, + }, + designElementsBtn:false + } + sketchImg.remove() } + sketchImg.src = sketch.src + }, computeZindex(resolve,prints){ prints.sort((a, b) => { diff --git a/src/component/Detail/DesignElementsMobile.vue b/src/component/Detail/DesignElementsMobile.vue index 2d013746..692f6cc1 100644 --- a/src/component/Detail/DesignElementsMobile.vue +++ b/src/component/Detail/DesignElementsMobile.vue @@ -43,7 +43,7 @@ v-for="item,index in exhibitionElementsList" :key="item" :style="[printStyleList?.[index]?.style]" - @touchstart.stop="itemMoveMousedown(index,$event)" + @touchstart.passive="itemMoveMousedown(index,$event)" class="modal_imgItem" ref="content" > @@ -52,7 +52,7 @@
-
    +
    • @@ -305,12 +305,12 @@ export default defineComponent({ itemSizeMousedown(direction,event){ this.direction = direction this.imgDom = document.getElementsByClassName('designElementsMobile_modal')[0].getElementsByClassName("modal_imgItem")[this.imgDomIndex] - let scale = Number(this.imgDom.style.transform?.split('scale(')[1]?.split(')')[0]) - let rotateZ = Number(this.imgDom.style.transform?.split('rotateZ(')[1]?.split('deg')[0]) + let scale = Number(this.imgDom.children[0].style.transform?.split('scale(')[1]?.split(')')[0]) + let rotateZ = Number(this.imgDom.children[0].style.transform?.split('rotateZ(')[1]?.split('deg')[0]) this.printStyleList[this.imgDomIndex].designElementsBtn = true this.printStyleList[this.imgDomIndex].transform = { scale:scale, - rotateZ:rotateZ, + rotateZ:rotateZ?rotateZ:0, } let imgDomWH = this.imgDom.getBoundingClientRect() let li = document.getElementsByClassName('designElementsMobile_modal')[0].getElementsByClassName("designElementsMobile_btn_top")[0].offsetWidth/2 @@ -393,13 +393,9 @@ export default defineComponent({ document.removeEventListener("touchmove", this.sizeMousemove); }, touchend(e) { - document.removeEventListener("touchend", this.touchend); document.removeEventListener("touchmove", this.moveMousemove); }, - - - deletePrint(){ this.exhibitionElementsList.splice(this.imgDomIndex,1) this.printStyleList.splice(this.imgDomIndex,1) @@ -442,38 +438,46 @@ export default defineComponent({ await this.setPrintWH(item.path) this.designElementsList let sketch = document.getElementsByClassName("designElementsMobile_modal")[0]?.getElementsByClassName('designElementsMobile_sketch')[0] - let sketchNum = this.sketch.width.replace(/rem/g,'')*10/sketch.offsetWidth - let scale - scale = (this.print.width.replace(/px/g,'')*sketchNum/this.print.width.replace(/px/g,'')) - let zIndex = 1 - let left = item.location[0]/sketchNum+'px' - let top = item.location[1]/sketchNum+'px' - if(sketch.offsetWidth < item.location[0]/sketchNum){ - left = sketch.offsetWidth +'px' - } - if(sketch.offsetHeight < item.location[1]/sketchNum){ - top = sketch.offsetHeight +'px' - } - this.printStyleList[index]={ - centers:{ - left:0, - top:0, - }, - style:{ - left:left, - top:top, - right:"auto", - bottom:"auto", - width:this.print.width.replace(/px/g,'')/sketchNum*item.scale+'px', - height:this.print.height.replace(/px/g,'')/sketchNum*item.scale+'px', - zIndex:zIndex++ - }, - transform:{ - // scale:scale<.2?.2:scale,//0.2-3 - rotateZ:item.angle, - }, - designElementsBtn:false + let sketchImg = new Image() + sketchImg.onload = ()=>{ + let sketchNum = this.sketch.width.replace(/rem/g,'')*10/sketch.offsetWidth + let scale + scale = (this.print.width.replace(/px/g,'')*sketchNum/this.print.width.replace(/px/g,'')) + let zIndex = 1 + let left = item.location[0]/sketchNum+'px' + let top = item.location[1]/sketchNum+'px' + if(sketch.offsetWidth < item.location[0]/sketchNum){ + left = sketch.offsetWidth +'px' + } + if(sketch.offsetHeight < item.location[1]/sketchNum){ + top = sketch.offsetHeight +'px' + } + console.log(sketch.offsetWidth,this.sketch.width.replace(/rem/g,'')); + + this.printStyleList[index]={ + centers:{ + left:0, + top:0, + }, + style:{ + left:left, + top:top, + right:"auto", + bottom:"auto", + width:this.print.width.replace(/px/g,'')/sketchNum*item.scale+'px', + height:this.print.height.replace(/px/g,'')/sketchNum*item.scale+'px', + zIndex:zIndex++ + }, + transform:{ + // scale:scale<.2?.2:scale,//0.2-3 + rotateZ:item.angle, + }, + designElementsBtn:false + } + sketchImg.remove() } + sketchImg.src = sketch.src + }, computeZindex(resolve,prints){ prints.sort((a, b) => { @@ -523,9 +527,6 @@ export default defineComponent({ index = ind } }) - let priority = designItemDetail.clothes.map((v)=>{ - return v.type - }) // let data = { // ...designItemDetail, // priority:priority, diff --git a/src/component/Detail/DesignPrintOperation.vue b/src/component/Detail/DesignPrintOperation.vue index 55629ae6..fae1bcc5 100644 --- a/src/component/Detail/DesignPrintOperation.vue +++ b/src/component/Detail/DesignPrintOperation.vue @@ -474,7 +474,7 @@ export default defineComponent({ this.printStyleList[this.stateOverallSingle][this.imgDomIndex].designOpenrtionBtn = true this.printStyleList[this.stateOverallSingle][this.imgDomIndex].transform = { scale:scale, - rotateZ:rotateZ, + rotateZ:rotateZ?rotateZ:0, } let imgDomWH = this.imgDom.getBoundingClientRect() let li = document.getElementsByClassName('designOpenrtion_modal')[0].getElementsByClassName("designOpenrtion_btn_top")[0].offsetWidth/2 diff --git a/src/component/Detail/DesignPrintOperationMobile.vue b/src/component/Detail/DesignPrintOperationMobile.vue index a6e03391..7980bce2 100644 --- a/src/component/Detail/DesignPrintOperationMobile.vue +++ b/src/component/Detail/DesignPrintOperationMobile.vue @@ -467,12 +467,12 @@ export default defineComponent({ itemSizeMousedown(direction,event){ this.direction = direction this.imgDom = document.getElementsByClassName('designOpenrtionMobile_modal')[0].getElementsByClassName("modal_imgItem")[this.imgDomIndex] - let scale = Number(this.imgDom.style.transform?.split('scale(')[1]?.split(')')[0]) - let rotateZ = Number(this.imgDom.style.transform?.split('rotateZ(')[1]?.split('deg')[0]) + let scale = Number(this.imgDom.children[0].style.transform?.split('scale(')[1]?.split(')')[0]) + let rotateZ = Number(this.imgDom.children[0].style.transform?.split('rotateZ(')[1]?.split('deg')[0]) this.printStyleList[this.stateOverallSingle][this.imgDomIndex].designOpenrtionBtn = true this.printStyleList[this.stateOverallSingle][this.imgDomIndex].transform = { scale:scale, - rotateZ:rotateZ, + rotateZ:rotateZ?rotateZ:0, } let imgDomWH = this.imgDom.getBoundingClientRect() let li = document.getElementsByClassName('designOpenrtionMobile_modal')[0].getElementsByClassName("designOpenrtionMobile_btn_top")[0].offsetWidth/2 diff --git a/src/component/LibraryPage/searchLabel.vue b/src/component/LibraryPage/searchLabel.vue index 03cf4693..aa155d3c 100644 --- a/src/component/LibraryPage/searchLabel.vue +++ b/src/component/LibraryPage/searchLabel.vue @@ -235,13 +235,13 @@ export default defineComponent({ let arr:any = [] rv.forEach((item:any) => { arr.push({ - name:item.name, - value:item.value, + name:item.value, + value:item.name, }) }); - this.designType = rv[0] - this.editDesignType = rv[0] - this.disignTypeList = rv + this.designType = arr[0] + this.editDesignType = arr[0] + this.disignTypeList = arr // this.workspaceItem.position = this.singleTypeList[0].label } }) diff --git a/src/lang/cn.ts b/src/lang/cn.ts index f714cfb2..d024ec82 100644 --- a/src/lang/cn.ts +++ b/src/lang/cn.ts @@ -450,6 +450,7 @@ export default { editSketchTitle:'修改草图', CurrentPrint:'当前印花', CurrentColor:'当前颜色', + CurrentElements:'当前元素', }, DesignDetailAlter:{ Upload:'上传', diff --git a/src/lang/en.ts b/src/lang/en.ts index f03c56c7..5fa6bb18 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -451,6 +451,7 @@ export default { editSketchTitle:'Modify sketch', CurrentPrint:'Current Print', CurrentColor:'Current Color', + CurrentElements:'Current Elements', }, DesignDetailAlter:{ Upload:'Upload', diff --git a/src/store/userHabit/userHabit.ts b/src/store/userHabit/userHabit.ts index b7a56e44..9cd15597 100644 --- a/src/store/userHabit/userHabit.ts +++ b/src/store/userHabit/userHabit.ts @@ -103,7 +103,7 @@ const userHabit : Module = { }); }) }, - getLangType(context){ + async getLangType(context){ let allPromise = []; let getList = ['DesignElementsEnum','PrintboardLevel2TypeEnum','FemalePosition','MalePosition'] let axiosGet = (item:any)=>{ @@ -130,7 +130,7 @@ const userHabit : Module = { }) }) } - return Promise.all(getList.map(item => axiosGet(item))) + return await Promise.all(getList.map(item => axiosGet(item))) // Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:'DesignElementsEnum'}}).then((rv: any) => { // if (rv) { // rv.forEach((item:any) => { diff --git a/src/views/HomeView/library.vue b/src/views/HomeView/library.vue index 6ec82f65..ea4f043f 100644 --- a/src/views/HomeView/library.vue +++ b/src/views/HomeView/library.vue @@ -342,7 +342,7 @@ -
      +
      @@ -388,6 +388,11 @@ export default defineComponent({ sketchCategory, createSlogan, }, + props:{ + getLangIsShowMark:{ + type:Boolean, + } + }, setup() { const store = useStore(); let menuList = computed(()=>{ @@ -613,7 +618,6 @@ export default defineComponent({ this.uploadUrl = getUploadUrl() this.getLibraryList('') this.getClass() - this.getSex() this.token = getCookie("token") || ""; this.workspace = computed(()=>{ return this.store?.state?.Workspace?.workspace @@ -646,7 +650,8 @@ export default defineComponent({ // params = 'MalePosition' // } this.store.commit('setPosition',this.sex) - this.designType = this.designTypeList.Sketchboard?.[0].value + this.designType = this.store.state.UserHabit.Position?.[0].value + // this.designType = this.designTypeList?.Sketchboard?.[0].value // await Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:params}}).then((rv: any) => { // if (rv) { @@ -722,6 +727,9 @@ export default defineComponent({ if(this.selectCode != 'DesignElements'){ this.getClass() } + if(this.selectCode == 'Sketchboard')this.getSex() + + this.getLibraryList('') this.captionGeneration = '' this.selectGenerateList = []