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

src/component/HomePage/SketchboardUpload.vue

@@ -23,6 +23,19 @@
                 >
                     <span>{{ $t('SketchboardUpload.Generate') }}</span>
                 </div>
+				<div v-show="openClick == 3" class="generalMenu_printModel printMenu">
+					<div @click.stop="openPrintModel">{{ scene.name }}	<i class="icon iconfont icon-xiala" :class="{forbidden:openMenu}"></i></div>
+					<ul v-show="openMenu">
+						<li 
+							v-for="item,index in sketchStyleList" 
+							class="printModel_item" 
+							@click.stop="setSceneList(item)"
+							:title="item.value == 'Pattern'?$t('PrintboardUpload.PatternTitle'):
+							item.value == 'Logo'?$t('PrintboardUpload.LogoTitle'):
+							item.value == 'Slogan'?$t('PrintboardUpload.SloganTitle'):''"
+						>{{ item.name }}</li>
+					</ul>
+				</div>
             </div>
             <div v-show="openClick == 1" class="sketchboard_body">
                 <div class="upload_img_body scroll_style">
@@ -113,6 +126,7 @@
                 v-show="openClick == 3"
                 ref="Generate"
                 msg="Sketchboard"
+				:scene="scene"
 				:sketchCatecoryList="sketchCatecoryList"
             ></Generate>
         </div>
@@ -214,6 +228,14 @@ export default defineComponent({
 			level2Type:'',
 			designType:'',
 		})
+		let scene = ref({
+			name:'Generate Sketch',
+			value:'generate'
+		})
+		let openMenu = ref(false)
+		let sketchStyleList:any = computed(()=>{
+			return store.state.UserHabit.SketchGenerateType
+		})
         return {
             fileList,
             openClick,
@@ -227,6 +249,9 @@ export default defineComponent({
 			isTest,
 			userInfo,
 			useGenerate,
+			scene,
+			openMenu,
+			sketchStyleList,
         };
     },
     data() {
@@ -549,6 +574,23 @@ export default defineComponent({
             }
             this.store.commit("setSketchboardFile", this.fileList);
         },
+		setSceneList(data:any){
+			if(this.scene.value === data.value) return
+			this.scene = data
+			let generate:any = this.$refs.Generate
+			generate.sketchboardList = []
+			generate.searchPictureName = ''
+			this.openMenu = false
+		},
+		openPrintModel(){
+			if(this.openMenu)return
+			document.addEventListener('click',this.removePrintModel)
+			this.openMenu = true
+		},
+		removePrintModel(){
+			this.openMenu = false
+			document.removeEventListener('click',this.removePrintModel)
+		}
     },
 });
 </script>
@@ -610,6 +652,32 @@ export default defineComponent({
                     margin-right: calc(0.8rem*1.2);
                 }
             }
+			.printMenu{
+				margin-right: 0;
+				margin-left: 2rem;
+				margin-top: auto;
+				position: relative;
+				>div{
+					width: 14rem;
+					font-size: var(--aida-fsize1-6);
+					border: 0;
+					i{
+						transition: all .3s;
+						display: inline-block;
+						position: absolute;
+						right: 0;
+					}
+					.forbidden{
+						transform: rotate(180deg);
+					}
+				}
+				ul{
+					width: 14rem;
+				}
+			}
+			.switch_type_item:nth-child(3){
+				margin: 0;
+			}
         }
 		.sketchboard_body {
 			// height: calc(100% - 5rem*1.2));