Merge remote-tracking branch 'origin/StableVersion' into dev_vite
This commit is contained in:
@@ -2129,13 +2129,14 @@ export default defineComponent({
|
||||
type: string
|
||||
) {
|
||||
// if()
|
||||
if(this.isMove)return
|
||||
if(this.isMove || this.isShowMark)return
|
||||
this.store.commit('setOpenChatStatus',false)
|
||||
if(design.resultType != "Design"){
|
||||
this.selectEditBtn = design
|
||||
this.setEditDesignType(collectionList,index,design.resultType,'edit',type)
|
||||
return
|
||||
}
|
||||
this.isShowMark = true
|
||||
design.designOutfitId = design.designPythonOutfitId?design.designPythonOutfitId:design.designOutfitId
|
||||
let data = {
|
||||
design: design,
|
||||
@@ -2146,7 +2147,9 @@ export default defineComponent({
|
||||
this.detailDestroy = true
|
||||
nextTick(()=>{
|
||||
let designDetail: any = this.$refs.designDetail;
|
||||
designDetail.showDesignDetailModal(data);
|
||||
designDetail.showDesignDetailModal(data).then(()=>{
|
||||
this.isShowMark = false
|
||||
})
|
||||
})
|
||||
},
|
||||
|
||||
|
||||
Reference in New Issue
Block a user