修改印花合成图方式

src/component/HomePage/Generate.vue

@@ -39,7 +39,7 @@
 					<li class="printModel_item" @click="setprintModel(1)">{{ $t('Generate.Model1') }}</li>
 					<li class="printModel_item" @click="setprintModel(2)">{{ $t('Generate.Model2') }}</li>
 					<li class="printModel_item" @click="setprintModel(3)">{{ $t('Generate.Model3') }}</li>
-					<li v-show="printBoards.length >= 1" class="printModel_item" @click="setprintModel(4)">{{ $t('Generate.Merge') }}</li>
+					<li v-show="(sketchboardList.length>=1 && moodboarList.length>=1&& checkbox[0].type) || (sketchboardList.length>=2 && checkbox[0].type) " class="printModel_item" @click="setprintModel(4)">{{ $t('Generate.Merge') }}</li>
 				</ul>
 			</div>
         </div>
@@ -239,7 +239,8 @@ export default defineComponent({
 			value:'Painting Style',
 			name:useI18n().t('Generate.Model'+1)
 		})
-		let printBoards:any = computed(()=>{return store.state.UploadFilesModule.printboard})
+		// let printBoards:any = computed(()=>{return store.state.UploadFilesModule.printboard})
+		let moodboarList:any = computed(()=>{return store.state.UploadFilesModule.moodboard})
 		// let sketchCatecoryList:any = ref([])
 		let workspace:any = ref({})
 
