合并画布代码

src/store/homeStore/homeStore.ts

@@ -14,7 +14,7 @@ interface DesignDetail{
 
 	toProductImageList:any,// 产品图片
 	relightList:any,// 灯光列表
-
+	uploadElement:any,// 上传元素  toproduct、relight、pose
 	poseTransfer:any,// 姿态转换
 	deReconstruction:any,// 拼贴
 	patternMaking3D:any,//3d
@@ -34,7 +34,11 @@ const HomeStoreModule : Module<DesignDetail,RootState> = {
 		showSketchList:[],
 		toProductImageList:[],
 		relightList:[],
-		poseTransfer:[],
+		uploadElement:[],
+		poseTransfer:{
+			list:[],
+			likedList:[],
+		},
 		deReconstruction:[{
 			isLike:false,
 			url:'',
@@ -43,6 +47,7 @@ const HomeStoreModule : Module<DesignDetail,RootState> = {
 			categoryShow:false
 		}],
 		patternMaking3D:{
+			collectionElementId:null,
 			threeDSimpleId:null,
 			printMinioUrl:null,
 			url:'',
@@ -73,14 +78,33 @@ const HomeStoreModule : Module<DesignDetail,RootState> = {
 	            state.relightList.splice(data.index,1)
 			}
         },
-		setPoseTransfer(state,data){
-			data.list.forEach((item:any) => {
-				item.url = item.firstFrameUrl
-			});
+		setUploadElement(state,data){
 			if(data.str == 'add'){
-	            state.poseTransfer.unshift(...data.list)
+	            state.uploadElement.unshift(...data.list)
 			}else{
-	            state.poseTransfer.splice(data.index,1)
+	            state.uploadElement.splice(data.index,1)
+			}
+		},
+		setPoseTransfer(state,data){
+			if(data.str == 'add'){
+				if(data.list){
+					data.list.forEach((item:any) => {
+						item.url = item.firstFrameUrl
+					});
+					state.poseTransfer.list.unshift(...data.list)
+				}
+				if(data.likedList){
+					data.likedList.forEach((item:any) => {
+						item.url = item.firstFrameUrl
+					});
+					state.poseTransfer.likedList.unshift(...data.likedList)
+				}
+			}else{
+				if(data.list){
+					state.poseTransfer.list.splice(data.index,1)
+				}else if(data.likedList){
+					state.poseTransfer.likedList.splice(data.index,1)
+				}
 			}
         },
 		setDeReconstruction(state,data){
@@ -165,10 +189,15 @@ const HomeStoreModule : Module<DesignDetail,RootState> = {
             state.designCollectionId = ''
 			state.deleteDesignCollectionList = []
 			state.relightList = []
+			state.uploadElement = []
 			state.toProductImageList = []
-			state.poseTransfer = []
+			state.poseTransfer = {
+				list:[],
+				likedList:[],
+			}
 			state.deReconstruction = null
 			state.patternMaking3D = {
+				collectionElementId:null,
 				threeDSimpleId:null,
 				printMinioUrl:null,
 				url:null,

src/store/uploadFile/uploadFile.ts

@@ -283,7 +283,11 @@ const UploadFilesModule : Module<UploadFiles,RootState> = {
 			}
 		},
         setAllBoardDataChoose(state,data){
-            state.allBoardData = data
+			for (const key in data) {
+				if((data[key]?.length > 0 || Object.keys(data[key]).length>0) && data[key]){
+					state.allBoardData[key] = data[key]	
+				}
+			}
 			if(Object.keys(data).length === 0){
 				state.chooseIsDesign.value = true
 			}
@@ -334,6 +338,13 @@ const UploadFilesModule : Module<UploadFiles,RootState> = {
 		setCloudList(state,{str,list}){
 			state.cloudList[str] = list
 		},
+		clearAllCloudList(state){
+			state.cloudList = {
+				toProduct:null,
+				relight:null,
+				poseTransfer:null,
+			}
+		},
 		clearCloudList(state,str){
 			state.cloudList[str] = ''
 		}

src/store/workspace/workspace.ts

@@ -72,7 +72,6 @@ const Workspace : Module<DesignDetail,RootState> = {
 			}
 		},
 		createProbject(state){
-			console.log(123)
 			state.probjects = {
 				name:'',
 				id:'',