Merge branch 'localDevelop' into develop

src/views/HomeView/library.vue

@@ -204,7 +204,7 @@
 										</div>
 									</div>
 									<div class="input_border">
-										<div class="input_box" :class="{active:inputShow || inputShowEffectPoor}">
+										<div class="input_box" :class="{active:inputShow}">
 											<input 
 												class="search_input " 
 												@input="ifMaximumLength" 
@@ -408,7 +408,6 @@ export default defineComponent({
             },
         ]);
 		let inputShow = ref(false)
-		let inputShowEffectPoor = ref(false)//表示是否出现红框
 		let generateCheckbox:any = ref()
 		let captionGeneration:any = ref()
 		let inputTime = ref()
@@ -472,7 +471,6 @@ export default defineComponent({
 			uploadGenerate,
 			checkbox,
 			inputShow,
-			inputShowEffectPoor,
 			generateCheckbox,
 			captionGeneration,
 			inputTime,
@@ -626,7 +624,6 @@ export default defineComponent({
 					this.captionGeneration = ''
 					this.selectGenerateList = []
 					this.generateList = []
-					this.inputShowEffectPoor = false
 					this.inputShow = false
 				}
 				this.upload.level1Type = menu.code
@@ -972,7 +969,6 @@ export default defineComponent({
 					(this.$refs.inputShowText as any).innerHTML = this.t('LibraryPage.maximumLength')
 					this.inputShow = true
 				}else{
-					this.inputShowEffectPoor = false
 					this.inputShow = false
 				}
 			},500)
@@ -1064,7 +1060,7 @@ export default defineComponent({
 			let generageImg = this.selectGenerateList.filter((v:any)=>v.checked)[0]
 			let data = {
 				generateType:generateType,
-				designType:'',
+				designType:'collection',
 				collectionElementId:generageImg?.id,
 				level1Type:this.selectCode,
 				level2Type:this.selectCode == 'Sketchboard'?this.designType.value:'',
@@ -1184,9 +1180,9 @@ export default defineComponent({
 									}
 								});
 							});
-							if(rv.filter((item:any)=>item.status == 'Invalid').length == 4) {
-								(this.$refs.inputShowText as any).innerHTML = this.t('Generate.effectPoor')
-								this.inputShowEffectPoor = true
+							if(rv.length == 4 && rv.filter((item:any)=>item.status == 'Invalid').length == 4) {
+								// (this.$refs.inputShowText as any).innerHTML = this.t('Generate.effectPoor')
+								message.info(this.t('Generate.effectPoor'));
 							}
 							if(arr.length == 0){
 								this.generateList = this.generateList.filter((item:any)=>item.status == 'Success')