From 90f21750aa700946646d823c2e27539ef20418b5 Mon Sep 17 00:00:00 2001 From: K <1175047471@qq.com> Date: Tue, 16 Jan 2024 14:32:39 +0800 Subject: [PATCH] types: fix type error --- src/components/ContextMenu/src/ContextMenu.vue | 2 +- src/components/Modal/src/components/ModalWrapper.vue | 2 +- src/hooks/event/useEventListener.ts | 5 +++-- src/layouts/default/tabs/index.vue | 6 ++++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/components/ContextMenu/src/ContextMenu.vue b/src/components/ContextMenu/src/ContextMenu.vue index af331c8..5998089 100644 --- a/src/components/ContextMenu/src/ContextMenu.vue +++ b/src/components/ContextMenu/src/ContextMenu.vue @@ -31,7 +31,7 @@ const ItemContent: FunctionalComponent = (props) => { const { item } = props return ( - {props.showIcon && item.icon && } + {props.showIcon && item.icon && } {item.label} ) diff --git a/src/components/Modal/src/components/ModalWrapper.vue b/src/components/Modal/src/components/ModalWrapper.vue index 8cbf2bf..c54308c 100644 --- a/src/components/Modal/src/components/ModalWrapper.vue +++ b/src/components/Modal/src/components/ModalWrapper.vue @@ -22,7 +22,7 @@ const props = defineProps({ }) const emit = defineEmits(['heightChange', 'extHeight']) const wrapperRef = ref(null) -const spinRef = ref(null) +const spinRef = ref() const realHeightRef = ref(0) const minRealHeightRef = ref(0) diff --git a/src/hooks/event/useEventListener.ts b/src/hooks/event/useEventListener.ts index 6f87aa5..aa52f55 100644 --- a/src/hooks/event/useEventListener.ts +++ b/src/hooks/event/useEventListener.ts @@ -25,7 +25,8 @@ export function useEventListener({ const isAddRef = ref(false) if (el) { - const element = ref(el as Element) + const element = ref() + element.value = el const handler = isDebounce ? useDebounceFn(listener, wait) : useThrottleFn(listener, wait) const realHandler = wait ? handler : listener @@ -49,7 +50,7 @@ export function useEventListener({ ) remove = () => { - removeEventListener(element.value) + removeEventListener(element.value!) removeWatch() } } diff --git a/src/layouts/default/tabs/index.vue b/src/layouts/default/tabs/index.vue index 132e0e9..77234b7 100644 --- a/src/layouts/default/tabs/index.vue +++ b/src/layouts/default/tabs/index.vue @@ -6,7 +6,7 @@ import { useMouse } from '@vueuse/core' import { computed, ref, unref } from 'vue' import { Tabs } from 'ant-design-vue' -import { useRouter } from 'vue-router' +import { useRoute, useRouter } from 'vue-router' import TabContent from './components/TabContent.vue' import { initAffixTabs, useTabsDrag } from './useMultipleTabs' @@ -89,6 +89,8 @@ function handleEdit(targetKey: string) { tabStore.closeTabByKey(targetKey, router) } + +const route = useRoute()