Merge remote-tracking branch 'origin/StableVersion' into develop

src/store/uploadFile/uploadFile.ts

@@ -71,6 +71,8 @@ const UploadFilesModule : Module<UploadFiles,RootState> = {
 			state.moodboard = [...state.moodboardFiles,...state.moodboardGenerateFiles,...state.moodboardMaterialFiles]	
         },
 		addGenerateMaterialFils(state,data:any){
+			console.log(data);
+			
 			let file
 			let arr
 			let maxImg = 8

src/store/userHabit/userHabit.ts

@@ -13,9 +13,12 @@ interface UserHabit{
 	FemalePosition:any,
 	MalePosition:any,
 	Position:any,
+	SketchGenerateType:any,
+	SketchStyle:any,
 	systemUser:any,
 	userInfo:any,
     messageSystem:any,
+    sex:any,
 }
 
 const userHabit : Module<UserHabit,RootState> = {
@@ -37,7 +40,9 @@ const userHabit : Module<UserHabit,RootState> = {
 		designElementsType:[],
 		FemalePosition:[],
 		MalePosition:[],
+		SketchGenerateType:[],
 		Position:[],
+		SketchStyle:[],
 		systemUser:{
 			value : -1
 		},
@@ -48,6 +53,8 @@ const userHabit : Module<UserHabit,RootState> = {
 			messageNum:0,
 			messageType:{},
 		},
+		sex:{
+		},
     },
     mutations:{
         res_clothingType(state,data){
@@ -65,6 +72,12 @@ const userHabit : Module<UserHabit,RootState> = {
 		setFemalePosition(state,data){
 			state.FemalePosition = data
 		},
+		setSketchGenerateType(state,data){
+			state.SketchGenerateType = data
+		},
+		setSketchStyle(state,data){
+			state.SketchStyle = data
+		},
 		setMalePosition(state,data){
 			state.MalePosition = data
 		},
@@ -115,7 +128,9 @@ const userHabit : Module<UserHabit,RootState> = {
 			}else{
 
 			}
-			
+		},
+		setSex(state,data){
+			state.sex.value = data
 		},
        
     },
@@ -150,7 +165,7 @@ const userHabit : Module<UserHabit,RootState> = {
 		},
 		getLangType(context){
 			let allPromise = [];
-			let getList = ['DesignElementsEnum','PrintboardLevel2TypeEnum','FemalePosition','MalePosition']
+			let getList = ['DesignElementsEnum','PrintboardLevel2TypeEnum','FemalePosition','MalePosition','SketchStyle','SketchGenerateType','Sex']
 			let axiosGet = (item:any)=>{
 				return new Promise((resolve) => {
 			        Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:item}}).then((rv: any) => {
@@ -159,6 +174,7 @@ const userHabit : Module<UserHabit,RootState> = {
 								let name = item.name
 								item.name = item.value
 								item.value = name
+								item.optype = false
 							});
 							if(item == 'DesignElementsEnum'){
 								context.commit('setDesignElementsType',rv)
@@ -169,6 +185,12 @@ const userHabit : Module<UserHabit,RootState> = {
 							}else if(item == 'MalePosition'){
 							    context.commit('setMalePosition',rv)
 								context.commit('setPosition','MalePosition')
+							}else if(item == 'SketchStyle'){
+								context.commit('setSketchStyle',rv)
+							}else if(item == 'SketchGenerateType'){
+								context.commit('setSketchGenerateType',rv)
+							}else if(item == 'Sex'){
+								context.commit('setSex',rv)
 							}
 							resolve('')
 						}