Merge branch 'dev_vite' of ssh://18.167.251.121:10002/aidlab/aida_front into dev_vite

This commit is contained in:
zhangyh
2025-11-20 15:02:51 +08:00
7 changed files with 30 additions and 7 deletions

View File

@@ -61,6 +61,7 @@
<model <model
ref="model" ref="model"
:key="positionKey" :key="positionKey"
@canvasReload="canvasReload" @canvasReload="canvasReload"
@detailEdit="detailEdit" @detailEdit="detailEdit"
@addSketch="()=>isEditPattern.value = ''" @addSketch="()=>isEditPattern.value = ''"
@@ -495,8 +496,16 @@ export default defineComponent({
},1000) },1000)
} }
const sketchSysToLibrary = ()=>{//系统sketch添加到library更新library const sketchSysToLibrary = ()=>{//系统sketch添加到library更新library
coverRevocation()
detailDom.detailLeft.sketchSysToLibrary() detailDom.detailLeft.sketchSysToLibrary()
} }
const coverRevocation = ()=>{
let itemDetail = JSON.parse(JSON.stringify(detailData.designDetail))
let revocation = JSON.parse((sessionStorage.getItem("revocation") as any))
revocation.splice(revocation.length-1,1,{designData:itemDetail,position:null})
sessionStorage.setItem('revocation', JSON.stringify(revocation));
sessionStorage.setItem('oppositeRevocation',JSON.stringify([]));
}
onMounted(()=>{ onMounted(()=>{
window.addEventListener('resize', handleResize); window.addEventListener('resize', handleResize);
}) })

View File

@@ -118,6 +118,7 @@ export default defineComponent({
detailData.selectTitle = 'upload' detailData.selectTitle = 'upload'
} }
const openLibrary = ()=>{ const openLibrary = ()=>{
if(detailData.selectTitle == 'library')return
detailData.selectTitle = 'library' detailData.selectTitle = 'library'
getDetailListDom.libraryList.init() getDetailListDom.libraryList.init()
} }

View File

@@ -226,7 +226,7 @@ export default defineComponent({
storeData.positionList = position storeData.positionList = position
store.commit('setProbject',storeData) store.commit('setProbject',storeData)
// setChatData() // setChatData()
if(route.name == 'toolsPage'){ if(route.name == 'tools'){
getCollection('tools',null) getCollection('tools',null)
}else{ }else{
getCollection('design',null) getCollection('design',null)

View File

@@ -168,10 +168,19 @@
</div> </div>
</div> </div>
<div class="prompt-input-container" v-show="!showMotion"> <div class="prompt-input-container" v-show="!showMotion">
<div class="title"> <div class="title" style="display: flex; gap: .5rem;">
{{ $t('ProductImg.Prompt') }}
<a :href="
locale == 'CHINESE_SIMPLIFIED'?
'https://aida-user-manual-chinese.super.site/2b08f755cedd80a985cffdf2af80c538':
'https://aida-user-manual.super.site/advanced-tool/animated-product-image/to-product-video-prompt-assist '" target="_blank">
<i class="fi fi-rs-interrogation tips-icon" style="font-size: 1.8rem; color: #000;"/>
</a>
</div>
<!-- <div class="title">
<span>{{ $t('ProductImg.Prompt') }}</span> <span>{{ $t('ProductImg.Prompt') }}</span>
<i class="fi fi-rs-interrogation tips-icon" /> <i class="fi fi-rs-interrogation tips-icon" />
</div> </div> -->
<promptInput :content="inputPrompt" ref="promptInput" /> <promptInput :content="inputPrompt" ref="promptInput" />
</div> </div>
<div class="poses" v-show="showMotion"> <div class="poses" v-show="showMotion">

View File

@@ -84,7 +84,7 @@
@click.stop="handleDownload(item)" @click.stop="handleDownload(item)"
/> />
<div class="text"> <div class="text">
{{ $t('ProductImg.EditGarmen') }}: {{ promptPage == 3 ? $t('ProductImg.EditGarmen2') : $t('ProductImg.EditGarmen') }}:
</div> </div>
</div> </div>
<div class="example-item" <div class="example-item"
@@ -285,10 +285,14 @@ const setNextOrPrevious = (type) => {
if(status.value == 0){ if(status.value == 0){
status.value = 1 status.value = 1
}else{ }else{
const startIndex = (promptPage.value - 1) * 4;
if(startIndex + 4 >= promptList.value.length){
return
}
promptPage.value++ promptPage.value++
} }
} }
if(promptPage.value > 0)presentList.value = setPresentList() if(promptPage.value > 0)presentList.value = setPresentList(4)
} }
</script> </script>

View File

@@ -100,7 +100,7 @@ export default defineComponent({
(query:any, oldQuery:any) => { (query:any, oldQuery:any) => {
if(oldQuery && query == oldQuery)return if(oldQuery && query == oldQuery)return
const key = Object.keys(query)?.[0] const key = Object.keys(query)?.[0]
if(route.name == 'toolsPage' && key){ if(route.name == 'tools' && key){
data.openType = query[key] data.openType = query[key]
nextTick(()=>{ nextTick(()=>{
open(query[key]) open(query[key])

View File

@@ -67,7 +67,7 @@ const routes: Array<RouteRecordRaw> = [
children: [ children: [
{ {
path: "tools", path: "tools",
name: "toolsPage", name: "tools",
meta: { enter: "all",cache:true }, meta: { enter: "all",cache:true },
component: () => import("@/views/HomeView/Tools.vue"), component: () => import("@/views/HomeView/Tools.vue"),
}, },