diff --git a/src/component/DetailCopy/designDetail.vue b/src/component/DetailCopy/designDetail.vue index d42e45d6..2edf1373 100644 --- a/src/component/DetailCopy/designDetail.vue +++ b/src/component/DetailCopy/designDetail.vue @@ -43,7 +43,9 @@
-
+
+ +
@@ -58,6 +60,7 @@ + \ No newline at end of file diff --git a/src/component/DetailCopy/model/modelPosition.vue b/src/component/DetailCopy/model/modelPosition.vue new file mode 100644 index 00000000..e69de29b diff --git a/src/component/DetailCopy/model/position.vue b/src/component/DetailCopy/model/position.vue new file mode 100644 index 00000000..e69de29b diff --git a/src/component/DetailCopy/sketchLeft.vue b/src/component/DetailCopy/sketchLeft.vue index 8f544a71..b8e0f1b8 100644 --- a/src/component/DetailCopy/sketchLeft.vue +++ b/src/component/DetailCopy/sketchLeft.vue @@ -158,6 +158,7 @@ export default defineComponent({ overflow: hidden; > .content_item{ height: 100%; + margin-top: 1rem; } } } diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue index 504eae6c..e89ca646 100644 --- a/src/component/HomePage/ExportModel.vue +++ b/src/component/HomePage/ExportModel.vue @@ -555,6 +555,8 @@ export default defineComponent({ let createCanvas = (oldExportCanvas) => { showUpgradePlan.value = true; clearTimeout(submitCanvasContent) + document.addEventListener("keydown", setCanvasKeyDown); + document.addEventListener("keyup", clearCanvasKeyDown); normalCanvasState.value = [] reverseCanvasState.value = [] allBoardData.value.likeDesignCollectionList = @@ -565,8 +567,6 @@ export default defineComponent({ let oldCanvasDom = canvasBox.querySelector('.canvas-container') let oldCanvasDom1 = canvasBox.querySelector('canvas') var canvasDom = document.createElement("canvas"); - document.addEventListener("keydown", setCanvasKeyDown); - document.addEventListener("keyup", clearCanvasKeyDown); if(oldCanvasDom)oldCanvasDom.remove() if(oldCanvasDom)loadingShow.value = false if(oldCanvasDom1)oldCanvasDom1.remove() @@ -1277,13 +1277,13 @@ export default defineComponent({ foldEnd('Enter') }else if(event.key === 'Delete'){ deleteObject() - }else if((keyDown.indexOf('ControlLeft') > -1 || keyDown.indexOf('MetaLeft') > -1) && keyDown.indexOf('KeyZ') > -1 && keyDown.indexOf('ShiftLeft') > -1){ + }else if((keyDown.indexOf('ControlLeft') > -1 || keyDown.indexOf('MetaLeft') > -1) && event.code == 'KeyZ' && keyDown.indexOf('ShiftLeft') > -1){ historyState('reverse') - }else if((keyDown.indexOf('ControlLeft') > -1 || keyDown.indexOf('MetaLeft') > -1) && keyDown.indexOf('KeyZ') > -1){ + }else if((keyDown.indexOf('ControlLeft') > -1 || keyDown.indexOf('MetaLeft') > -1) && event.code == 'KeyZ'){ historyState('') - }else if((keyDown.indexOf('ControlLeft') > -1 || keyDown.indexOf('MetaLeft') > -1) && keyDown.indexOf('KeyC') > -1){ + }else if((keyDown.indexOf('ControlLeft') > -1 || keyDown.indexOf('MetaLeft') > -1) && event.code == 'KeyC'){ copy() - }else if((keyDown.indexOf('ControlLeft') > -1 || keyDown.indexOf('MetaLeft') > -1) && keyDown.indexOf('KeyV') > -1){ + }else if((keyDown.indexOf('ControlLeft') > -1 || keyDown.indexOf('MetaLeft') > -1) && event.code == 'KeyV'){ 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('MetaLeft') > -1) && keyDown.indexOf('KeyD') > -1){ + }else if((keyDown.indexOf('ControlLeft') > -1 || keyDown.indexOf('MetaLeft') > -1) && event.code == 'KeyD'){ canvas.discardActiveObject().renderAll(); - }else if((keyDown.indexOf('ControlLeft') > -1 || keyDown.indexOf('MetaLeft') > -1) && keyDown.indexOf('KeyO') > -1){ + }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){ @@ -1311,6 +1311,7 @@ export default defineComponent({ // } } } + console.log(keyDown); } let getColor = async ()=>{ try { @@ -1328,9 +1329,15 @@ export default defineComponent({ } } let canvasKeyUp = (event) =>{ + let keys = ['Enter','Delete','ControlLeft','KeyZ','ShiftLeft','KeyC','KeyV','BracketLeft','BracketRight','KeyI','KeyD','KeyO','Backquote','MetaLeft'] + if(keys.indexOf(event.code) > -1){ + event.preventDefault(); + } keyDown = keyDown.filter(function(item) { return event.code !== item; }) + console.log(keyDown,'UP',event.code); + if(event.code == 'Backquote' && oldOperation){ // setOperation(oldOperation) oldOperation = ''