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

fix

Browse Source
This commit is contained in:
X1627315083
2025-01-20 14:20:26 +08:00
parent 2b11a7acec
commit 92b01192c6
3 changed files with 48 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/component/HomePage/ExportModel.vue
View File

@@ -1277,13 +1277,13 @@ export default defineComponent({
foldEnd('Enter') foldEnd('Enter')
}else if(event.key === 'Delete'){ }else if(event.key === 'Delete'){
deleteObject() 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') 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('') 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() 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() paste()
}else if(keyDown.indexOf('BracketLeft') > -1){ }else if(keyDown.indexOf('BracketLeft') > -1){
let width = canvasPencilWidth.value[operation.value] let width = canvasPencilWidth.value[operation.value]
@@ -1297,9 +1297,9 @@ export default defineComponent({
getColor()//吸色 getColor()//吸色
}else if(keyDown.indexOf('KeyM') > -1){ }else if(keyDown.indexOf('KeyM') > -1){
setOperation('move') 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(); 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') let input = document.querySelector('.uploadImage input')
input.click() input.click()
}else if(keyDown.indexOf('Backquote') > -1){ }else if(keyDown.indexOf('Backquote') > -1){

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

@@ -52,10 +52,10 @@
<div class="login_form_title marign_top30">Email</div> <div class="login_form_title marign_top30">Email</div>
<input <input
class="login_form_input" class="login_form_input"
:class="{active:!!userDetail.email && bindType != 'Modify'}" :class="{active:(userDetail.email !== '-------------') && bindType != 'Modify'}"
placeholder="Enter your email address" placeholder="Enter your email address"
v-model="email" v-model="email"
:disabled="!!userDetail.email && bindType != 'Modify'" :disabled="(userDetail.email !== '-------------') && bindType != 'Modify'"
@keydown.enter="submitPerLogin()" @keydown.enter="submitPerLogin()"
/> />
<div v-if="bindType != 'Modify'"> <div v-if="bindType != 'Modify'">

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

@@ -829,6 +829,7 @@ export default defineComponent({
}, },
token: "", token: "",
isInputFocus:false, isInputFocus:false,
deleteSelectManneuin:false,
}; };
}, },
watch:{ watch:{
@@ -1154,21 +1155,8 @@ export default defineComponent({
this.selectImgList = [] this.selectImgList = []
this.getLibraryList('') this.getLibraryList('')
} }
} if(!this.deleteSelectManneuin)return
).catch((res)=>{ let id = this.store.state.Workspace.workspace.id
if(this.selectCode == "Models" && res.errCode === 2){
let _this = this
Modal.confirm({
title: res.errMsg,
icon: createVNode(ExclamationCircleOutlined),
okText: 'Yes',
cancelText: 'No',
mask:false,
zIndex:99999,
centered:true,
onOk() {
newData.deleteModelConfirm = 1
let id = _this.store.state.Workspace.workspace.id
Https.axiosGet(Https.httpUrls.workspaceDetail,{params:{id:id}}).then((rv: any) => { Https.axiosGet(Https.httpUrls.workspaceDetail,{params:{id:id}}).then((rv: any) => {
if (rv) { if (rv) {
if(rv.position == "Overall"){ if(rv.position == "Overall"){
@@ -1185,14 +1173,28 @@ export default defineComponent({
rv.mannequinType = rv.mannequinMaleType rv.mannequinType = rv.mannequinMaleType
rv.mannequinId = rv.mannequinMaleId rv.mannequinId = rv.mannequinMaleId
} }
this.store.commit("setWorkspace", rv);
_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),
okText: 'Yes',
cancelText: 'No',
mask:false,
zIndex:99999,
centered:true,
onOk () {
newData.deleteModelConfirm = 1
_this.confirmDeletePic('',index,newData) _this.confirmDeletePic('',index,newData)
}, },
onCancel(){ onCancel(){
} }
}); });
} }