From 66e4a5f12c54a53368340785aaf8e0e12af5219c Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Wed, 29 Nov 2023 16:30:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AF=AD=E8=A8=80=E9=80=82?= =?UTF-8?q?=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Detail/DesignDetail.vue | 2 +- src/component/Detail/habit.vue | 2 +- .../HomePage/ExportNewCoolection.vue | 31 ++++++++++++------- src/component/HomePage/Generate.vue | 2 +- src/component/HomePage/MoodboardUpload.vue | 16 +++++----- .../HomePage/NewCollectionReview.vue | 31 ++++++++++++------- src/component/HomePage/PrintboardUpload.vue | 2 +- src/component/HomePage/SketchboardUpload.vue | 2 +- src/component/LibraryPage/ModelPlacement.vue | 2 +- .../LibraryPage/ModelPlacementMobile.vue | 2 +- src/component/LibraryPage/setLabel.vue | 10 ++++-- src/lang/cn.ts | 6 ++-- src/lang/en.ts | 4 ++- src/lang/fr.ts | 4 ++- src/lang/it.ts | 4 ++- src/lang/ja.ts | 4 ++- src/lang/kr.ts | 4 ++- src/lang/ru.ts | 4 ++- src/lang/th.ts | 4 ++- src/lang/vn.ts | 4 ++- src/tool/guide.js | 22 ++++++++----- src/views/HomeView.vue | 3 +- src/views/LibraryPage.vue | 29 ++++++++++------- 23 files changed, 126 insertions(+), 68 deletions(-) diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index de1371f1..05d1ade0 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -356,7 +356,7 @@ export default defineComponent({ this.loadingShow = false if(this.driver__.driver){ nextTick().then(()=>{ - driverObj__.moveTo(20); + driverObj__.moveTo(18); }) } } diff --git a/src/component/Detail/habit.vue b/src/component/Detail/habit.vue index 28778473..77eac50c 100644 --- a/src/component/Detail/habit.vue +++ b/src/component/Detail/habit.vue @@ -595,7 +595,7 @@ export default defineComponent({ if(this.driver__.driver){ nextTick().then(()=>{ // driverObj__.moveNext(); - driverObj__.moveTo(30); + driverObj__.moveTo(28); }) } diff --git a/src/component/HomePage/ExportNewCoolection.vue b/src/component/HomePage/ExportNewCoolection.vue index caadf0e2..445c92ea 100644 --- a/src/component/HomePage/ExportNewCoolection.vue +++ b/src/component/HomePage/ExportNewCoolection.vue @@ -52,7 +52,7 @@
- +
@@ -95,7 +95,7 @@ export default defineComponent({ } }, watch: { - allBoardData:{ + sketchList:{ handler(newVal:any,oldVal:any){ // this.sketchList = [] // this.sketch = [[],[],[]] @@ -133,22 +133,31 @@ export default defineComponent({ if(this.sketchList){ for (let i = 0; i < this.sketchList.length; i++) { let arr = [sketch1,sketch2,sketch3] + let image = new Image() + image.src = this.sketchList[i].urlWithWhiteSide + arr.sort((a,b)=>{ var a_num = a["height"]; var b_num = b["height"]; return a_num - b_num; }) + // console.log(arr); this.sketch[arr[0].num]?.push(this.sketchList[i]) + // console.log([sketch1.height,sketch2.height,sketch3.height]); await new Promise((resolve:any)=>{ - nextTick().then(()=>{ - sketch1 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item0')[0]?.getBoundingClientRect() - sketch2 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item1')[0]?.getBoundingClientRect() - sketch3 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item2')[0]?.getBoundingClientRect() - sketch1.num = 0 - sketch2.num = 1 - sketch3.num = 2 - resolve() - }) + image.onload = ()=>{ + nextTick().then(()=>{ + sketch1 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item0')[0]?.getBoundingClientRect() + sketch2 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item1')[0]?.getBoundingClientRect() + sketch3 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item2')[0]?.getBoundingClientRect() + + sketch1.num = 0 + sketch2.num = 1 + sketch3.num = 2 + resolve() + }) + } + }) } } diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue index 1212ab44..228eb52d 100644 --- a/src/component/HomePage/Generate.vue +++ b/src/component/HomePage/Generate.vue @@ -454,7 +454,7 @@ export default defineComponent({ this.loadingShow = false }) if(this.driver__.driver){ - driverObj__.moveTo(5) + driverObj__.moveTo(3) } // if(){ // // driverObj__.moveNext() diff --git a/src/component/HomePage/MoodboardUpload.vue b/src/component/HomePage/MoodboardUpload.vue index 1fb08426..60143000 100644 --- a/src/component/HomePage/MoodboardUpload.vue +++ b/src/component/HomePage/MoodboardUpload.vue @@ -266,14 +266,14 @@ export default defineComponent({ // } } }, - driver__:{ - handler(newVal,oldVal){ - if(newVal.index >= 1 && newVal.index <= 2){ - this.open(newVal.index) - }else{ - } - } - } + // driver__:{ + // handler(newVal,oldVal){ + // if(newVal.index >= 1 && newVal.index <= 2){ + // this.open(newVal.index) + // }else{ + // } + // } + // } }, directives:{ modelImg:{ diff --git a/src/component/HomePage/NewCollectionReview.vue b/src/component/HomePage/NewCollectionReview.vue index aaecb769..1eb123c9 100644 --- a/src/component/HomePage/NewCollectionReview.vue +++ b/src/component/HomePage/NewCollectionReview.vue @@ -94,7 +94,7 @@ export default defineComponent({ } }, watch: { - allBoardData:{ + sketchList:{ handler(newVal:any,oldVal:any){ // this.sketchList = [] // this.sketch = [[],[],[]] @@ -110,7 +110,7 @@ export default defineComponent({ }, methods: { - setSketch(){ + setSketch(){ this.sketch = [[],[],[]] nextTick().then(async ()=>{ let sketch1:any = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item0')[0]?.getBoundingClientRect() @@ -122,22 +122,31 @@ export default defineComponent({ if(this.sketchList){ for (let i = 0; i < this.sketchList.length; i++) { let arr = [sketch1,sketch2,sketch3] + let image = new Image() + image.src = this.sketchList[i].urlWithWhiteSide + arr.sort((a,b)=>{ var a_num = a["height"]; var b_num = b["height"]; return a_num - b_num; }) + // console.log(arr); this.sketch[arr[0].num]?.push(this.sketchList[i]) + // console.log([sketch1.height,sketch2.height,sketch3.height]); await new Promise((resolve:any)=>{ - nextTick().then(()=>{ - sketch1 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item0')[0]?.getBoundingClientRect() - sketch2 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item1')[0]?.getBoundingClientRect() - sketch3 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item2')[0]?.getBoundingClientRect() - sketch1.num = 0 - sketch2.num = 1 - sketch3.num = 2 - resolve() - }) + image.onload = ()=>{ + nextTick().then(()=>{ + sketch1 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item0')[0]?.getBoundingClientRect() + sketch2 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item1')[0]?.getBoundingClientRect() + sketch3 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item2')[0]?.getBoundingClientRect() + + sketch1.num = 0 + sketch2.num = 1 + sketch3.num = 2 + resolve() + }) + } + }) } } diff --git a/src/component/HomePage/PrintboardUpload.vue b/src/component/HomePage/PrintboardUpload.vue index 92a9de60..f8458eb9 100644 --- a/src/component/HomePage/PrintboardUpload.vue +++ b/src/component/HomePage/PrintboardUpload.vue @@ -202,7 +202,7 @@ export default defineComponent({ printBoards:{ handler(newVal:any,oldVal:any){ if(newVal.length>=2 && this.driver__.driver && newVal.length!=oldVal.length){ - driverObj__.moveTo(9) + driverObj__.moveTo(7) } } } diff --git a/src/component/HomePage/SketchboardUpload.vue b/src/component/HomePage/SketchboardUpload.vue index fcd4676b..ea3c4275 100644 --- a/src/component/HomePage/SketchboardUpload.vue +++ b/src/component/HomePage/SketchboardUpload.vue @@ -347,7 +347,7 @@ export default defineComponent({ sketchboardList:{ handler(newVal:any,oldVal:any){ if(newVal.length>=2 && this.driver__.driver&& newVal.length!=oldVal.length){ - driverObj__.moveTo(16) + driverObj__.moveTo(14) } } } diff --git a/src/component/LibraryPage/ModelPlacement.vue b/src/component/LibraryPage/ModelPlacement.vue index 48b5174f..65ff51fa 100644 --- a/src/component/LibraryPage/ModelPlacement.vue +++ b/src/component/LibraryPage/ModelPlacement.vue @@ -718,7 +718,7 @@ export default defineComponent({ printPreview(){ let file = this.printObject.templateId ? null :this.printObject.file, models = { - libraryId:this.printObject.libraryId || null, + libraryId:this.printObject.relationId || null, templateId:this.printObject.templateId || null, timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone, ...this.getPrintLocation() diff --git a/src/component/LibraryPage/ModelPlacementMobile.vue b/src/component/LibraryPage/ModelPlacementMobile.vue index f52ebccc..c713435d 100644 --- a/src/component/LibraryPage/ModelPlacementMobile.vue +++ b/src/component/LibraryPage/ModelPlacementMobile.vue @@ -715,7 +715,7 @@ export default defineComponent({ printPreview(){ let file = this.printObject.templateId ? null :this.printObject.file, models = { - libraryId:this.printObject.libraryId || null, + libraryId:this.printObject.relationId || null, templateId:this.printObject.templateId || null, timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone, ...this.getPrintLocation() diff --git a/src/component/LibraryPage/setLabel.vue b/src/component/LibraryPage/setLabel.vue index 50b53a92..76d1362a 100644 --- a/src/component/LibraryPage/setLabel.vue +++ b/src/component/LibraryPage/setLabel.vue @@ -11,7 +11,7 @@ >