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

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

Browse Source
This commit is contained in:
zhangyahui
2026-03-23 14:08:42 +08:00
parent e61a8e372d f5a74991c9
commit b869a82fae
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/component/HomePage/Generate.vue
View File

@@ -853,9 +853,7 @@ export default defineComponent({
level2Type = this.sketchboardList?.[0]?.categoryValue level2Type = this.sketchboardList?.[0]?.categoryValue
? this.sketchboardList[0].categoryValue ? this.sketchboardList[0].categoryValue
: '' : ''
if (this.workspace.styleName) { sloganText = `${this.workspace.styleName || 'all'},${sloganText}`
sloganText = `${this.workspace.styleName},${sloganText}`
}
} else if (this.upload.level1Type == 'Printboard') { } else if (this.upload.level1Type == 'Printboard') {
level2Type = this.scene?.value level2Type = this.scene?.value
if (level2Type == 'Slogan' && this.searchPictureName == '') { if (level2Type == 'Slogan' && this.searchPictureName == '') {

3
src/store/workspace/workspace.ts
View File

@@ -74,7 +74,8 @@ const Workspace: Module<DesignDetail, RootState> = {
}, },
setProbject(state, data) { setProbject(state, data) {
for (const key in data) { for (const key in data) {
if (data[key] == undefined) continue let list = ['styleName','styleId','style']
if (data[key] == undefined && !list.includes(key)) continue
state.probjects[key] = data[key] state.probjects[key] = data[key]
} }
}, },

5
src/views/HomeView/library.vue
View File

@@ -1721,9 +1721,8 @@ export default defineComponent({
sloganText = this.captionGeneration sloganText = this.captionGeneration
if(this.selectCode == "Sketchboard"){ if(this.selectCode == "Sketchboard"){
level2Type = this.selectGenerateList?.[0]?.categoryValue?this.selectGenerateList[0].categoryValue:'' level2Type = this.selectGenerateList?.[0]?.categoryValue?this.selectGenerateList[0].categoryValue:''
if(this.workspace.styleName){ // sloganText = `${this.workspace.styleName || 'all'},${sloganText}`
sloganText = `${this.workspace.styleName},${sloganText}` sloganText = `'all',${sloganText}`
}
}else if(this.selectCode == "Printboard"){ }else if(this.selectCode == "Printboard"){
level2Type = this.scene?.value level2Type = this.scene?.value
if(level2Type == 'Slogan' && this.captionGeneration == ''){ if(level2Type == 'Slogan' && this.captionGeneration == ''){