Merge branch 'dev_vite' of http://18.167.251.121:10003/aidlab/aida_front into dev_vite

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

@@ -355,11 +355,11 @@ export default defineComponent({
 				this.fileList.splice(moodboard,1)
 				this.store.commit("setMoodboardFile", this.fileList);
 			}
-			if(this.store.state.UploadFilesModule.moodboard.length == 0){
+			// if(this.store.state.UploadFilesModule.moodboard.length == 0){
 				this.store.commit("clearMoodTemplateId");
 				this.layoutList = []
 				this.edieShow = false
-			}
+			// }
         },
         openSetData() {
             let arr = JSON.parse(

src/component/home/design/index.vue

@@ -1818,7 +1818,19 @@ export default defineComponent({
 		},
 
 		getSkecthBoard(boardData: any) {
+			console.log(boardData,this.store.state.Workspace.probjects)
 			boardData = boardData || []
+			const mapB = new Map();
+			boardData.forEach(item => {
+				if (item.categoryValue !== undefined) {
+					mapB.set(item.categoryValue, true);
+				}
+			});
+			
+			boardData.filter(item => 
+				item.categoryValue !== undefined && mapB.has(item.categoryValue)
+			);
+			console.log(boardData)
 			let sketchBoards = boardData.map((v: any) => {
 				let data = {
 					designType: v.resData.designType,

src/component/home/index.vue

@@ -228,6 +228,7 @@ export default defineComponent({
 						let uploadElementData = {
 							str:'add',
 							list:rv.uploadElement,
+							isGetModule:true,
 						}
 						store.commit('setUploadElement',uploadElementData)
 

src/component/home/newProject/workspace.vue

@@ -27,11 +27,11 @@
 				<div class="text">{{$t('Habit.Gender')}}:</div>
 				<div class="radio">
 					<label>
-						<input type="radio" :disabled="status == 'edit'" name="gender" v-model="selectObject.sex" value="Female">
+						<input type="radio" name="gender" v-model="selectObject.sex" value="Female">
 						<span>{{$t('Habit.Female')}}</span>
 					</label>
 					<label>
-						<input type="radio" :disabled="status == 'edit'" name="gender" v-model="selectObject.sex" value="Male">
+						<input type="radio" name="gender" v-model="selectObject.sex" value="Male">
 						<span>{{$t('Habit.Male')}}</span>
 					</label>
 				</div>

src/component/home/tools/poseTransfer/index.vue

@@ -39,8 +39,7 @@
 										}"
 										:headers="{ Authorization: token }"
 										:before-upload="beforeUpload"
-										v-model:file-list="fileList"
-										:multiple="true"
+										:multiple="!!upload.projectId"
 										accept=".jpg,.png,.jpeg,.bmp"
 										@change="(file) => fileUploadChange(file)"
 									>
@@ -136,6 +135,7 @@ import generalDrag from '@/component/modules/generalDrag.vue';
 import { getUploadUrl,isMoible,getMinioUrl } from "@/tool/util";
 import { getCookie,setCookie } from "@/tool/cookie";
 import  showViewVideo from "@/tool/mount";
+import router from '@/router';
 
 export default defineComponent({
 	components:{
@@ -156,6 +156,7 @@ export default defineComponent({
 	setup(props,{emit}) {
 		const {t,locale} = useI18n()
 		const store = useStore();
+		const route = useRoute();
 		const data:any = reactive({
 			button:{
 				left:false,
@@ -381,6 +382,11 @@ export default defineComponent({
 			}
 		}
 		let isSelectObject = false
+		watch(()=>route?.query,(newVal)=>{
+			if(!newVal.id){
+				isSelectObject = false	
+			}
+		},{immediate:true})
 		let beforeUpload = async (file: any)=>{
             const isJpgOrPng =
                 file.type === "image/jpeg" ||
@@ -394,6 +400,7 @@ export default defineComponent({
             if (!isLt2M) {
                 message.info(useI18n().t('MoodboardUpload.jsContent4'));
             }
+			console.log(data?.upload,isSelectObject)
 			if(!data?.upload?.projectId && !isSelectObject){
 				isSelectObject = true
 				await createProbject()
@@ -409,28 +416,28 @@ export default defineComponent({
 					file.imgUrl = res.data.url;
 					file.id = res.data.id
 					data.currentList.forEach((listItem:any)=>listItem.isChecked = false)
-					data.fileList.forEach((listItem:any)=>{
-						if(listItem.id == file.id){
-							listItem.isChecked = true
-						}else{
-							listItem.isChecked = false
-						}
-					})
+					// data.fileList.forEach((listItem:any)=>{
+					// 	if(listItem.id == file.id){
+					// 		listItem.isChecked = true
+					// 	}else{
+					// 		listItem.isChecked = false
+					// 	}
+					// })
 					file.type = 'ProductElement'
 					// if(props.productimgMenu.value == 'Relight'){
 					// 	file.type = "ToProductImage"
 					// }
 					data.selectImg = res.data
-					data.fileList.filter((v: any) => v.status === "done");
+					// data.fileList.filter((v: any) => v.status === "done");
 					let storeData = {
 						str:'add',
 						list:[file]
 					}
+
 					store.commit('setUploadElement',storeData)
 				}else{
 					bor = false
 				}
-				// this.showFileList = productImgData.fileList
             } else if (file.status === "error") {
 				bor = false
             }

src/component/home/tools/toProduct/index.vue

@@ -563,6 +563,7 @@ export default defineComponent({
 						}else{
 							obj.elementId = item.id
 							obj.elementType = item.resultType || 'ProductElement'
+							obj.elementType = obj.elementType == 'Relight'?'ToProductImage':obj.elementType
 						}
 						obj.parentId = item?.parentId || item?.userLikeSortId,
 						selectArr.push(JSON.parse(JSON.stringify(obj)))