aidlab/aida_front
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/StableVersion' into dev_vite

Browse Source
This commit is contained in:
X1627315083
2025-10-07 11:14:07 +08:00
parent 6a71ec8cee 40aa1d6d25
commit 0fa50cc6ae
10 changed files with 44 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/component/home/design/editDesignType/index.vue
View File

@@ -37,10 +37,10 @@
<div v-show="scaleImageList[scaleImageIndex]?.resultType == 'Relight'" class="productImg_content_item_Direction generalModel_state_item" style="margin-bottom: 1rem;">
<a-select size="large" style="width: 100%;" v-model:value="speedData.value" :options="speedList" :field-names="{ label: 'relightLabel', value: 'value' }"></a-select>
</div> -->
<div v-show="scaleImageList[scaleImageIndex]?.resultType == 'ToProductImage' && speedData.value != 'flux'" class="productImg_content_item_title productImg_content_item_title_similarity">
<div v-show="scaleImageList[scaleImageIndex]?.resultType == 'ToProductImage' && !speedData.value" class="productImg_content_item_title productImg_content_item_title_similarity">
<span>{{$t('ProductImg.Similarity')}}</span>
</div>
<div v-show="scaleImageList[scaleImageIndex]?.resultType == 'ToProductImage' && speedData.value != 'flux'" class="productImg_content_item_similarity ">
<div v-show="scaleImageList[scaleImageIndex]?.resultType == 'ToProductImage' && !speedData.value" class="productImg_content_item_similarity ">
<a-slider class="system_silder"
v-model:value="productimgSimilarity"
:tooltipVisible="false"
@@ -51,16 +51,16 @@
</a-slider>
<input style="margin-left: 2rem;" type="number" readonly v-model="productimgSimilarity">
</div>
<div v-show="scaleImageList[scaleImageIndex]?.resultType == 'Relight' && speedData.value != 'flux'" class="productImg_content_item_title productImg_content_item_title_similarity">
<div v-show="scaleImageList[scaleImageIndex]?.resultType == 'Relight' && !(speedData.value == 'advanced' || speedData.value == 'flux')" class="productImg_content_item_title productImg_content_item_title_similarity">
<span>{{$t('ProductImg.RelightDirection')}}</span>
</div>
<div v-show="scaleImageList[scaleImageIndex]?.resultType == 'Relight' && speedData.value != 'flux'" class="productImg_content_item_Direction generalModel_state_item">
<div v-show="scaleImageList[scaleImageIndex]?.resultType == 'Relight' && !(speedData.value == 'advanced' || speedData.value == 'flux')" class="productImg_content_item_Direction generalModel_state_item">
<a-select size="large" style="width: 100%;" v-model:value="productimgRelightDirection" :options="productimgRelightDirectionList"></a-select>
</div>
<div v-show="scaleImageList[scaleImageIndex]?.resultType == 'Relight' && speedData.value != 'flux'" class="productImg_content_item_title productImg_content_item_title_similarity">
<div v-show="scaleImageList[scaleImageIndex]?.resultType == 'Relight' && !(speedData.value == 'advanced' || speedData.value == 'flux')" class="productImg_content_item_title productImg_content_item_title_similarity">
<span>{{$t('ProductImg.Highlight')}}</span>
</div>
<div v-show="scaleImageList[scaleImageIndex]?.resultType == 'Relight' && speedData.value != 'flux'" class="productImg_content_item_similarity">
<div v-show="scaleImageList[scaleImageIndex]?.resultType == 'Relight' && !(speedData.value == 'advanced' || speedData.value == 'flux')" class="productImg_content_item_similarity">
<a-slider class="system_silder"
v-model:value="productimgBrightenValue"
:tooltipVisible="false"
@@ -94,7 +94,7 @@
</div>
</div>
<div class="selectText" v-show="scaleImageList[scaleImageIndex]?.resultType == 'ToProductImage' && speedData.value == 'flux'">
<div class="selectText" v-show="scaleImageList[scaleImageIndex]?.resultType == 'ToProductImage' && (speedData.value == 'advanced' || speedData.value == 'flux')">
<div :title="$t('poseTransfer.hint')" @click="()=>{productimgSearchName = $t('poseTransfer.hint');ifMaximumLength()}">{{ $t('poseTransfer.hint') }}</div>
</div>
<div class="transferPose" v-show="scaleImageList[scaleImageIndex]?.resultType == 'PoseTransfer'">
@@ -263,7 +263,7 @@ setup(props:any,{emit}) {
title:'',
label:t('speedList.toproductFlus'),
relightLabel:t('speedList.relightEdit'),
value:'flux',
value:'advanced',
},{
title:'',
label:t('speedList.toproductBasic'),
@@ -277,7 +277,7 @@ setup(props:any,{emit}) {
title:'',
label:t('speedList.toproductFlus'),
relightLabel:t('speedList.relightEdit'),
value:'flux',
value:'advanced',
},
})
const openSpeed = ()=>{
@@ -338,7 +338,6 @@ setup(props:any,{emit}) {
projectId:productimg.selectObject.id,
productImage:getMinioUrl(productimg.scaleImageList[productimg.scaleImageIndex].sourceUrl),
modelName:speed.speedData.value,
parentId:productimg.selectGenerate.parentId || productimg.selectGenerate.userLikeSortId,
userLikeSortId:productimg.openType == 'add'?(productimg.selectGenerate.userLikeSortId || null):null,
isDefaultLike:true,//表示是否生成就like
@@ -352,7 +351,7 @@ setup(props:any,{emit}) {
direction:productimg.productimgRelightDirection,
prompt:productimg.productimgSearchName,
toProductImageVOList:[obj],
modelName:speed.speedData.value,
modelName:'flux',
brightenValue:productimg.productimgBrightenValue,
projectId:productimg.selectObject.id,
imageStrength:(100 - imageStrength)/100,
@@ -367,6 +366,7 @@ setup(props:any,{emit}) {
// },10000)
let url = Https.httpUrls.relight
if(productimg.scaleImageList[productimg.scaleImageIndex]?.resultType == 'ToProductImage'){
data.modelName = speed.speedData.value
url = Https.httpUrls.toProduct
}else if(productimg.scaleImageList[productimg.scaleImageIndex]?.resultType == 'PoseTransfer'){
url = Https.httpUrls.poseTransform
@@ -426,7 +426,8 @@ setup(props:any,{emit}) {
...rv[0],
prompt:productimg.productimgSearchName,
parentId:productimg.selectGenerate?.parentId || productimg.selectGenerate.userLikeGroupId,
modelName:speed.speedData.value,
// modelName:speed.speedData.value,
modelName:data.modelName,
poseId:productimg.selectPose,
userLikeSortId:productimg.selectGenerate.userLikeSortId || productimg.selectGenerate?.parentId,
sourceUrl:productimg.selectGenerate?.sourceUrl || productimg.selectGenerate?.productImage,