diff --git a/src/assets/icons/qianyue.svg b/src/assets/icons/qianyue.svg new file mode 100644 index 0000000..7f5ace2 --- /dev/null +++ b/src/assets/icons/qianyue.svg @@ -0,0 +1,26 @@ + + + 签约管理 + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/components/DataHeader/index.vue b/src/components/DataHeader/index.vue index 213fe63..003164f 100644 --- a/src/components/DataHeader/index.vue +++ b/src/components/DataHeader/index.vue @@ -158,7 +158,12 @@ defineExpose({ " /> + + + 二期功能开发中... + diff --git a/src/layout/components/Header/QuillModal.vue b/src/layout/components/Header/QuillModal.vue index add7b65..e3626ea 100644 --- a/src/layout/components/Header/QuillModal.vue +++ b/src/layout/components/Header/QuillModal.vue @@ -1,6 +1,7 @@ diff --git a/src/layout/components/Header/SearchModal.vue b/src/layout/components/Header/SearchModal.vue index 74e384e..dee2fc5 100644 --- a/src/layout/components/Header/SearchModal.vue +++ b/src/layout/components/Header/SearchModal.vue @@ -1,14 +1,18 @@ diff --git a/src/layout/components/Header/ShortcutModal.vue b/src/layout/components/Header/ShortcutModal.vue index a87cfd2..6aaf89f 100644 --- a/src/layout/components/Header/ShortcutModal.vue +++ b/src/layout/components/Header/ShortcutModal.vue @@ -1,5 +1,6 @@ diff --git a/src/layout/components/Header/index.vue b/src/layout/components/Header/index.vue index 5906d7c..fdf19e7 100644 --- a/src/layout/components/Header/index.vue +++ b/src/layout/components/Header/index.vue @@ -4,6 +4,7 @@ import { defineComponent, inject, onMounted, +onUnmounted, reactive, ref, toRefs, @@ -21,6 +22,7 @@ import { getImgUrl } from '@/utils/urlUtils' import { useUser } from '@/store/modules/user' import { useTaskStore } from '@/store/modules/task' import defaultAvatar from '@/assets/icons/avatar.svg' +import { useKeydown } from '@/hooks/event/useKeydown' const taskStore = useTaskStore() export default defineComponent({ @@ -125,7 +127,8 @@ export default defineComponent({ }) } - const quillModalRef = ref(null) + +const quillModalRef = ref(null) const shortcutModal = ref(null) const recycleModalRef = ref(null) const SearchModalRef = ref(null) @@ -165,14 +168,27 @@ export default defineComponent({ }, 5000) const mousetrap = inject('mousetrap') as any + function handleKeydown(){ + const modal = unref(quillModalRef)! as any + modal.closeModal() + const modal1 = unref(shortcutModal)! as any + modal1.closeModal() + const modal2 = unref(recycleModalRef)! as any + modal2.closeModal() + const modal3 = unref(SearchModalRef)! as any + modal3.closeModal() + } onMounted(() => { getMessage() mousetrap.bind('n r', quillHandler) mousetrap.bind('n t', quillHandler) mousetrap.bind('n n', recycleHandler) mousetrap.bind('/', searchHandler) + window.addEventListener('keydown', handleKeydown) }) - +onUnmounted(() => { + window.removeEventListener('keydown', handleKeydown) +}) const defaultAvatarSrc = ref(defaultAvatar) return { diff --git a/src/views/final/comp/CustomFilterModalVue.vue b/src/views/final/comp/CustomFilterModalVue.vue index 7034413..aeeae8d 100644 --- a/src/views/final/comp/CustomFilterModalVue.vue +++ b/src/views/final/comp/CustomFilterModalVue.vue @@ -1,6 +1,6 @@ diff --git a/src/views/final/comp/NewFilterModal.vue b/src/views/final/comp/NewFilterModal.vue index b8a44f6..a5af712 100644 --- a/src/views/final/comp/NewFilterModal.vue +++ b/src/views/final/comp/NewFilterModal.vue @@ -379,7 +379,7 @@ defineExpose({ - 沉浸模式 + 进入沉浸模式