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

src/component/Detail/DesignDetail.vue

@@ -331,14 +331,15 @@ export default defineComponent({
 		}
 		const setClothes = async (list:any,str:string)=>{
 			let clothesList:any = []
-			await nextTick()
+			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()
+			await detailDom.canvasBox.privewDetail()
 			for(let i = 0;i<list.length;i++){
 				detailData.selectDetail
 			    let {scale,offset,priority,transpose,rotate,maskUrl,maskMinioUrl} = await (detailDom.model as any).getSubmitData(list[i])
-				if(detailDom.detailRight?.privewDetail)await (detailDom.detailRight as any).privewDetail()
 				let gradient = null
 				let newData = list[i]?.newDetail?.[detailData.currentDetailType]
 				// newData[0].location=[

src/component/Detail/canvas/index.vue

@@ -182,6 +182,7 @@ export default defineComponent({
 					width:props.sketchSize.width,
 					height:props.sketchSize.height,
 				}).then((rv)=>{
+					console.log(rv,'================')
 					if(oldSelectDetail?.partialDesign)oldSelectDetail.partialDesign.partialDesignBase64 = rv
 				})
 				//包含平铺图层 single+overall模式的图

src/component/Detail/detailRight/editPrintElement.vue

@@ -207,10 +207,10 @@ export default defineComponent({
 			elList:[] as any,
 			selectIndex:0,
 		})
-		
-		const setOveralSingle = ()=>{
+		watch
+		const setOveralSingle = async ()=>{
 
-			setItemPosition()
+			await setItemPosition()
 		}
 		const formatter = (value:any)=>{
 			return `${value}%`;
@@ -419,6 +419,8 @@ export default defineComponent({
 						arr = editPrintElementData.selectDetail.newDetail[editPrintElementData.currentDetailType]
 					}
 					if(arr && arr.length > 0){
+						editPrintElementData.printStyleList[props.type].single = []
+						editPrintElementData.printStyleList[props.type].overall = []
 						arr.forEach((item:any)=>{
 							if(!item.ifSingle){
 								editPrintElementData.stateOverallSingle = 'overall',
@@ -470,8 +472,10 @@ export default defineComponent({
 			if(arr.length > 0){
 				editPrintElementData.imgDomIndex = 0
 				if(newVal == 'overall'){
+					editPrintElementData.printStyleList[props.type].single = []
+					editPrintElementData.printStyleList[props.type].overall = []
 					arr.forEach((item:any,index:number) => {
-						item.id_ = index
+						getItemPosition(item)
 					});
 				}
 			}else{
@@ -1227,7 +1231,7 @@ export default defineComponent({
 							top: 0;
 							left: 0;
 							pointer-events: none;
-							height: 100%;
+							width: 100%;
 						}
 					}
 					.designOpenrtion_sketch_mask{