commit

src/component/HomePage/MoodboardUpload.vue

@@ -161,6 +161,7 @@ export default defineComponent({
 		let moodb_className:any = ref([]);
 		let flex_direction:any = ref(false)//判断第二种格子类型弹性布局方式
 		let layoutList:any = []//选中后随机生成的list
+		let layoutOpen = ref(false)
         return {
             fileList,
             lessenList,
@@ -170,6 +171,7 @@ export default defineComponent({
 			moodb_className,
 			flex_direction,
 			layoutList,
+			layoutOpen
         };
     },
     data() {
@@ -225,7 +227,10 @@ export default defineComponent({
                 let res = JSON.parse(file.xhr.response);
                 file.imgUrl = res.data.url;
                 file.resData = res.data;
-				file.type_ = 'upload';
+				file.type_ = {
+					type1:'upload',
+					type2:'Moodboard'
+				};
 				file.id_ = GO.id++
                 let fileList = this.fileList.filter(
                     (v: any) => v.status === "done"
@@ -298,33 +303,51 @@ export default defineComponent({
 						
 					}
 				})
-				console.log(this.fileList);
-				
 				this.fileList.splice(moodboard,1)
-				console.log(this.fileList);
-
 				this.store.commit("setMoodboardFile", this.fileList);
 			}
             this.store.commit("clearMoodTemplateId");
         },
 		
         recollection() {
-            this.fileList = JSON.parse(
+            let arr = JSON.parse(
                 JSON.stringify(
                     this.store.state.UploadFilesModule.allBoardData
                         .moodboardFiles
                 )
             );
+			let setboard = {
+				generate:[] as any,
+				material:[] as any,
+				moodboard:[] as any,
+			}
+			arr.forEach((v:any)=>{
+				if(v.type_.type1 == 'generate'){
+					setboard.generate.push(v)
+				}else if(v.type_.type1 == 'material'){
+					setboard.material.push(v)
+				}else{
+					setboard.moodboard.push(v)
+				}
+			})
+			this.store.commit("setMoodboardGenerateFiles", setboard.generate);
+			this.store.commit("setMoodboardMaterialFiles", setboard.material);
+			this.store.commit("setMoodboardFile", setboard.moodboard);
+			this.fileList = setboard.moodboard
             let moodTemplateId =
                 this.store.state.UploadFilesModule.allBoardData.moodTemplateId;
-            this.store.commit("setMoodboardFile", this.fileList);
             this.store.commit("setMoodTemplateId", moodTemplateId);
         },
 
         changeTemplateModal() {
-			let layout:any = this.$refs.layout
+			if(this.layoutOpen){
+				let layout:any = this.$refs.layout
 				// layout.init('moodboard')
 				layout.init()
+			}else{
+				message.error('Please click Layout to sort randomlys')
+			}
+			
         },
 		layout(){
 			let arr = this.store.state.UploadFilesModule.moodboard
@@ -337,6 +360,7 @@ export default defineComponent({
 				this.flex_direction = false
 			}
 			this.moodb_className = this.moodb_[arr.length-1][random]
+			this.layoutOpen = true
 		},
 		setmoodbClass(val:any){
 			this.moodb_className = val