部分bug修复和对话中的图片过期处理

src/component/home/design/collection.vue

@@ -94,7 +94,7 @@ export default defineComponent({
 			openType:'',
 			collectionStep:1,
 			selectObject:computed(()=>store.state.Workspace.probjects),//选择的项目
-			createProbject:inject('createProbject') as any
+			createProbject:inject('createProbject',()=>{}) as any
 
 		})
 		let driver__:any = computed(()=>{

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

@@ -806,8 +806,18 @@ export default defineComponent({
 			this.setColorboardList(colorList)
 		},
 		setPrintImg(){
-			let printImgListData = JSON.parse(JSON.stringify(this.store?.state?.UploadFilesModule.printboard))
-			let moodImgListData = JSON.parse(JSON.stringify(this.store?.state?.UploadFilesModule.moodboard))
+			let printImgListData = []
+			if(this.store?.state?.UploadFilesModule.printboard == 0){
+				printImgListData = JSON.parse(JSON.stringify(this.store?.state?.UploadFilesModule.allBoardData.printboardFiles))
+			}else{
+				printImgListData = JSON.parse(JSON.stringify(this.store?.state?.UploadFilesModule.printboard))
+			}
+			let moodImgListData = []
+			if(this.store?.state?.UploadFilesModule.printboard == 0){
+				moodImgListData = JSON.parse(JSON.stringify(this.store?.state?.UploadFilesModule.allBoardData.moodboardFiles))
+			}else{
+				moodImgListData = JSON.parse(JSON.stringify(this.store?.state?.UploadFilesModule.moodboard))
+			}
 			let imgListData = [...moodImgListData,...printImgListData]
 			if(imgListData?.length==0){
 				message.info(this.t('ColorboardUpload.jsContent6'))
@@ -821,7 +831,7 @@ export default defineComponent({
 		setImgGetColor(data){
 			data.status = 'await'
 			this.fileList[0] = data
-			fetch(data.imgUrl)
+			fetch(data.imgUrl || data.url)
 			.then(response => response.blob())
 				.then(blob => {
 					const reader = new FileReader();

src/component/home/design/editDesignType/index.vue

@@ -506,7 +506,8 @@ setup(props:any,{emit}) {
 			status:productimg.generateSuccess.status,
 			listType:productimg.generateSuccess.listType,
 			isIndex:productimg.generateSuccess.isIndex,
-			userLikeSortId:productimg.generateSuccess.userLikeSortId
+			userLikeSortId:productimg.generateSuccess.userLikeSortId,
+			parentId:productimg.generateSuccess.parentId
 		}
 		emit('addGenerateImg',data)
 		
@@ -588,14 +589,16 @@ methods: {
 
 		}
 		// this.
+		console.log(list[index])
 		this.generateSuccess.userLikeSortId =  list[index].userLikeSortId
+		this.generateSuccess.parentId =  list[index].parentId
 		this.generateSuccess.productimgIsProductimg = !!this.generateSuccess.productimgIsProductimg
 		this.generateSuccess.productimgRemProductimg = !!this.generateSuccess.productimgRemProductimg
 		this.generateSuccess.isShowMark = !!this.generateSuccess.isShowMark
 		this.generateSuccess.remPrductimgTime = this.generateSuccess.remPrductimgTime?this.generateSuccess.remPrductimgTime:null
 		this.generateSuccess.prductimgTime = this.generateSuccess.prductimgTime?this.generateSuccess.prductimgTime:null
 		this.scaleImage = true
-		if(this.poseList.length == 0){
+		if(this.poseList.length == 0 && list[index].type == 'PoseTransfer'){
 			this.getPoseList()		
 		}
 		// if(status == 'edit'){
@@ -623,7 +626,11 @@ methods: {
 		}else{
 			this.speedList = this.speedTypeList.toPorductImg
 		}
-		this.speedData = JSON.parse(JSON.stringify(this.speedList[0]))
+		if(this.scaleImageList[index].resultType == "Relight"){
+			this.speedData = JSON.parse(JSON.stringify(this.speedList[1]))
+		}else{
+			this.speedData = JSON.parse(JSON.stringify(this.speedList[0]))
+		}
 		// if(this.scaleImageList[index]?.resultType == 'ToProductImage')this.scaleImageList[index].sourceUrl = this.scaleImageList[index].imgUrl
 		this.scaleImageIndex = index
 		if(dialogueIndex)this.robotAssits = dialogueIndex

src/component/home/design/index.vue

@@ -37,9 +37,20 @@
 						<!-- <div class="right_top" ref="hidden" :class="{'active':domHidden}"> -->
 							<div class="right_top_left">
 								<div class="gallery_btn white Guide_1_15" @click="designNewCollection()">
-								<!-- <div class="gallery_btn white Guide_1_15" @click="designNewCollection()"> -->
 									{{ $t('HomeView.Design') }}
 								</div>
+								<div class="generage_btn_box">
+									<div class="generage_btn started_btn" style="margin-left: 2rem;">
+										<div class="" @click="openEditTools()" style="margin-left: 1rem;">
+											Tools
+										</div>
+										<div class="icon iconfont icon-xiala" :class="{active:speedState}" @click.stop="openSpeed"></div>
+										<div class="content" v-show="speedState">
+											<div v-for="item in speedList" :key="item.value" style="font-size: 1.6rem;" :class="{active:item.value == speedData.value}" @click.stop="setSpeed(item)" :title="item.title">{{ item.label }}</div>
+										</div>
+									</div>
+								</div>
+								
 								<!-- <div class="gallery_btn white button_margin_14 Guide_1_30" v-show="designCollectionId"
 									@click="resDesignCollection()">
 									{{ $t('HomeView.Redesign') }}
@@ -212,23 +223,24 @@
 			</div>
 		</div>
 		<div ref="designBtn"  class="btnOpen" @click.stop="()=>openEditBtnId=-1" :class="{active:openEditBtnId == selectEditBtn?.designItemId||openEditBtnId == selectEditBtn?.id}">
+			<div class="item" v-show="selectEditBtn?.resultType == 'Design'" @click="setEditDesignType(selectLikeDesign,selectEditBtnIndex,'ToProductImage','add','like')">
+				<div class="text">To Product Image</div>
+				<i class="fi fi fi-ss-box-open"></i>
+			</div>
+			<div class="item" v-show="selectEditBtn?.resultType == 'ToProductImage' || selectEditBtn?.resultType == 'Relight'" @click="setEditDesignType(selectLikeDesign,selectEditBtnIndex,'Relight','add','like')">
+				<div class="text">Relight</div>
+				<i class="fi fi fi-br-keyboard-brightness"></i>
+			</div>
+			<div class="item" v-show="selectEditBtn?.resultType == 'ToProductImage' || selectEditBtn?.resultType == 'Relight'" @click="setEditDesignType(selectLikeDesign,selectEditBtnIndex,'PoseTransfer','add','like')">
+				<div class="text">Transfer Pose</div>
+				<i class="fi fi fi-rr-play-alt"></i>
+			</div>
 			<div class="item" @click="dislikeDesignCollection(selectEditBtn,selectEditBtn?.resultType,selectEditBtnIndex)">
 				<div class="text">Delete</div>
 				<i class="fi fi-rr-trash icon_delete">
 				</i>
 			</div>
-			<div class="item" v-show="selectEditBtn?.resultType == 'ToProductImage'" @click="setEditDesignType(selectLikeDesign,selectEditBtnIndex,'PoseTransfer','add','like')">
-				<div class="text">Transfer Pose</div>
-				<i class="fi fi fi-rr-play-alt"></i>
-			</div>
-			<div class="item" v-show="selectEditBtn?.resultType == 'ToProductImage'" @click="setEditDesignType(selectLikeDesign,selectEditBtnIndex,'Relight','add','like')">
-				<div class="text">Relight</div>
-				<i class="fi fi fi-br-keyboard-brightness"></i>
-			</div>
-			<div class="item" v-show="selectEditBtn?.resultType == 'Design'" @click="setEditDesignType(selectLikeDesign,selectEditBtnIndex,'ToProductImage','add','like')">
-				<div class="text">To Product Image</div>
-				<i class="fi fi fi-ss-box-open"></i>
-			</div>
+			
 		</div>
 		<collectionModal ref="collectionModal"></collectionModal>
 		<!-- <DesignDetail ref="designDetail" @finishRedesign="finishRedesign"></DesignDetail> -->
@@ -250,6 +262,7 @@
 			}" 
 			@setGenerateAwait="setGenerateAwait"
 			:isProductimg="true"></editDesignType>
+		<designTools ref="designTools" @editToolsSuccess="editToolsSuccess"></designTools>
 	</div>
 
 </template>
@@ -275,6 +288,7 @@ import { useI18n } from "vue-i18n";
 import { getMousePosition } from "@/tool/mdEvent";
 import { removeClass } from "element-plus/es/utils";
 import collectionModal from './collection.vue'
+import designTools from './tools.vue'
 const FileSaver = require("file-saver");
 
 export default defineComponent({
@@ -287,6 +301,7 @@ export default defineComponent({
 		generalCanvas,
 		DesignDetailcopy,
 		editDesignType,
+		designTools,
 	},
 	emits:['setTask'],
 	 activated() {
@@ -383,7 +398,50 @@ export default defineComponent({
 			collectionModal:null as any,
 			editDesignType:null as any,
 			designBtn:null as any,
+			designTools:null as any,
 		})
+			//可使用的tools类型
+		let speed = reactive({
+			speedList:[
+				{
+					label:'To Product Image',
+					value:'toProduct',
+
+				},{
+					label:'Transfer Pose',
+					value:'poseTransfer',
+				},{
+					label:'Relight',
+					value:'relight',
+				},
+			],
+			speedState:false,
+			speedData:{
+				label:'To Product Image',
+				value:'toProduct',
+			},
+		})
+		const openSpeed = ()=>{
+			speed.speedState = !speed.speedState
+			if(speed.speedState){
+				document.addEventListener('click',openSpeed)
+			}else{
+				document.removeEventListener('click',openSpeed)
+			}
+		}
+		const setSpeed = (item:any)=>{
+			speed.speedState = false
+			speed.speedData = item
+		}
+		const openEditTools = ()=>{
+			dataDom.designTools.init(speed.speedData.value,likeDesignCollectionList.value)
+		}
+		const editToolsSuccess = ()=>{
+			nextTick().then(()=>{
+				designData.isUnfold = true
+				uploadLikeDom()
+			})
+		}
 		const designData = reactive({
 			openEditBtnId:-1,
 			selectEditBtn:null as any,
@@ -404,7 +462,6 @@ export default defineComponent({
 			selectDesign:null as any,//当前选择的design
 			isUnfold:false,
 			selectLikeDesign:[] as any,
-
 			//类型
 			resultTypeList:[
 				{
@@ -791,7 +848,7 @@ export default defineComponent({
 				userGroupId:data.userGroupId || data.id,
 				firstFrameUrl:data.firstFrameUrl,
 				gifUrl:data.gifUrl,
-				userLikeSortId:data.userLikeSortId,	
+				parentId:data.parentId || data.userLikeSortId,	
 			}
 			let list = []
 			if(data.listType == 'disLike'){
@@ -837,7 +894,7 @@ export default defineComponent({
 			let data = {
 				toProductImageResultId:[(design.designItemId || design.id)],
 				projectId: store.state.Workspace.probjects.id,
-				collectionSortParentId:designData?.selectDesign?.userLikeSortId || design.parentId,
+				collectionSortParentId:designData?.selectDesign?.parentId || design.parentId,
 			} as any
 			let params = {} as any
 			if(type == 'ToProductImage' || type == 'Relight'){
@@ -853,14 +910,14 @@ export default defineComponent({
 						likeOrDislike:'like',
 						transformedId:design.id,
 						projectId:store.state.Workspace.probjects.id,
-						collectionSortParentId:designData?.selectDesign?.userLikeSortId || design.parentId,
+						collectionSortParentId:design.parentId || designData?.selectDesign?.userLikeSortId,
 					}
 				}else{
 					params = {
 						likeOrDislike:'dislike',
 						transformedId:design.id,
 						projectId:store.state.Workspace.probjects.id,
-						collectionSortParentId:designData?.selectDesign?.userLikeSortId || design.parentId,
+						collectionSortParentId:design.parentId || designData?.selectDesign?.userLikeSortId,
 					}
 				}
 			}else{
@@ -883,13 +940,14 @@ export default defineComponent({
 					}else{
 						likeDesignCollectionList.value.forEach((item:any)=>{
 							if(item.resultType == 'Design' && item.userLikeSortId == designData.selectDesign.userLikeSortId){
-								item.childList = item.childList.filter((item:any)=>{
-									return item.id != design.id
+								item.childList = item.childList.filter((childItem:any)=>{
+									return childItem.id != design.id
 								})
 							}
 						})
 					}
 					nextTick().then(()=>{
+						designData.isUnfold = true
 						uploadLikeDom()
 					})
 					
@@ -1093,6 +1151,13 @@ export default defineComponent({
 			...toRefs(collItemSize),
 			...toRefs(designData),
 			...toRefs(dataDom),
+			//编辑tools相关
+			...toRefs(speed),
+			openSpeed,
+			setSpeed,
+			openEditTools,
+			editToolsSuccess,
+
 			likeItemDom,
 			collItemDom,
 			domHidden,
@@ -1215,6 +1280,8 @@ export default defineComponent({
 				this.setShowHide('recycleDomHidden')
 			})
 		}
+		this.isUnfold = true
+		this.setUnfold()
 	},
 	directives:{
 		mousewheel:{

src/component/home/design/tools.vue

@@ -0,0 +1,181 @@
+<template>
+	<div class="designToolsModel" ref="designToolsModel" v-show="designTools"></div>
+	<a-modal
+		class="collection generalModel fullScreen"
+		v-model:visible="designTools"
+		:footer="null"
+		width="100%"
+		height="100%"
+		:get-container="() => $refs.designToolsModel"
+		:maskClosable="false"
+		:centered="true"
+		:closable="false"
+		:mask="false"
+		:keyboard="false"
+		:destroyOnClose="false"
+		:zIndex="1000"
+	>
+		<div class="generalModel_btn">
+			<div class="generalModel_closeIcon" @click.stop="cleardata()">
+				<svg width="46" height="46" viewBox="0 0 46 46" fill="none" xmlns="http://www.w3.org/2000/svg">
+					<circle cx="23" cy="23" r="23" fill="#000" fill-opacity="0.3"/>
+					<rect x="32.5063" y="12" width="3" height="29" rx="1.5" transform="rotate(45 32.5063 12)" fill="white"/>
+					<rect x="34.6274" y="32.5059" width="3" height="29" rx="1.5" transform="rotate(135 34.6274 32.5059)" fill="white"/>
+				</svg>
+			</div>
+		</div>
+		<div class="designOpenrtion_content">
+			<!-- <div class="modal_title_text">
+				<div>Setting</div>
+			</div> -->
+			<div class="collectionBox">
+				<toProductRelight ref="toProduct" 
+					:productimgMenu="{value:'ToProductImage',label:$t('ProductImg.ProductImage')}" 
+					:isDesignPage="true"
+					@setLike="designLike"
+					class="toProduct" 
+					:isState="openType =='toProduct'" 
+					v-if="openType == 'toProduct'"
+				></toProductRelight>
+				<toProductRelight ref="relight" 
+					:productimgMenu="{value:'Relight',label:$t('ProductImg.Relight')}" 
+					:isDesignPage="true"
+					@setLike="designLike"
+					class="relight" 
+					:isState="openType =='relight'"	
+					v-if="openType == 'relight'"
+				></toProductRelight>
+				<poseTransfer v-if="openType == 'poseTransfer'" :isDesignPage="true" @setLike="designLike" ref="poseTransfer"></poseTransfer>
+			</div>
+		</div>
+		<div class="mark_loading" v-show="isShowMark">
+			<a-spin size="large" />
+		</div>
+	</a-modal>
+</template>
+<script lang="ts">
+import { defineComponent,computed,ref,provide,nextTick,inject,toRefs, reactive, onBeforeMount} from 'vue'
+import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+import { Https } from "@/tool/https";
+import { useStore } from "vuex";
+import { useI18n } from 'vue-i18n'
+import toProductRelight from '../tools/toProduct/index.vue'
+import poseTransfer from '../tools/poseTransfer/index.vue'
+
+export default defineComponent({
+	components:{
+		toProductRelight,poseTransfer
+	},
+	props:{
+	},
+	emits:['editToolsSuccess'],
+	setup(props,{emit}) {
+		const store = useStore();
+		const data = reactive({
+			designTools:false,
+			isShowMark:false,
+			openType:'',
+			selectObject:computed(()=>store.state.Workspace.probjects),//选择的项目
+			createProbject:inject('createProbject',()=>{}) as any,
+			likeDesignList:[],
+		})
+		const dataDom = reactive({
+			toProduct:null as any,
+			relight:null as any,
+			poseTransfer:null as any,
+		}) as any
+		const init = (value:any,list:any)=>{
+			data.designTools = true
+			data.openType = value
+			data.likeDesignList = list
+			console.log(list)
+			nextTick(()=>{
+				let fileList = [] as any
+				if(value == 'toProduct'){
+					list.forEach((item:any) => {
+						item.type = 'DesignOutfit'
+						fileList.push(item)
+					});
+				}else if(value == 'relight' || value == 'poseTransfer'){
+					list.forEach((item:any) => {
+						if(item.childList){
+							item.childList.forEach((child:any) => {
+								if(child.resultType == 'ToProductImage' || child.resultType == 'Relight'){
+									fileList.push(child)
+								}
+							});
+						}
+					});
+				}
+				dataDom[value].openSetData(fileList)
+			})
+		}
+		let cleardata = async ()=>{
+			data.openType = ''
+			data.likeDesignList = []
+			data.designTools = false
+		}
+		const designLike = ()=>{
+
+		}
+		return{
+			...toRefs(dataDom),
+			...toRefs(data),
+			cleardata,
+			init,
+			designLike,
+		}
+	},
+	provide() {
+		return {
+		}
+	},
+})
+</script>
+<style lang="less" scoped>
+	.designToolsModel{
+		position: relative;
+		position: absolute;
+		left: 50%;
+		top: 50%;
+		transform: translate(-50%, -50%);
+		width: 100%;
+		height: 100%;
+		z-index: 1000;
+		:deep(>div){
+			
+			// position: absolute;
+			// .ant-modal-mask{
+			// 	position: absolute;
+			// }
+			.ant-modal-wrap,.ant-modal-mask{
+
+			}
+			> .ant-modal-root{
+				> .ant-modal-centered{
+					> .fullScreen{
+						> .ant-modal-content{
+							box-shadow: none;
+							> .ant-modal-body{
+								padding: 0;
+							}
+						}
+					}
+				}
+			}
+		}
+		.designOpenrtion_content{
+			height: 100%;
+			> .collectionBox{
+				height: 100%;
+			}
+		}
+		.fullScreen{
+			 .generalModel_btn {
+				.generalModel_closeIcon{
+					transform: translate(-10%, 10%);
+				}
+			}
+		}
+	}
+</style>