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

This commit is contained in:
X1627315083
2024-09-11 16:36:46 +08:00

View File

@@ -590,7 +590,8 @@ export default defineComponent({
this.upload.level1Type = 'Sketchboard' this.upload.level1Type = 'Sketchboard'
this.uploadList = this.apparelList this.uploadList = this.apparelList
this.designTypeList = this.sketchCatecoryList this.designTypeList = this.sketchCatecoryList
this.designType = this.designTypeList[0].value this.designType = this.current.type
// this.designType = this.designTypeList[0].value
}else if (num == 2){ }else if (num == 2){
this.selectCode = 'Printboard' this.selectCode = 'Printboard'
this.upload.level1Type = 'Printboard' this.upload.level1Type = 'Printboard'
@@ -778,10 +779,8 @@ export default defineComponent({
getLibraryList(){ getLibraryList(){
this.isShowLoading = true this.isShowLoading = true
let level2Type = '' let level2Type = ''
if(this.selectCode == 'Printboard' || this.selectCode == 'DesignElements'){ if(this.selectCode == 'Printboard' || this.selectCode == 'DesignElements' || this.selectCode == 'Sketchboard'){
level2Type = this.designType level2Type = this.designType
}else if(this.selectCode == 'Sketchboard'){
level2Type = this.current.type
} }
let workspace = this.store.state.Workspace.workspace let workspace = this.store.state.Workspace.workspace
let data = { let data = {