From a262f1ec49fb5fa689a86c9f4bd50f45e8e092a8 Mon Sep 17 00:00:00 2001 From: zyronon Date: Thu, 21 Sep 2023 00:01:36 +0800 Subject: [PATCH] fix(all): debug --- auto-imports.d.ts | 1 + src/components/Modal/Modal.vue | 10 +- src/components/Practice/AddArticle.vue | 56 +-- src/components/Practice/Practice.vue | 37 +- src/components/Practice/TypeArticle.vue | 8 +- src/components/Practice/TypeWord.vue | 10 +- src/components/Toolbar/SettingModal.vue | 2 + src/hooks/article.ts | 1 + src/hooks/event.ts | 45 ++- src/hooks/translate.ts | 338 +++++++++-------- src/stores/base.ts | 458 ++++++++++++------------ src/stores/runtime.ts | 13 + src/types.ts | 278 +++++++------- src/utils/eventBus.ts | 2 + 14 files changed, 692 insertions(+), 567 deletions(-) create mode 100644 src/stores/runtime.ts diff --git a/auto-imports.d.ts b/auto-imports.d.ts index fb173ceb..d7d6df67 100644 --- a/auto-imports.d.ts +++ b/auto-imports.d.ts @@ -5,5 +5,6 @@ // Generated by unplugin-auto-import export {} declare global { + const ElMessage: typeof import('element-plus/es')['ElMessage'] const ElMessageBox: typeof import('element-plus/es')['ElMessageBox'] } diff --git a/src/components/Modal/Modal.vue b/src/components/Modal/Modal.vue index 34bc9e2e..0e84c652 100644 --- a/src/components/Modal/Modal.vue +++ b/src/components/Modal/Modal.vue @@ -2,6 +2,7 @@ import {onMounted} from "vue"; import Tooltip from "@/components/Tooltip.vue"; import {Icon} from '@iconify/vue'; +import {useEsc} from "@/hooks/event.ts"; interface IProps { modelValue: boolean, @@ -25,13 +26,8 @@ function close() { emit('close',) } -onMounted(() => { - window.addEventListener('keyup', (e: KeyboardEvent) => { - if (e.key === 'Escape' && props.modelValue) { - close() - } - }) -}) +useEsc(close) +