调整生成方式的下拉菜单位置

components.d.ts

@@ -33,6 +33,7 @@ declare module 'vue' {
     ATable: typeof import('ant-design-vue/es')['Table']
     ATabPane: typeof import('ant-design-vue/es')['TabPane']
     ATabs: typeof import('ant-design-vue/es')['Tabs']
+    ATimeRangePicker: typeof import('ant-design-vue/es')['TimeRangePicker']
     AUpload: typeof import('ant-design-vue/es')['Upload']
     ElCascader: typeof import('element-plus/es')['ElCascader']
     RouterLink: typeof import('vue-router')['RouterLink']

src/assets/style/style.css

@@ -62,6 +62,9 @@ li {
   height: 100%;
   margin: 0 auto;
 }
+.ant-dropdown-menu {
+  border-radius: 1rem;
+}
 .button_second {
   width: 14rem;
   text-align: center;

src/assets/style/style.less

@@ -63,6 +63,9 @@ input:focus{
     height: 100%;
     margin: 0 auto;
 }
+.ant-dropdown-menu{
+	border-radius: 1rem;
+}
 .button_second{
     width: 14rem;
     text-align: center;

src/component/Detail/model/modelPosition.vue

@@ -121,7 +121,7 @@ export default defineComponent({
 					});
 					setTimeout(() => {
 						emit('modelOnLoad')
-					});
+					},500);
 				};
 				img.src = detailData.frontBack?.body?.path;
 			})

src/component/HomePage/Generate.vue

@@ -1,16 +1,8 @@
 <template>
     <div class="generate">
-        <div v-if="(type_.type2 == 'Printboard' && scene.value == 'Pattern')"  class="generate_checkbox" >
+        <div class="generate_checkbox" >
-			<generalMenu :dataList="printModelList" @setprintModel="setprintModel" :item="printModel" :driver__="driver__.driver" :driverClass="{class1: 'Guide_1_2_4'}"></generalMenu>
+			<generalMenu v-if="type_.type2 == 'Printboard' || type_.type2 == 'Sketchboard'" :dataList="printCatecoryList" @setprintModel="setCatecorySceneList" :item="scene" width="14rem" style="padding: 0;"></generalMenu>
-			<!-- <generalMenu :dataList="sceneList" @setprintModel="setSceneList" :item="scene"></generalMenu> -->
+			<generalMenu v-if="(type_.type2 == 'Printboard' && scene.value == 'Pattern')" :dataList="printModelList" @setprintModel="setprintModel" :item="printModel"></generalMenu>
-			<!-- <div v-if="type_.type2 == 'Printboard'" class="printModel">
-				<div @click.stop="PrintModel" class="Guide_1_2_4" :class="[driver__.driver?'showEvents':'']">{{ printModel.name }}</div>
-				<ul v-show="printModel.optype" class="Guide_1_2_5" :class="[driver__.driver?'showEvents':'']">
-					<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>
-				</ul>
-			</div> -->
         </div>
         <div class="input_border" >
 			<div class="input_box  Guide_1_5" :class="[inputShow?'active':'',]">
@@ -68,7 +60,7 @@
 								<a-menu-item>
 									<div class="drop-container" @click.stop="handleOpenLibrarySelect">
 										<i class="fi fi-rr-followcollection"></i>
-										<div>{{ $t('PrintboardUpload.Library') }}</div>
+										<div style="font-size: 1.4rem;">{{ $t('PrintboardUpload.Library') }}</div>
 									</div>
 								</a-menu-item>
 							</a-menu>
