不等比缩放

This commit is contained in:
X1627315083
2024-05-27 17:57:37 +08:00
parent 8e60a51d9f
commit 9efa1fa03a
13 changed files with 78 additions and 35 deletions

View File

@@ -86,7 +86,7 @@
<i v-else class="fi fi-rr-picture centent clothes_item_icon" @click="openCurrent(1)"></i>
</div>
<div class="clothes_detail_item clothes_detail_item_print" :class="[current.id?'':'hideCursor']">
<div class="clothes_detail_item clothes_detail_item_print" :class="[current?.id?'':'hideCursor']">
<div class="clothes_item_header">
<i class="fi fi-rs-comments"></i>
<div>{{ $t('DesignDetail.CurrentPrint') }}</div>
@@ -100,7 +100,7 @@
</div>
</div>
<div class="clothes_detail_item clothes_detail_item_color" :class="[current.id?'':'hideCursor']">
<div class="clothes_detail_item clothes_detail_item_color" :class="[current?.id?'':'hideCursor']">
<div class="clothes_item_header">
<i class="fi fi-rs-comments"></i>
<div>{{ $t('DesignDetail.CurrentColor') }}</div>
@@ -676,7 +676,7 @@ export default defineComponent({
changed:item.changed?item.changed:false,
designType:item.designType?item.designType:"Library",
offset:item.layersObject?.[1]?.offset == null?[0,0]:item.layersObject[1].offset,
scale:item.layersObject?.[1]?.scale?item.layersObject[1].scale:1,
scale:item.layersObject?.[1]?.scale?item.layersObject[1].scale:[1,1],
printObject:{
ifSingle:item.printObject.ifSingle == null ? false : item.printObject.ifSingle,
// path:item.printObject.path?item.printObject.path :'',
@@ -850,7 +850,9 @@ export default defineComponent({
}else{
this.deleteShow = false
let designItemDetail = JSON.parse(JSON.stringify(this.designItemDetail))
let data:any = this.setSubmitItem('preview',true)
if(!this.deleteItemShow){
return
@@ -861,6 +863,12 @@ export default defineComponent({
designItemDetail.currentFullBodyView = rv.currentFullBodyView
designItemDetail.ifSubmit = true
this.loadingShow = false
// if(this.designItemDetail.clothes[this.designItemDetail.clothes.legnth-1] && !this.designItemDetail.clothes[this.designItemDetail.clothes.legnth-1].id){
// this.designItemDetail.clothes.split(this.designItemDetail.clothes.legnth-1,1)
// }
if(data.clothes[data.clothes.legnth-1] && !data.clothes[data.clothes.legnth-1].id){
data.clothes.split(data.clothes.legnth-1,1)
}
this.store.commit("setDesignItemDetail", designItemDetail);
this.store.commit("setDesignPreviewData", data);
this.setRevocation(designItemDetail,data)
@@ -931,6 +939,7 @@ export default defineComponent({
"minIOPath": "",
"color": color,
gradient:gradient,
priority:10,
"printObject": {
"ifSingle": null,
"prints": [
@@ -944,10 +953,10 @@ export default defineComponent({
// let DesignDetailAlter:any = this.$refs.DesignDetailAlter
// DesignDetailAlter.changePlace()
this.designOrder = true
if(this.designItemDetail.clothes?.[this.designItemDetail?.clothes.length-1]?.id){
if(this.designItemDetail.clothes?.[this.designItemDetail?.clothes.length-1]?.id || this.designItemDetail.clothes?.length == 0){
this.designItemDetail.clothes.push(aa)
}else{
return
}
this.clothesDetail(aa,this.designItemDetail.clothes.length-1)
let DesignDetailAlter:any = this.$refs.DesignDetailAlter
@@ -971,8 +980,13 @@ export default defineComponent({
let designItemDetail = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designItemDetail))
this.designOrder = true
this.current = designItemDetail.clothes[index]
if(this.current.id && !designItemDetail.clothes[designItemDetail.clothes.length-1].id){
if(clothes){
this.current = clothes
}else{
this.current = designItemDetail.clothes[index]
}
if(!this.current) return
if(this.current?.id && !designItemDetail?.clothes[designItemDetail.clothes.length-1].id){
designItemDetail.clothes.splice(designItemDetail.clothes.length-1,1)
this.store.commit('setDesignItemDetail',designItemDetail)
}
@@ -985,6 +999,7 @@ export default defineComponent({
}
});
}
this.currentIndex = this.currentIndex>0?this.currentIndex:0
data.designSingleItemDTOList[this.currentIndex] = {
color:`${this.current.color.r} ${this.current.color.g} ${this.current.color.b}`,
@@ -994,7 +1009,7 @@ export default defineComponent({
path:this.current.minIOPath?this.current.minIOPath:'',
offset:this.current.layersObject?.[1]?.offset?this.current.layersObject[1].offset:[0,0],
priority:this.current.priority,
scale:this.current.layersObject?.[1]?.scale?this.current.layersObject[1].scale:1,
scale:this.current.layersObject?.[1]?.scale?this.current.layersObject[1].scale:[1,1],
printObject:{
ifSingle:this.current?.printObject?.ifSingle == null ? false : this.current?.printObject?.ifSingle,
// prints:this.current?.printObject[0]?.path == null ? [] : [{