Merge branch 'dev_vite' of http://18.167.251.121:10003/aidlab/aida_front into dev_vite

2025-09-25 17:03:56 +08:00
parent 928db59edc 2d63a48526
commit c3d7cbcc83
21 changed files with 199 additions and 184 deletions
--- a/src/component/Detail/DesignDetail.vue
+++ b/src/component/Detail/DesignDetail.vue
@@ -167,61 +167,64 @@ export default defineComponent({
 		}
 		
 		const showDesignDetailModal = (data:any,str:any)=>{
-            // let url = Https.httpUrls.getDesignDetail + `?designItemId=${77770}&designPythonOutfitId=${77423}`
-            let url = Https.httpUrls.getDesignDetail + `?designItemId=${data.design.designItemId}&designPythonOutfitId=${data.design.designOutfitId}`
-            detailData.loadingShow = true
-            Https.axiosGet(url).then(
-                async (rv: any) => {
-                    store.commit('DesignDetail/setDesignDetail',rv)
-					rv.clothes.forEach((item:any)=>{
-						let a
-						item.designType='Library'
-						if(item.layersObject[0].imageCategory.indexOf("back") == -1){
-							a = item.layersObject[0]
-							item.layersObject[0] = item.layersObject[1]
-							item.layersObject[1] = a
-						}
-						if(item.color){
-							item.color.rgba = {
-								r:item.color.r,
-								g:item.color.g,
-								b:item.color.b,
+			return new Promise<void>((resolve, reject) => {
+				store.commit('DesignDetail/clearDetailData')
+				// let url = Https.httpUrls.getDesignDetail + `?designItemId=${77770}&designPythonOutfitId=${77423}`
+				let url = Https.httpUrls.getDesignDetail + `?designItemId=${data.design.designItemId}&designPythonOutfitId=${data.design.designOutfitId}`
+				detailData.loadingShow = true
+				Https.axiosGet(url).then(
+					async (rv: any) => {
+						store.commit('DesignDetail/setDesignDetail',rv)
+						rv.clothes.forEach((item:any)=>{
+							let a
+							item.designType='Library'
+							if(item.layersObject[0].imageCategory.indexOf("back") == -1){
+								a = item.layersObject[0]
+								item.layersObject[0] = item.layersObject[1]
+								item.layersObject[1] = a
 							}
-						}else{
-							item.color = {
-								// rgba:{
-								// 	r:undefined,
-								// 	g:undefined,
-								// 	b:undefined,
-								// }
+							if(item.color){
+								item.color.rgba = {
+									r:item.color.r,
+									g:item.color.g,
+									b:item.color.b,
+								}
+							}else{
+								item.color = {
+									// rgba:{
+									// 	r:undefined,
+									// 	g:undefined,
+									// 	b:undefined,
+									// }
+								}
 							}
-						}
-						if(item.gradient){
-							item.color.gradient = item.gradient
-						}
-						if(item.printObject.prints == null)item.printObject.prints = []
-						item.printObject.prints.forEach((element:any) => {
-							if(!element.designType){
-								element.designType = 'Library'
+							if(item.gradient){
+								item.color.gradient = item.gradient
 							}
-						});
-					})
-					detailData.singleOveral.value = rv.singleOverall
-					detailData.designDetailShow = true
-					// this.deleteShow = false
-					initialize()
-					setRevocation()
-                    detailData.loadingShow = false
-					if(rv.singleOverall == "single"){
-						console.log(rv.clothes)
-						store.commit('DesignDetail/setDesignColthes',rv.clothes[0].id)
+							if(item.printObject.prints == null)item.printObject.prints = []
+							item.printObject.prints.forEach((element:any) => {
+								if(!element.designType){
+									element.designType = 'Library'
+								}
+							});
+						})
+						detailData.singleOveral.value = rv.singleOverall
+						detailData.designDetailShow = true
+						// this.deleteShow = false
+						initialize()
+						setRevocation()
+						detailData.loadingShow = false
+						if(rv.singleOverall == "single"){
+							store.commit('DesignDetail/setDesignColthes',rv.clothes[0].id)
+						}
+						resolve(rv)
 					}
-
-                }
-				
-            ).catch(rv=>{
-                detailData.loadingShow = false
-            })
+				).catch(rv=>{
+					detailData.loadingShow = false
+					resolve(rv)
+				})
+			})
+			
 		}
 		const initialize = ()=>{//design后初始化

@@ -299,7 +302,6 @@ export default defineComponent({
 				// 0.35822305
 				// ]	
 				let isCurrent = list[i].id == detailData?.selectDetail?.id
-				console.log(isCurrent,newData)
 				let color = (detailData.currentDetailType == 'color' && isCurrent && !detailData.isEditPattern.value)?
 				(newData?.rgba?.r?`${newData.rgba.r} ${newData.rgba.g} ${newData.rgba.b}`:''):
 				(list[i].color?.rgba?.r?
@@ -380,6 +382,7 @@ export default defineComponent({
 				delete detailData.designDetail.newModel
 				store.commit('DesignDetail/setPraeview',value)
 				detailData.loadingShow = false
+				canvasReload()
 				// setRevocation()
 			}).catch(res=>{ 
 				detailData.loadingShow = false
--- a/src/component/Detail/canvas/index.vue
+++ b/src/component/Detail/canvas/index.vue
@@ -257,7 +257,6 @@ export default defineComponent({
 				detailData.isShowMark = true
 			}
 			const index = detailData.designDetail.clothes.findIndex(item => item.id === detailData.selectDetail.id);
-			console.log(index,detailData.selectDetail.id)
 			await new Promise<void>((resolve, reject) => {
 				if(!detailDom?.editCanvas)return resolve()
 				let canvasJSON = detailDom?.editCanvas?.getJSON()
@@ -302,8 +301,7 @@ export default defineComponent({
 			if(front?.oldImageUrl)front.imageUrl = front.oldImageUrl
 			if(front?.oldMaskUrl)front.maskUrl = front.oldMaskUrl
 			if(back?.oldImageUrl)back.imageUrl = back.oldImageUrl
-			console.log(front)
-			if(front?.oldMaskUrl)store.commit('DesignDetail/updataDetailItem',{maskUrl:front.oldMaskUrl})
+			if(front?.oldMaskUrl)store.commit('DesignDetail/updataDetailItem',{maskUrl:front.maskUrl})

 			sessionStorage.removeItem('frontBackEdit');
 			sessionStorage.removeItem('sketchEdit');
--- a/src/component/Detail/detailRight/editPrintElement.vue
+++ b/src/component/Detail/detailRight/editPrintElement.vue
@@ -334,7 +334,7 @@ export default defineComponent({
 					}
 					if(!editPrintElementData.selectDetail.printObject.prints)return
 					let state = true
-					editPrintElementData.stateOverallSingle = 'single'
+					// editPrintElementData.stateOverallSingle = 'single'
 					let arr:any = editPrintElementData.selectDetail.printObject.prints
 					if(props.type == 'element'){
 						arr = editPrintElementData.selectDetail.trims.prints
@@ -344,7 +344,7 @@ export default defineComponent({
 					}
 					if(arr && arr.length > 0){
 						arr.forEach((item:any)=>{
-							if(!item.ifSingle){
+							if(!item.ifSingle && arr.length == 1){
 								editPrintElementData.stateOverallSingle = 'overall',
 								state = false
 							}
--- a/src/component/Detail/model/modelNav.vue
+++ b/src/component/Detail/model/modelNav.vue
@@ -71,31 +71,31 @@ export default defineComponent({
 		},{immediate:true})
 		const selectDetailItem = (item:any,index:number)=>{
 			new Promise((resolve, reject) => {
-				// if(detailData.isEditPattern.value && 
-				// 	detailData.selectDetail?.id && 
-				// 	detailData?.getCanvasIfEdit?.fun&&detailData?.getCanvasIfEdit?.fun() > 0
-				// ){
-				// 	Modal.confirm({
-				// 		title: t('collectionModal.jsContent2'),
-				// 		icon: createVNode(ExclamationCircleOutlined),
-				// 		okText: 'Yes',
-				// 		cancelText: 'No',
-				// 		mask:false,
-				// 		centered:true,
-				// 		onOk() {
-				// 			resolve(true)
-				// 			emit('canvasReload')
-				// 		},
-				// 		onCancel(){
-				// 			resolve(false)
-				// 		}
-				// 	});
-				// }else{
+				if(detailData.isEditPattern.value && 
+					detailData.selectDetail?.id && 
+					detailData?.getCanvasIfEdit?.fun&&detailData?.getCanvasIfEdit?.fun() > 0
+				){
+					Modal.confirm({
+						title: t('collectionModal.jsContent6'),
+						icon: createVNode(ExclamationCircleOutlined),
+						okText: 'Yes',
+						cancelText: 'No',
+						mask:false,
+						centered:true,
+						onOk() {
+							resolve(true)
+							emit('canvasReload')
+						},
+						onCancel(){
+							resolve(false)
+						}
+					});
+				}else{
 					resolve(true)
 					if(detailData.selectDetail.id !== item.id){
 						emit('canvasReload')
 					}
-				// }
+				}
 			}).then((rv)=>{
 				if(rv)store.commit('DesignDetail/setDesignColthes',item.id)
 			})
--- a/src/component/Detail/model/modelPosition.vue
+++ b/src/component/Detail/model/modelPosition.vue
@@ -4,7 +4,7 @@
 			<div class="designOpenrtion_print" v-for="item,index in frontBack.back" @mousedown.stop="itemMoveMousedown(index,getMousePosition($event,false))" @touchstart.passive="itemMoveMousedown(index,getMousePosition($event,true))" @click="setpitch(item,index)" :style="frontBack.front[index].style">
 				<img :style="item.imageUrl?'':'display:none;'" :src="item.imageUrl" alt="">
 			</div>
-			<img class="perview_img" @load="setPrintSize()" ref="detailBody" :src="frontBack?.body?.path" :style="'width:'+ frontBack?.body?.layersObject?.[0].imageSize?.[0] +';height:' + frontBack?.body?.layersObject?.[0].imageSize?.[0] +';'">
+			<img class="perview_img" @load="setPrintSize()" ref="detailBody" :key="designDetail.designItemId" :src="frontBack?.body?.path" :style="'width:'+ frontBack?.body?.layersObject?.[0].imageSize?.[0] +';height:' + frontBack?.body?.layersObject?.[0].imageSize?.[0] +';'">
 			<div  class="detail_modal_item_front"  v-for="item,index in frontBack.front"  @mousedown.stop="itemMoveMousedown(index,getMousePosition($event,false))" @touchstart.passive="itemMoveMousedown(index,getMousePosition($event,true))" @click="setpitch(item,index)"  :style="item.style">
 				<img :src="item.imageUrl" alt="">
 			</div>
@@ -239,38 +239,41 @@ export default defineComponent({
 			// }
 		}
 		const itemMoveMousedown = async (index:any,e:any)=>{
+			if(detailData.selectDetail.id != detailData.frontBack.front[index].id)return
 			let isOpen = false
 			let isModal = false
 			await new Promise((resolve, reject) => {
-				if(
-					detailData.isEditPattern.value && 
-					selectItem.selectDetail?.id && 
-					(detailData.frontBack.front[index].id != selectItem.selectDetail.id)
-				){
-					isModal = true
-					Modal.confirm({
-						title: t('collectionModal.jsContent2'),
-						icon: createVNode(ExclamationCircleOutlined),
-						okText: 'Yes',
-						cancelText: 'No',
-						mask:false,
-						centered:true,
-						onOk() {
-							resolve(true)
-							isOpen = true
-						},
-						onCancel(){
-							resolve(false)
-							isOpen = false
-						}
-					});
-				}else{
-					if(detailData.frontBack.front[index].id != selectItem.selectDetail.id){
-						isOpen = true
-					}
-					resolve(true)
-					isModal = false
-				}
+				// if(
+				// 	detailData.isEditPattern.value && 
+				// 	selectItem.selectDetail?.id && 
+				// 	(detailData.frontBack.front[index].id != selectItem.selectDetail.id)
+				// ){
+				// 	isModal = true
+				// 	Modal.confirm({
+				// 		title: t('collectionModal.jsContent2'),
+				// 		icon: createVNode(ExclamationCircleOutlined),
+				// 		okText: 'Yes',
+				// 		cancelText: 'No',
+				// 		mask:false,
+				// 		centered:true,
+				// 		onOk() {
+				// 			resolve(true)
+				// 			isOpen = true
+				// 		},
+				// 		onCancel(){
+				// 			resolve(false)
+				// 			isOpen = false
+				// 		}
+				// 	});
+				// }else{
+				// 	if(detailData.frontBack.front[index].id != selectItem.selectDetail.id){
+				// 		isOpen = true
+				// 	}
+				// 	resolve(true)
+				// 	isModal = false
+				// }
+				resolve(true)
+				isOpen = true
 			}).then((rv)=>{
 			})
 			if(isOpen){