diff --git a/src/views/worksheet/content/Content.vue b/src/views/worksheet/content/Content.vue index 0816f04..3187a01 100644 --- a/src/views/worksheet/content/Content.vue +++ b/src/views/worksheet/content/Content.vue @@ -90,9 +90,6 @@ let processItems: any[] = [] const passDialog = ref(false) // 审核不通过弹窗状态 只做记录,不影响业务 const rejectDialog = ref(false) -const rejectDialogCom = ref < (null) -// 关闭所有页面弹窗 -const modal = useModal() let keyPlastKeyTime = 0 let keyXLastTime = 0 // let keyPressTimer @@ -282,11 +279,12 @@ function overTaskHandelr(item: any) { function leaveTaskHandler() { overTask.value = null } -function onEsc(event) { +function onEsc(event: KeyboardEvent) { const eles = ['INPUT', 'TEXTAREA'] const keys = ['KeyC', 'KeyP', 'KeyX'] - console.log(event.code) const code = event.code + if (!(event.target instanceof Element)) + return if (eles.includes(event.target.tagName)) return if (!keys.includes(event.code)) @@ -338,19 +336,12 @@ function onEsc(event) { } } -function resizeImage() { - const container = document.querySelector('.image-container')! - const containerWidth = container?.offsetWidth - const containerHeight = container?.offsetHeight -} - onUnmounted(() => { workStore.reset() document.removeEventListener('keydown', onEsc) }) onMounted(() => { document.addEventListener('keydown', onEsc) - window.addEventListener('resize', resizeImage) }) function immersionHandler() { // class="wrapper" diff --git a/src/views/worksheet/modal/CustomFieldModal.vue b/src/views/worksheet/modal/CustomFieldModal.vue index 8ad9f54..d77da8e 100644 --- a/src/views/worksheet/modal/CustomFieldModal.vue +++ b/src/views/worksheet/modal/CustomFieldModal.vue @@ -181,9 +181,6 @@ watch( searchKey.value = '' searchFixVal.value = '' } - else { - emit('showDialog', val) - } }, ) watch( @@ -324,7 +321,10 @@ async function getData() { function handleKeydown(event: KeyboardEvent) { // 排除元素 const eles = ['INPUT', 'TEXTAREA'] - if (eles.includes(event?.target?.tagName)) + if (!(event.target instanceof Element)) + return + + if (eles.includes(event.target.tagName)) return if (event.code === 'KeyC') closeModal()