diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue index ce8738b3..d040fa27 100644 --- a/src/component/HomePage/ExportModel.vue +++ b/src/component/HomePage/ExportModel.vue @@ -1277,13 +1277,13 @@ export default defineComponent({ foldEnd('Enter') }else if(event.key === 'Delete'){ deleteObject() - }else if(keyDown.indexOf('ControlLeft') > -1 && keyDown.indexOf('KeyZ') > -1 && keyDown.indexOf('ShiftLeft') > -1){ + }else if((keyDown.indexOf('ControlLeft') > -1 || keyDown.indexOf('MetaLeft') > -1) && keyDown.indexOf('KeyZ') > -1 && keyDown.indexOf('ShiftLeft') > -1){ historyState('reverse') - }else if(keyDown.indexOf('ControlLeft') > -1 && keyDown.indexOf('KeyZ') > -1){ + }else if((keyDown.indexOf('ControlLeft') > -1 || keyDown.indexOf('MetaLeft') > -1) && keyDown.indexOf('KeyZ') > -1){ historyState('') - }else if(keyDown.indexOf('ControlLeft') > -1 && keyDown.indexOf('KeyC') > -1){ + }else if((keyDown.indexOf('ControlLeft') > -1 || keyDown.indexOf('MetaLeft') > -1) && keyDown.indexOf('KeyC') > -1){ copy() - }else if(keyDown.indexOf('ControlLeft') > -1 && keyDown.indexOf('KeyV') > -1){ + }else if((keyDown.indexOf('ControlLeft') > -1 || keyDown.indexOf('MetaLeft') > -1) && keyDown.indexOf('KeyV') > -1){ paste() }else if(keyDown.indexOf('BracketLeft') > -1){ let width = canvasPencilWidth.value[operation.value] @@ -1297,9 +1297,9 @@ export default defineComponent({ getColor()//吸色 }else if(keyDown.indexOf('KeyM') > -1){ setOperation('move') - }else if(keyDown.indexOf('ControlLeft') > -1 && keyDown.indexOf('KeyD') > -1){ + }else if((keyDown.indexOf('ControlLeft') > -1 || keyDown.indexOf('MetaLeft') > -1) && keyDown.indexOf('KeyD') > -1){ canvas.discardActiveObject().renderAll(); - }else if(keyDown.indexOf('ControlLeft') > -1 && keyDown.indexOf('KeyO') > -1){ + }else if((keyDown.indexOf('ControlLeft') > -1 || keyDown.indexOf('MetaLeft') > -1) && keyDown.indexOf('KeyO') > -1){ let input = document.querySelector('.uploadImage input') input.click() }else if(keyDown.indexOf('Backquote') > -1){ diff --git a/src/component/HomePage/bindEmail.vue b/src/component/HomePage/bindEmail.vue index cab4fc2e..236887f0 100644 --- a/src/component/HomePage/bindEmail.vue +++ b/src/component/HomePage/bindEmail.vue @@ -52,10 +52,10 @@
Email
diff --git a/src/views/HomeView/library.vue b/src/views/HomeView/library.vue index 91a93f3e..54b01217 100644 --- a/src/views/HomeView/library.vue +++ b/src/views/HomeView/library.vue @@ -829,6 +829,7 @@ export default defineComponent({ }, token: "", isInputFocus:false, + deleteSelectManneuin:false, }; }, watch:{ @@ -1139,25 +1140,48 @@ export default defineComponent({ //确定删除图片 有data则是单个 confirmDeletePic(data:any,index:any,nData:any){ - let libraryIds = data ? [data.id] : this.selectImgList - let newData = { - libraryIds:libraryIds, + let libraryIds = data ? [data.id] : this.selectImgList + let newData = { + libraryIds:libraryIds, deleteModelConfirm:this.selectCode == 'Models' ? data.deleteModelConfirm?data.deleteModelConfirm : 0:'', timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone, - } + } if(nData)newData = nData - Https.axiosPost(Https.httpUrls.batchDeleteLibrary, newData).then( - (rv: any) => { - if(data && data.id){ - this.imgList.splice(index, 1) - }else{ - this.selectImgList = [] - this.getLibraryList('') - } - } - ).catch((res)=>{ + Https.axiosPost(Https.httpUrls.batchDeleteLibrary, newData).then( + (rv: any) => { + if(data && data.id){ + this.imgList.splice(index, 1) + }else{ + this.selectImgList = [] + this.getLibraryList('') + } + if(!this.deleteSelectManneuin)return + let id = this.store.state.Workspace.workspace.id + Https.axiosGet(Https.httpUrls.workspaceDetail,{params:{id:id}}).then((rv: any) => { + if (rv) { + if(rv.position == "Overall"){ + rv.overallSingle = false + }else{ + rv.overallSingle = true + } + if(rv.sexEnum.name == 'Female'){ + rv.mannequinUrl = rv.femalePresignedUrl + rv.mannequinType = rv.mannequinFemaleType + rv.mannequinId = rv.mannequinFemaleId + }else if(rv.sexEnum.name == 'Male'){ + rv.mannequinUrl = rv.malePresignedUrl + rv.mannequinType = rv.mannequinMaleType + rv.mannequinId = rv.mannequinMaleId + } + this.store.commit("setWorkspace", rv); + this.deleteSelectManneuin = false + } + }) + } + ).catch((res)=>{ if(this.selectCode == "Models" && res.errCode === 2){ let _this = this + this.deleteSelectManneuin = true Modal.confirm({ title: res.errMsg, icon: createVNode(ExclamationCircleOutlined), @@ -1166,37 +1190,15 @@ export default defineComponent({ mask:false, zIndex:99999, centered:true, - onOk() { + onOk () { newData.deleteModelConfirm = 1 - let id = _this.store.state.Workspace.workspace.id - Https.axiosGet(Https.httpUrls.workspaceDetail,{params:{id:id}}).then((rv: any) => { - if (rv) { - if(rv.position == "Overall"){ - rv.overallSingle = false - }else{ - rv.overallSingle = true - } - if(rv.sexEnum.name == 'Female'){ - rv.mannequinUrl = rv.femalePresignedUrl - rv.mannequinType = rv.mannequinFemaleType - rv.mannequinId = rv.mannequinFemaleId - }else if(rv.sexEnum.name == 'Male'){ - rv.mannequinUrl = rv.malePresignedUrl - rv.mannequinType = rv.mannequinMaleType - rv.mannequinId = rv.mannequinMaleId - } - - _this.store.commit("setWorkspace", rv); - } - }) _this.confirmDeletePic('',index,newData) }, onCancel(){ - } }); } - }); + }); }, beforeUpload(file:any,fileList:any){