@@ -248,6 +249,7 @@ export default defineComponent({
 		let inputTime = ref()
 		let driver__:any = inject('driver__')
 		let {t} = useI18n()
+		let isMmerge = ref(false)
 
 		let isTest = ref()
         return {
@@ -271,13 +273,15 @@ export default defineComponent({
 			checkboxImage,
 			printModel,
 			loadingShow,
-			printBoards,
+			// printBoards,
+			moodboarList,
 			// sketchCatecoryList,
 			workspace,
 			inputShow,
 			inputTime,
 			driver__,
 			t,
+			isMmerge,
 			isTest,
         };
     },
@@ -297,17 +301,15 @@ export default defineComponent({
             },
             token: "",
             uploadUrl: "",
-            moodboarList: computed(() => {
+           
-                return useStore().state.UploadFilesModule.moodboard;
-            }),
             type_: {
                 type1: "generate",
                 type2: prop.msg,
             },
-			workspaceCom:{}
+			workspaceCom:{},
-
         };
     },
+	
     mounted() {
         // this.fileList.forEach((item,index)=>{
         // 	item.checked = true
@@ -343,6 +345,17 @@ export default defineComponent({
 			this.workspace = newVal
 			this.upload.gender = newVal.sexEnum.name
 		},
+		moodboarList(newVal,oldVal){
+			if(newVal.length>=1 || this.sketchboardList.length >= 2){
+			}else{
+				this.printModel = {
+					num:'',
+					optype:false,
+					value:'Painting Style',
+					name:this.t('Generate.Model'+1)
+				}
+			}
+		},
 	},
     computed: {
         getSketchLabel(value: any) {
@@ -406,12 +419,18 @@ export default defineComponent({
 				}
 			})
 			if(num == 1){
-				this.level2Type = ''
+				this.level2Type = ''//点击文字生成就把衣服类型清空
 			}
 			if(num == 2 || num == 1){
 				if(this.driver__.driver){
 					driverObj__.moveNext()
 				}
+				this.printModel = {
+					num:'',
+					optype:false,
+					value:'Painting Style',
+					name:this.t('Generate.Model'+1)
+				}
 			}
         },
 		PrintModel(){
@@ -640,27 +659,14 @@ export default defineComponent({
 			// this.sketchboardList
 			this.collectionElementid = ''
 			this.sketchboardList.splice(item, 1);
-            // if (item.type_ == "generate" || item.type_ == "material") {
+			if((this.sketchboardList.length<2 && this.moodboarList.length == 0) || this.sketchboardList.length == 0){
-			// 	let maxImg = 8
+				this.printModel = {
-			// 	if(this.type_.type2 == 'Sketchboard'){
+					num:'',
-			// 		maxImg = 20
+					optype:false,
-			// 	}
+					value:'Painting Style',
-			// 	item.jsContent1 = this.t('uploadFile.jsContent1',{maxImg:maxImg})
+					name:this.t('Generate.Model'+1)
-            //     this.store.commit("addGenerateMaterialFils", item);
+				}
-            // } else {
+			}
-            //     this.sketchboardList =
-            //         this.store.state.UploadFilesModule.moodboardFiles;
-            //     let moodboard;
-            //     this.store.state.UploadFilesModule.moodboardFiles.forEach(
-            //         (items: any, index: Number) => {
-            //             if (items.id_ == item.id_) {
-            //                 moodboard = index;
-            //             }
-            //         }
-            //     );
-            //     this.sketchboardList.splice(moodboard, 1);
-            //     this.store.commit("setSketchboardFile", this.sketchboardList);
-            // }
         },
 		likeFile(item:any,str:string){
 			if(str == 'like'){

src/component/HomePage/PrintboardUpload.vue

@@ -194,16 +194,15 @@ export default defineComponent({
         }
     },
     computed:{
-        getPinLength(){
+        // getPinLength(){
-            let selectLength:any =  0 
+        //     let selectLength:any =  0 
-            for(let item of this.printBoards){
+        //     for(let item of this.printBoards){
-                if(item.pin){
+        //         if(item.pin){
-                    selectLength++
+        //             selectLength++
-                }
+        //         }
-            }
+        //     }
-            return selectLength
+        //     return selectLength
-           
+        // }
-        }
     },
 	watch:{
 		printBoards:{
@@ -563,13 +562,15 @@ export default defineComponent({
 			if(this.loadingShow){
 				return
 			}
-			//如果是通过moodboard随即图片生成
 			let generage:any = this.$refs.Generate
-			let generateType = generage.checkbox.filter((v:any)=>v.type)[0].name
+
 			if(generage.printModel.num == 'Generate'){
 				this.generatePrint()
 				return
 			}
+			//如果是通过moodboard随即图片生成
+			let generateType = generage.checkbox.filter((v:any)=>v.type)[0].name
+			
 			let data = {
 				generateType:generateType,
 				designType:'',
@@ -584,6 +585,7 @@ export default defineComponent({
 			if(generateType == 'image'){
 				if(generage?.collectionElementid){
 					data.text = ''
+					
 				}else{
 					message.info(
 						this.t('PrintboardUpload.jsContent4')
@@ -667,51 +669,54 @@ export default defineComponent({
             return index
             
         },
+		
 		generatePrint(){
             let data:any = {}
             //随机获取图片id
+			let generage:any = this.$refs.Generate
+			let generateList = generage.sketchboardList
+			let isGenerateListChecked = generateList.filter((item:any) => item.checked)
             if(!this.moodBoards.length){ //mood没有图片
                 let index1 = -1
                 let index2 = -2
-                if(!this.getPinLength){ //没pin住
+                if(isGenerateListChecked.length == 0){ //没pin住
-                    index1 = this.randomRange(0, this.printBoards.length, -1)
+                    index1 = this.randomRange(0, generateList.length, -1)
-                    index2 = this.randomRange(0, this.printBoards.length, index1)
+                    index2 = this.randomRange(0, generateList.length, index1)
-                }else if(this.getPinLength === 1){ //pin住1个
+                }else if(isGenerateListChecked.lengthh === 1){ //pin住1个
-                    this.printBoards.forEach((element:any,index:number) => {
+                    generateList.forEach((element:any,index:number) => {
-                        if(element.pin){
+                        if(element.checked){
                             index1 = index
                         }
                     });
-                    index2 = this.randomRange(0, this.printBoards.length, index1)
+                    index2 = this.randomRange(0, generateList.length, index1)
                 }else{      //pin住多个
                     let selectIndexList:any = []
-                    this.printBoards.forEach((element:any,index:number) => {
+                    generateList.forEach((element:any,index:number) => {
                         if(element.pin){
                             selectIndexList.push(index)
                         }
                     });
                     index1 = this.randomRange(0, selectIndexList.length, -1) //pin住的中随机选一个
-                    index2 = this.randomRange(0, this.printBoards.length, selectIndexList[index1]) //除了选中的外再来一个
+                    index2 = this.randomRange(0, generateList.length, selectIndexList[index1]) //除了选中的外再来一个
-                    
                 }
                 data = {
-                    select1Id:this.printBoards[index1].id,
+                    select1Id:generateList[index1].id,
-                    select2Id:this.printBoards[index2].id
+                    select2Id:generateList[index2].id
                 }
             }else{
                 let index1 = this.randomRange(0, this.moodBoards.length, -1)
                 let index2 = -2
-                if(!this.getPinLength){ //没pin住
+                if(isGenerateListChecked.length == 0){ //没pin住
-                    index2 = this.randomRange(0, this.printBoards.length, -1)
+                    index2 = this.randomRange(0, generateList.length, -1)
-                }else if(this.getPinLength === 1){ //pin住1个
+                }else if(isGenerateListChecked.lengthh === 1){ //pin住1个
-                    this.printBoards.forEach((element:any,index:number) => {
+                    generateList.forEach((element:any,index:number) => {
                         if(element.pin){
                             index2 = index
                         }
                     });
                 }else{      //pin住多个
                     let selectIndexList:any = []
-                    this.printBoards.forEach((element:any,index:number) => {
+                    generateList.forEach((element:any,index:number) => {
                         if(element.pin){
                             selectIndexList.push(index)
                         }
@@ -720,7 +725,7 @@ export default defineComponent({
                 }
                 data = {
                     select1Id:this.moodBoards[index1].resData.id,
-                    select2Id:this.printBoards[index2].id
+                    select2Id:generateList[index2].id
                 }
             }
             data.timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone,

src/lang/cn.ts

@@ -255,6 +255,7 @@ export default {
 		Model3:'真实画风',
 		inputContent1:'输入生成图片的标题',
 		Generate:'生成',
+		Merge:'合成',
 		maximumLength:'输入的内容超过允许输入的最大长度',
 		Model:'模型',
 		jsContent1:"您只能上传图片文件！",

src/lang/fr.ts

@@ -256,6 +256,7 @@ export default {
 		Model3:'Style réel',
 		inputContent1:'Saisie rapide',
 		Generate:'Générer',
+		Merge:'Fusionner',
 		maximumLength:'Le contenu saisi dépasse la longueur maximale.',
 		Model:'Modèle',
 		jsContent1:"Vous pouvez uniquement télécharger un fichier image!",

src/lang/it.ts

@@ -255,6 +255,7 @@ export default {
 		Model3:'Stile reale',
 		inputContent1:'Immissione rapida',
 		Generate:'creare',
+		Merge:'Unire',
 		maximumLength:'Il contenuto inserito supera la lunghezza massima.',
 		Model:'Modello',
 		jsContent1:"Puoi caricare solo il file immagine!",

src/lang/ja.ts

@@ -256,6 +256,7 @@ export default {
 		inputContent1:'プロンプト入力',
 		Generate:'生成する',
 		Model:'モデル',
+		Merge:'マージ',
 		maximumLength:'入力した内容が最大長を超えています.',
 		jsContent1:"画像ファイルのみアップロードできます!",
 		jsContent2:'画像は 2MB 未満である必要があります!',

src/lang/kr.ts

@@ -255,6 +255,7 @@ export default {
 		Model3:'리얼 스타일',
 		inputContent1:'프롬프트 입력',
 		Generate:'생성하다',
+		Merge:'병합',
 		maximumLength:'입력한 내용이 최대 길이를 초과했습니다.',
 		Model:'모델1',
 		jsContent1:"이미지 파일만 업로드할 수 있습니다!",

src/lang/ru.ts

@@ -255,6 +255,7 @@ export default {
 		Model3:'Реалистический стиль',
 		inputContent1:'Быстрый ввод',
 		Generate:'Генерировать',
+		Merge:'слияние',
 		maximumLength:'Введенный контент превышает максимальную длину.',
 		Model:'Модель',
 		jsContent1:"Вы можете загрузить только файл изображения!",

src/lang/th.ts

@@ -255,6 +255,7 @@ export default {
 		Model3:'สไตล์แบบจริง',
 		inputContent1:'ป้อนข้อมูลทันที',
 		Generate:'กำเนิด',
+		Merge:'รวมเข้าด้วยกัน',
 		maximumLength:'เนื้อหาที่ป้อนเกินความยาวสูงสุด.',
 		Model:'แบบอย่าง',
 		jsContent1:"คุณสามารถอัปโหลดได้เฉพาะไฟล์รูปภาพเท่านั้น!",

src/lang/vn.ts

@@ -255,6 +255,7 @@ export default {
 		Model3:'Phong cách thực tế',
 		inputContent1:'Nhập liệu nhanh chóng',
 		Generate:'Phát ra',
+		Merge:'hợp nhất',
 		maximumLength:'Nội dung đã nhập vượt quá độ dài tối đa.',
 		Model:'người mẫu',
 		jsContent1:"YBạn chỉ có thể tải lên tệp Hình ảnh!",