调整部分布局和部分快捷键
This commit is contained in:
@@ -188,10 +188,10 @@
|
||||
<div class="exportCanvasBox_left_tool_item">
|
||||
<i class="icon iconfont icon-chehui" @click="historyState('')" :title="isWindow?'Ctrl+Z':'Command+Z'"></i>
|
||||
<i class="icon iconfont icon-fanchehui" @click="historyState('reverse')" :title="isWindow?'Ctrl+Shift+Z':'Command+Ctrl+Z'"></i>
|
||||
<i class="icon iconfont icon-bianji" @click="setOperation('pencil')" :class="{active:operation == 'pencil'}" :title="isWindow?'~':'~'"></i>
|
||||
<i class="icon iconfont icon-caizhi" @click="setOperation('texture')" :class="{active:operation == 'texture'}"></i>
|
||||
<i class="icon iconfont icon-move" @click="setOperation('move')" :class="{active:operation == 'move'}" :title="isWindow?'M':'M'"></i>
|
||||
<i class="icon iconfont icon-xiangpi_huaban1" @click="setOperation('eraser')" :class="{active:operation == 'eraser'}" :title="isWindow?'~':'~'"></i>
|
||||
<i class="icon iconfont icon-bianji" @click="setOperation('pencil')" :class="{active:operation == 'pencil'}" :title="isWindow?'B':'B'"></i>
|
||||
<i class="icon iconfont icon-xiangpi_huaban1" @click="setOperation('eraser')" :class="{active:operation == 'eraser'}" :title="isWindow?'E':'E'"></i>
|
||||
<i class="icon iconfont icon-caizhi" @click="setOperation('texture')" :class="{active:operation == 'texture'}"></i>
|
||||
|
||||
<label class="uploadImage" :title="isWindow?'Ctrl+O':'Command+O'">
|
||||
<i class="fi fi-br-upload" ></i>
|
||||
@@ -1217,9 +1217,13 @@ export default defineComponent({
|
||||
let keyDown = []
|
||||
const keysList = [
|
||||
{
|
||||
name:useI18.t('exportModel.PaintingEraser'),
|
||||
winDowKey:'~',
|
||||
macKey:'~',
|
||||
name:useI18.t('exportModel.Painting'),
|
||||
winDowKey:'B',
|
||||
macKey:'B',
|
||||
},{
|
||||
name:useI18.t('exportModel.Eraser'),
|
||||
winDowKey:'E',
|
||||
macKey:'E',
|
||||
},{
|
||||
name:useI18.t('exportModel.Uncheck'),
|
||||
winDowKey:'Ctrl + D',
|
||||
@@ -1258,9 +1262,8 @@ export default defineComponent({
|
||||
macKey:'Command + O',
|
||||
},
|
||||
]
|
||||
let oldOperation = ''
|
||||
let canvasKeyDown = (event) => {
|
||||
let keys = ['Enter','Delete','ControlLeft','KeyZ','ShiftLeft','KeyC','KeyV','BracketLeft','BracketRight','KeyI','KeyD','KeyO','Backquote','MetaLeft']
|
||||
let keys = ['Enter','Delete','ControlLeft','KeyZ','ShiftLeft','KeyC','KeyV','BracketLeft','BracketRight','KeyI','KeyD','KeyO','KeyE','KeyB','MetaLeft']
|
||||
if(keys.indexOf(event.code) > -1){
|
||||
event.preventDefault();
|
||||
}
|
||||
@@ -1297,12 +1300,13 @@ export default defineComponent({
|
||||
}else if((keyDown.indexOf('ControlLeft') > -1 || keyDown.indexOf('MetaLeft') > -1) && event.code == 'KeyO'){
|
||||
let input = document.querySelector('.uploadImage input')
|
||||
input.click()
|
||||
}else if(keyDown.indexOf('Backquote') > -1){
|
||||
}else if(keyDown.indexOf('KeyB') > -1){
|
||||
// if(operation.value == 'pencil' || operation.value == 'texture'){
|
||||
let str = 'pencil'
|
||||
if(operation.value == 'pencil')str = 'eraser'
|
||||
oldOperation = operation.value
|
||||
setOperation(str)
|
||||
setOperation('pencil')
|
||||
// }
|
||||
}else if(keyDown.indexOf('KeyE') > -1){
|
||||
// if(operation.value == 'pencil' || operation.value == 'texture'){
|
||||
setOperation('eraser')
|
||||
// }
|
||||
}
|
||||
}
|
||||
@@ -1323,17 +1327,13 @@ export default defineComponent({
|
||||
}
|
||||
}
|
||||
let canvasKeyUp = (event) =>{
|
||||
let keys = ['Enter','Delete','ControlLeft','KeyZ','ShiftLeft','KeyC','KeyV','BracketLeft','BracketRight','KeyI','KeyD','KeyO','Backquote','MetaLeft']
|
||||
let keys = ['Enter','Delete','ControlLeft','KeyZ','ShiftLeft','KeyC','KeyV','BracketLeft','BracketRight','KeyI','KeyD','KeyO','KeyE','KeyB','MetaLeft']
|
||||
if(keys.indexOf(event.code) > -1){
|
||||
event.preventDefault();
|
||||
}
|
||||
keyDown = keyDown.filter(function(item) {
|
||||
return event.code !== item;
|
||||
})
|
||||
if(event.code == 'Backquote' && oldOperation){
|
||||
// setOperation(oldOperation)
|
||||
oldOperation = ''
|
||||
}
|
||||
}
|
||||
let setCanvasKeyDown = (event)=>{
|
||||
// let e = event || window.event
|
||||
|
||||
Reference in New Issue
Block a user