fix
This commit is contained in:
@@ -530,7 +530,8 @@ export default defineComponent({
|
||||
methods: {
|
||||
setUserData(item:any){
|
||||
this.productimgSearchName = item.prompt
|
||||
this.productimgSimilarity = 100 - item.imageStrength * 100
|
||||
this.productimgSimilarity = (100 - item.imageStrength * 100) * 100 / 70
|
||||
|
||||
this.productimgRelightDirection = item.direction
|
||||
// let list = this.speedTypeList.toPorductImg
|
||||
if(this.speedList.length == 0)return
|
||||
|
||||
@@ -219,6 +219,10 @@ props:{
|
||||
type:String,
|
||||
default:''
|
||||
},
|
||||
onlike:{
|
||||
type:Function,
|
||||
default:()=>{},
|
||||
},
|
||||
},
|
||||
emits:['addGenerateImg','upDataDesignLikeList'],
|
||||
setup(props:any,{emit}) {
|
||||
@@ -316,13 +320,14 @@ setup(props:any,{emit}) {
|
||||
let remPrductimgTime:any = null
|
||||
let prductimgTime:any = null
|
||||
const getData = ()=>{
|
||||
console.log(productimg.scaleImageList[productimg.scaleImageIndex])
|
||||
console.log(productimg.scaleImageList[productimg.scaleImageIndex],productimg.selectGenerate)
|
||||
let obj = null as any
|
||||
if(productimg.scaleImageList[productimg.scaleImageIndex]?.resultType == 'ToProductImage'){
|
||||
obj = {
|
||||
elementId:productimg.scaleImageList[productimg.scaleImageIndex].designOutfitId||productimg.scaleImageList[productimg.scaleImageIndex].elementId,
|
||||
elementType:'DesignOutfit',
|
||||
parentId:productimg.selectGenerate.parentId || productimg.selectGenerate.userLikeSortId,
|
||||
// userLikeSortId:productimg.selectGenerate.userLikeSortId || null,
|
||||
userLikeSortId:productimg.openType == 'add'?(productimg.selectGenerate.userLikeSortId || null):null,
|
||||
}
|
||||
if(productimg.scaleImageList[productimg.scaleImageIndex]?.relationType == "Design"){
|
||||
@@ -334,6 +339,7 @@ setup(props:any,{emit}) {
|
||||
elementType:'ToProductImage',
|
||||
parentId:productimg.selectGenerate.parentId || productimg.selectGenerate.userLikeSortId,
|
||||
userLikeSortId:productimg.openType == 'add'?(productimg.selectGenerate.userLikeSortId || null):null,
|
||||
// userLikeSortId:productimg.selectGenerate.userLikeSortId || null,
|
||||
}
|
||||
}else if(productimg.scaleImageList[productimg.scaleImageIndex]?.resultType == 'PoseTransfer'){
|
||||
|
||||
@@ -401,6 +407,9 @@ setup(props:any,{emit}) {
|
||||
data = getPoseTransformData()
|
||||
}
|
||||
productimg.productimgIsProductimg = true
|
||||
if(productimg.openType != 'add'){
|
||||
await props.onlike(null,null,productimg.selectGenerate.listType,'onLike')
|
||||
}
|
||||
// setPrductimg([{taskId:"f785fbbf-425c-4d9b-b4d0-0f38f480c64e-83"}])
|
||||
// return
|
||||
Https.axiosPost(url, data).then(
|
||||
@@ -420,13 +429,14 @@ setup(props:any,{emit}) {
|
||||
rv.forEach((item:any)=>{
|
||||
arr.push(item.taskId)
|
||||
})
|
||||
console.log(productimg.selectGenerate)
|
||||
productimg.generateCourse = {
|
||||
...rv[0],
|
||||
prompt:productimg.productimgSearchName,
|
||||
parentId:productimg.selectGenerate?.parentId || productimg.selectGenerate.userLikeGroupId,
|
||||
modelName:speed.speedData.value,
|
||||
poseId:productimg.selectPose,
|
||||
userLikeSortId:productimg.selectGenerate?.parentId || productimg.selectGenerate.userLikeGroupId,
|
||||
userLikeSortId:productimg.selectGenerate.userLikeSortId || productimg.selectGenerate?.parentId,
|
||||
sourceUrl:productimg.selectGenerate?.sourceUrl || productimg.selectGenerate?.productImage,
|
||||
status:null,
|
||||
oldId:productimg.openType == 'add'?null:productimg.selectGenerate.id,
|
||||
@@ -548,7 +558,8 @@ setup(props:any,{emit}) {
|
||||
const setUserData = (item:any)=>{
|
||||
productimg.productimgSearchName = item.prompt
|
||||
productimg.productimgBrightenValue = item.brightenValue
|
||||
productimg.productimgSimilarity = 100 - item.imageStrength * 100
|
||||
// productimg.productimgSimilarity = 100 - item.imageStrength * 100
|
||||
productimg.productimgSimilarity = (100 - item.imageStrength * 100) * 100 / 70
|
||||
productimg.productimgRelightDirection = item.direction
|
||||
if(item.poseId){
|
||||
let index = 0;
|
||||
@@ -698,7 +709,8 @@ setup(props:any,{emit}) {
|
||||
|
||||
}
|
||||
let emitData = {
|
||||
status:productimg.openType,
|
||||
status:'add',
|
||||
// status:productimg.openType,
|
||||
addList:[{
|
||||
...productimg.generateCourse,
|
||||
}]
|
||||
|
||||
@@ -306,7 +306,6 @@
|
||||
<div class="mark_loading" v-show="isShowMark">
|
||||
<a-spin size="large" />
|
||||
</div>
|
||||
{{ designTools.designTools }}123
|
||||
|
||||
<!-- 导出缩略图的蒙层 end-->
|
||||
<!-- design collection的进度蒙层 start-->
|
||||
@@ -316,6 +315,7 @@
|
||||
<editDesignType ref="editDesignType"
|
||||
@addGenerateImg="addGenerateImg"
|
||||
@upDataDesignLikeList="generateLoad"
|
||||
:onlike="setNoDesignLike"
|
||||
:productData="{
|
||||
upload:upload,
|
||||
RelightDirection:RelightDirection,
|
||||
@@ -907,6 +907,11 @@ export default defineComponent({
|
||||
arr[index].sort = arr[index].oldSort || arr[index].sort
|
||||
console.log(JSON.parse(JSON.stringify(arr[index])))
|
||||
dataDom.editDesignType.init(arr,index,null,status,listType)
|
||||
if(item != 'Design'){
|
||||
designData.selectDesign = designData.selectLikeDesign.filter((item:any)=>(item.resultType == 'Design' && item.userLikeSortId == designData.selectLikeDesign[index].parentId))[0]
|
||||
}else{
|
||||
designData.selectDesign = designData.selectLikeDesign[index]
|
||||
}
|
||||
dataDom.editDesignType.isLike = false
|
||||
// dataDom.editDesignType.productimgRelightDirection = editDesignType.RelightDirection
|
||||
dataDom.editDesignType.isComparison = true
|
||||
@@ -922,10 +927,12 @@ export default defineComponent({
|
||||
}
|
||||
const setNoDesignLike = (design:any,index:any,type:any,str:string) => {
|
||||
let url
|
||||
let designItem = design || designData.selectEditBtn
|
||||
console.log(designItem,designData?.selectDesign)
|
||||
let data = {
|
||||
toProductImageResultId:[(design.designItemId || design.id)],
|
||||
toProductImageResultId:[(designItem.designItemId || designItem.id)],
|
||||
projectId: store.state.Workspace.probjects.id,
|
||||
collectionSortParentId:designData?.selectDesign?.parentId || design?.parentId,
|
||||
collectionSortParentId:designData?.selectDesign?.parentId || designItem?.parentId,
|
||||
} as any
|
||||
let params = {} as any
|
||||
if(type == 'ToProductImage' || type == 'Relight'){
|
||||
@@ -939,16 +946,16 @@ export default defineComponent({
|
||||
if(str == 'like'){
|
||||
params = {
|
||||
likeOrDislike:'like',
|
||||
transformedId:design.id,
|
||||
transformedId:designItem.id,
|
||||
projectId:store.state.Workspace.probjects.id,
|
||||
collectionSortParentId:design.parentId || designData?.selectDesign?.userLikeSortId,
|
||||
collectionSortParentId:designItem.parentId || designData?.selectDesign?.userLikeSortId,
|
||||
}
|
||||
}else{
|
||||
params = {
|
||||
likeOrDislike:'dislike',
|
||||
transformedId:design.id,
|
||||
transformedId:designItem.id,
|
||||
projectId:store.state.Workspace.probjects.id,
|
||||
collectionSortParentId:design.parentId || designData?.selectDesign?.userLikeSortId,
|
||||
collectionSortParentId:designItem.parentId || designData?.selectDesign?.userLikeSortId,
|
||||
}
|
||||
}
|
||||
}else{
|
||||
@@ -967,11 +974,11 @@ export default defineComponent({
|
||||
if(item.resultType == 'Design' && item.userLikeSortId == designData.selectDesign.userLikeSortId){
|
||||
if(!item?.childList)item.childList = []
|
||||
// if(item?.childList)
|
||||
const removeIndex = item?.childList.findIndex(childItem => childItem?.taskId === design?.taskId);
|
||||
const removeIndex = item?.childList.findIndex(childItem => childItem?.taskId === designItem?.taskId);
|
||||
if (removeIndex !== -1) {
|
||||
item.childList[removeIndex] = design
|
||||
item.childList[removeIndex] = designItem
|
||||
}else{
|
||||
item.childList.push(design)
|
||||
item.childList.push(designItem)
|
||||
}
|
||||
}
|
||||
})
|
||||
@@ -979,12 +986,12 @@ export default defineComponent({
|
||||
likeDesignCollectionList.value.forEach((item:any)=>{
|
||||
if(item.resultType == 'Design' && item.userLikeSortId == designData.selectDesign.userLikeSortId){
|
||||
item.childList.forEach((childItem:any)=>{
|
||||
if(childItem.sort > design.oldSort){
|
||||
if(childItem.sort > designItem.oldSort){
|
||||
childItem.sort -= 1
|
||||
}
|
||||
})
|
||||
item.childList = item.childList.filter((childItem:any)=>{
|
||||
return childItem.id != design.id
|
||||
return childItem.id != designItem.id
|
||||
})
|
||||
}
|
||||
})
|
||||
@@ -1080,8 +1087,6 @@ export default defineComponent({
|
||||
}
|
||||
const generateLoad = async (data:any)=>{
|
||||
// return
|
||||
console.log(JSON.parse(JSON.stringify(data)))
|
||||
|
||||
let list = likeDesignCollectionList.value
|
||||
//添加元素
|
||||
if(data.addList){
|
||||
@@ -2137,6 +2142,7 @@ export default defineComponent({
|
||||
if(this.isMove)return
|
||||
this.store.commit('setOpenChatStatus',false)
|
||||
if(design.resultType != "Design"){
|
||||
this.selectEditBtn = design
|
||||
this.setEditDesignType(collectionList,index,design.resultType,'edit',type)
|
||||
return
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user