push Develop

src/component/HomePage/Material.vue

@@ -8,6 +8,25 @@
             :centered="true"
         > -->
             <div class="my_material_header">
+				<div class="my_material_header_left" v-if="selectCode != 'Moodboard'">
+					<div class="select_block">
+						<a-select
+							ref="select"
+							v-model:value="disignType"
+							:options="disignTypeList"
+							@change="handleChange"
+							:fieldNames="{ label: 'name', value: 'value' }"
+						>
+							<template #suffixIcon
+								><span
+									class="icon iconfont icon-xiala"
+									style="color: #343579"
+								></span
+							></template>
+						</a-select>
+					</div>
+					
+				</div>
                 <div class="my_material_header_right">
                     <div class="content_search_block">
                         <input class="search_input" :placeholder="$t('Material.inputContent1')" v-model="searchPictureName"  @keydown.enter="getLibraryList('')">
@@ -21,8 +40,8 @@
                 <div class="material_content_body scroll_style">
 					<div v-for="item,index in imgList" :key="item" class="content_img_item" :class="[ item?.checked ? 'active':''  , selectCode == 'Moodboard' ? 'moodb':''  ]" >
 						<img :src="item?.imgUrl" @click.stop="selectImgItem(item)">
-						<sketchCategory v-if="selectCode == 'Sketchboard'" :disignTypeList="disignTypeList" :generateList="imgList" :item="item" :isSetSketchCategory="true"></sketchCategory>
-						<printCategory v-if="selectCode == 'Printboard'" :disignTypeList="disignTypeList" :generateList="imgList" :item="item" :isSetSketchCategory="true"></printCategory>
+						<sketchCategory v-if="selectCode == 'Sketchboard'" :disignTypeList="disignTypeList" :generateList="imgList" :item="item" :isSetSketchCategory="true" @upTypeSucced='upTypeSucced'></sketchCategory>
+						<!-- <printCategory v-if="selectCode == 'Printboard'" :disignTypeList="disignTypeList" :generateList="imgList" :item="item" :isSetSketchCategory="true"></printCategory> -->
 						<!-- <div v-if="selectCode == 'Sketchboard' || selectCode == 'Printboard'" class="pin_block">
 							<a-checkbox v-model:checked="item.pin">{{ $t('Material.PIN') }}</a-checkbox>
 						</div> -->
@@ -67,7 +86,6 @@ export default defineComponent({
         let pageSize = ref(12)
         let total = ref(0)
         let searcMaterialhName:any = ref('') //搜索名字
-        let designType:any = ref(null)
         // let disignTypeList:any = ref([
 		let driver__:any = inject('driver__')
 				
@@ -77,6 +95,11 @@ export default defineComponent({
 		let {t} = useI18n()
 		let usGenerateList = ref([])
 	
+		
+		let disignType = ref({
+			name:'',
+			value:''
+		})
         return{
             myMaterialModalShow,
             imgList,
@@ -88,12 +111,12 @@ export default defineComponent({
             pageSize,
             total,
             searcMaterialhName,
-            designType,
             // disignTypeList,
 			workspace,
 			t,
 			driver__,
 			usGenerateList,
+			disignType,
         }
     },
 	data (prop) {
@@ -229,6 +252,9 @@ export default defineComponent({
 			this.currentPage = 1
 			this.pageSize = 12
 			this.imgList = []
+			if(code != 'Moodboard'){
+				this.disignType = this.disignTypeList[0].value
+			}
 			this.getLibraryList('')
 			
         },
@@ -251,6 +277,10 @@ export default defineComponent({
 		},
         selectImgItem(imgData:any){
 			let parent:any = this.$parent
+			if(this.selectCode != 'Moodboard'){
+				imgData.categoryValue = imgData.level2TypeEnum.value
+				imgData.category = imgData.level2TypeEnum.name
+			}
 			if(parent.isUseGenerate){
 				this.setUseGenerate([])
 				imgData.checked = true
@@ -258,8 +288,12 @@ export default defineComponent({
 					imgId : imgData.id,
 					imgUr: imgData.imgUrl,
 					level2Type:imgData.level2Type,
+					categoryValue:imgData.categoryValue,
+					category:imgData.category,
 					designType:'library'
 				}
+				console.log(obj);
+				
 				// parent.useGenerate.designType = 'collection'
 				this.$emit('setLibrary',obj)
 			}else{
@@ -283,6 +317,14 @@ export default defineComponent({
 			}
 			
         },
+		handleChange(){
+			this.currentPage = 1
+			this.imgList = []
+            this.getLibraryList('')
+		},
+		upTypeSucced(){
+			this.handleChange()
+		},
         //选择所有的图片
         async getLibraryList(str:any){
 			let workspace = JSON.parse(JSON.stringify(this.store.state.Workspace.workspace))
@@ -297,7 +339,7 @@ export default defineComponent({
 			}
             let data = {
                 level1Type:this.selectCode,
-                // level2Type:this.designType,
+                level2Type: this.selectCode == 'Moodboard'?'':this.disignType,
 				modelSex:workspace?.sex,
                 page: this.currentPage,
                 // page:this.currentPage,
@@ -396,6 +438,16 @@ export default defineComponent({
 		position: sticky;
 		top: 0;
 		z-index: 2;
+		.my_material_header_left{
+			.select_block{
+				border: calc(0.1rem* 1.2) solid #F1F1F1;
+				margin-right: calc(2.3rem*1.2);
+				height: 4rem;
+				.ant-select-selector{
+					height: 90%;
+				}
+			}
+		}
         .my_material_header_right{
             display: flex;
             justify-content: space-between;
@@ -415,7 +467,7 @@ export default defineComponent({
                     // font-size: 1.6rem*1.2);
 					font-size: calc(1.2rem*1.2);
                     font-weight: 400;
-					height: calc(3rem*1.2);
+					height: 4rem;
 
                     &::placeholder {
                         color: #C2C2C2;
@@ -466,7 +518,7 @@ export default defineComponent({
                 font-size: calc(2rem*1.2);
                 color: #030303;
             }
-
+			
             .material_content_top_right{
                 display: flex;
                 align-items: center;