Merge remote-tracking branch 'origin/develop' into dev_vite
This commit is contained in:
@@ -423,13 +423,17 @@
|
||||
(selectCode == 'Sketchboard')" class="fi fi-bs-magic-wand" style="background-color: #000; font-size: 2.3rem; flex: 1;margin: 0;"></i>
|
||||
<span v-else>{{ $t('LibraryPage.Generate') }}</span>
|
||||
</div>
|
||||
<div class="icon iconfont icon-xiala" v-show="
|
||||
selectCode == 'Moodboard' ||
|
||||
(selectCode == 'Printboard' && scene?.value == 'Pattern') ||
|
||||
(selectCode == 'Sketchboard')" :class="{active:speedState}" @click.stop="openSpeed"></div>
|
||||
<div class="icon iconfont icon-xiala"
|
||||
v-show="(selectCode == 'Sketchboard') ||
|
||||
(selectCode == 'Printboard' && scene.value == 'Pattern') || selectCode == 'Moodboard'"
|
||||
:class="{active:speedState}" @click.stop="openSpeed"></div>
|
||||
</div>
|
||||
<div class="content" v-if="scene?.value != 'extract'" v-show="speedState">
|
||||
<div v-for="item in speedList" :class="{active:item.value == speedData.value}" v-show="(selectCode == 'Moodboard' && item?.value != 'flux') || (selectCode == 'Sketchboard' && item?.value != 'flux') || selectCode == 'Printboard'" :key="item.value" @click.stop="setSpeed(item)" :title="item.title">{{ item.label }}</div>
|
||||
<div v-for="item in speedList" :class="{active:item.value == speedData.value}"
|
||||
v-show="(selectCode == 'Moodboard' && item?.value != 'flux') ||
|
||||
(selectCode == 'Sketchboard' && item?.value != 'flux') ||
|
||||
(selectCode == 'Printboard')"
|
||||
:key="item.value" @click.stop="setSpeed(item)" :title="item.title">{{ item.label }}</div>
|
||||
</div>
|
||||
<div class="content" v-else v-show="speedState">
|
||||
<div v-for="item in extractList" :class="{active:item.value == speedData.value}" :key="item.value" @click.stop="setSpeed(item)" :title="item.title">{{ item.label }}</div>
|
||||
@@ -716,14 +720,14 @@ export default defineComponent({
|
||||
title:'Generate using Wanxiang',
|
||||
label:'WX',
|
||||
value:'wx',
|
||||
},{
|
||||
title:'',
|
||||
label:'FLUX',
|
||||
value:'flux',
|
||||
},
|
||||
],
|
||||
extractList:[
|
||||
{
|
||||
title:'This method may produce slight discrepancies between the extracted line art and the original image.',
|
||||
label:'High',
|
||||
value:'',
|
||||
},{
|
||||
title:'Note: The extracted line art might have minor variations from the original.',
|
||||
label:'FLUX',
|
||||
value:'flux',
|
||||
@@ -774,7 +778,7 @@ export default defineComponent({
|
||||
level1Type:selectCode.value,
|
||||
level2Type:design,
|
||||
page:1,
|
||||
ageGroup:selectCode.value == 'Sketchboard'?pageData.ageGroup:'',
|
||||
ageGroup:selectCode.value == 'Models'?pageData.ageGroup:'',
|
||||
modelSex:sex.value?sex.value:'',
|
||||
pictureName:searchPictureName.value,
|
||||
size:pageSize.value,
|
||||
@@ -933,9 +937,13 @@ export default defineComponent({
|
||||
}
|
||||
if(newVal.value == 'extract'){
|
||||
this.speedData = this.extractList[0]
|
||||
}else if(newVal.value == 'Logo' || newVal.value == 'Slogan'){
|
||||
this.speedData.value = ''
|
||||
this.speedData.label = ''
|
||||
}else{
|
||||
this.speedData = this.speedList[0]
|
||||
}
|
||||
this.speedState = false
|
||||
}
|
||||
},
|
||||
'$route.query':{
|
||||
|
||||
Reference in New Issue
Block a user