@@ -257,7 +249,7 @@ export default defineComponent({
 		sketchCategory,
 		SelectImages
 	},
-    props: ["msg",'sketchCatecoryList','scene','gender'],
+    props: ["msg",'sketchCatecoryList','gender'],
 	emits:['setLibrary'],
     setup(props) {
         // console.log(prop.msg);
@@ -275,13 +267,32 @@ export default defineComponent({
 			value:'Painting Style',
 			label:useI18n().t('Generate.Model1')
 		})
+
+
+		let printCatecoryList:any = computed(()=>{
+			if(props.msg == 'Sketchboard'){
+				return store.state.UserHabit.SketchGenerateType
+			}else if(props.msg == 'Printboard'){
+				return store.state.UserHabit.printType
+			}
+		})
+
+		
         let searchPictureName = ref("");
         let searchPictureSeed:any = ref(0);
         let store = useStore();
         let fileList: any = ref([
           
         ]);
+		let scene = ref({
+		})
 		let sketchboardList:any = ref([])
+		const setCatecorySceneList = (data:any)=>{
+			if(scene.value.value === data.value) return
+			scene.value = data
+			sketchboardList.value = []
+			searchPictureName.value = ''
+		}
 		let level2Type = ref('')
 		// let printBoards:any = computed(()=>{return store.state.UploadFilesModule.printboard})
 		// let moodboarList:any = computed(()=>{return store.state.UploadFilesModule.moodboard})
@@ -358,7 +369,7 @@ export default defineComponent({
 		const removeOpenSpeed = ()=>{
 			speed.speedState = false
 		}
-		watch(()=>props.scene,(newVal,oldVal)=>{
+		watch(()=>scene.value,(newVal,oldVal)=>{
 			if(newVal.value == 'extract'){
 				speed.speedData = speed.extractList[0]
 			}else if(newVal.value == 'Logo' || newVal.value == 'Slogan'){
@@ -377,6 +388,17 @@ export default defineComponent({
 			speed.speedData = item
 		}
 		onMounted(() => {
+			if(props.msg == 'Sketchboard'){
+				scene.value = {
+					name: t('SketchboardUpload.GenerateSketch'),
+					value:'generate'
+				}
+			}else if(props.msg == 'Printboard'){
+				scene.value = {
+					name: t('SketchboardUpload.GenerateSketch'),
+					value:'Pattern'
+				}
+			}
 			instance.appContext.config.globalProperties.$dropdownEvents.onClose(removeOpenSpeed)
 			// if(props.msg == 'Sketchboard'){
 			// 	speed.speedData = speed.speedList[1]
@@ -398,6 +420,8 @@ export default defineComponent({
 			printModelList,
 			sketchStyleList,
 			isGenerate,
+			printCatecoryList,
+			scene,
 
 			// printBoards,
 			// moodboarList,
@@ -420,7 +444,8 @@ export default defineComponent({
 			openSpeed,
 			setSpeed,
 			upload,
-			Https
+			Https,
+			setCatecorySceneList,
         };
     },
     data(prop) {
@@ -770,9 +795,7 @@ export default defineComponent({
 										element.category = this.scene?.name
 									}
 								}else if(element.status == 'Fail' || element.status == 'Invalid'){
-									console.log(data)
 									data = data.filter((item:any) => item !== element.taskId);
-									console.log(data)
 									this.fileList = this.fileList.filter((item:any) => item.taskId !== element.taskId);
 									// message.info(this.t('Generate.everyTimeEffectPoor'));
 								}
@@ -926,7 +949,6 @@ export default defineComponent({
 					let paste = this.sketchboardList.filter((v: any) => v.id === file.id);
 					if(paste.length == 0)this.sketchboardList.push(file);
 					this.sketchboardList = this.sketchboardList.filter((v: any) => v.status === "done");
-					console.log('插入图片',this.sketchboardList)
 					nextTick().then(()=>{
 						if(this.driver__.driver && this.type_.type2 == 'Printboard'){
 							driverObj__.moveNext()

src/component/home/design/collection/PrintboardUpload.vue

@@ -27,20 +27,6 @@
 							<span @click.stop="open(3)">{{ $t('PrintboardUpload.Generate') }}</span>
 							
 						</div>
-						<div v-show="openClick == 3" class="generalMenu_printModel printMenu">
-							<generalMenu :dataList="printCatecoryList" @setprintModel="setSceneList" :item="scene" width="14rem" style="padding: 0;"></generalMenu>
-							<!-- <div @click.stop="openPrintModel"><span>{{ scene.name }}<i class="icon iconfont icon-xiala" :class="{forbidden:openMenu}"></i></span>	</div>
-							<ul v-show="openMenu">
-								<li 
-									v-for="item,index in printCatecoryList" 
-									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>
             </div>
@@ -108,7 +94,7 @@
 				@confirmSelect="confirmSelect"
 				:disignTypeList="printCatecoryList"
 				></Material>
-			<Generate v-show="openClick == 3" ref="Generate" :scene="scene" :sketchCatecoryList="printCatecoryList" msg="Printboard"></Generate>
+			<Generate v-show="openClick == 3" ref="Generate" :sketchCatecoryList="printCatecoryList" msg="Printboard"></Generate>
         </div>
 		<div class="modal_right">
 			<div class="modal_layout">
@@ -218,7 +204,6 @@ export default defineComponent({
 			name:'Pattern',
 			value:'Pattern'
 		})
-		let openMenu = ref(false)
 		let printCatecoryList:any = computed(()=>{
 			return store.state.UserHabit.printType
 		})
@@ -237,7 +222,6 @@ export default defineComponent({
 			useGenerate,
 			workspace,
 			scene,
-			openMenu,
 			printCatecoryList,
 			printboardList,
         }
@@ -618,23 +602,6 @@ export default defineComponent({
 			scaleImage.isLike = false
 			scaleImage.init(this.printboardList,index)
 		},
-		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)
-		}
      }
 
 })

src/component/home/design/collection/SketchboardUpload.vue

@@ -23,20 +23,6 @@
                 >
                     <span>{{ $t('SketchboardUpload.Generate') }}</span>
                 </div>
-				<div v-show="openClick == 3" class="generalMenu_printModel printMenu">
-					<div @click.stop="openPrintModel"> <span>{{ scene.name }}<i class="icon iconfont icon-xiala" :class="{forbidden:openMenu}"></i></span>
-						</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">
@@ -129,7 +115,6 @@
                 v-show="openClick == 3"
                 ref="Generate"
                 msg="Sketchboard"
-				:scene="scene"
 				:gender="workspace.sex"
 				:sketchCatecoryList="sketchCatecoryList"
             ></Generate>
@@ -236,14 +221,6 @@ export default defineComponent({
 			designType:'',
 		})
 		
-		let openMenu = ref(false)
-		let sketchStyleList:any = computed(()=>{
-			return store.state.UserHabit.SketchGenerateType
-		})
-		let scene = ref({
-			name: t('SketchboardUpload.GenerateSketch'),
-			value:'generate'
-		})
         return {
             fileList,
             openClick,
@@ -256,9 +233,6 @@ export default defineComponent({
 			driver__,
 			isTest,
 			useGenerate,
-			scene,
-			openMenu,
-			sketchStyleList,
         };
     },
     data() {
@@ -572,23 +546,6 @@ 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>