From b49950a3906de6626eedb973590d02e4d95b98b9 Mon Sep 17 00:00:00 2001 From: vben Date: Sat, 21 Nov 2020 22:47:10 +0800 Subject: [PATCH] fix: fix useTimeoutFn not work --- .../Container/src/LazyContainer.vue | 8 ++-- .../src/collapse/CollapseContainer.vue | 2 +- src/components/Modal/src/Modal.tsx | 2 +- .../Table/src/hooks/useDataSource.ts | 2 +- src/components/Verify/src/DragVerify.tsx | 2 +- src/components/Verify/src/ImgRotate.tsx | 2 +- src/components/Verify/src/VerifyModal.vue | 2 +- src/hooks/core/useTimeout.ts | 43 +++++++++++++++++++ src/hooks/web/useApexCharts.ts | 2 +- src/hooks/web/useECharts.ts | 2 +- src/hooks/web/useMessage.tsx | 7 +++ src/hooks/web/useTabs.ts | 2 +- src/layouts/logo/index.vue | 2 +- 13 files changed, 64 insertions(+), 14 deletions(-) create mode 100644 src/hooks/core/useTimeout.ts diff --git a/src/components/Container/src/LazyContainer.vue b/src/components/Container/src/LazyContainer.vue index c6b4b2a434b..84771f28eda 100644 --- a/src/components/Container/src/LazyContainer.vue +++ b/src/components/Container/src/LazyContainer.vue @@ -22,7 +22,7 @@ import { defineComponent, reactive, onMounted, ref, toRef, toRefs } from 'vue'; import { Skeleton } from 'ant-design-vue'; - import { useTimeoutFn } from '@vueuse/core'; + import { useTimeoutFn } from '/@/hooks/core/useTimeout'; import { useIntersectionObserver } from '/@/hooks/event/useIntersectionObserver'; interface State { isInit: boolean; @@ -40,9 +40,9 @@ // The viewport where the component is located. If the component is scrolling in the page container, the viewport is the container viewport: { - type: (typeof window !== 'undefined' ? window.HTMLElement : Object) as PropType< - HTMLElement - >, + type: (typeof window !== 'undefined' + ? window.HTMLElement + : Object) as PropType, default: () => null, }, diff --git a/src/components/Container/src/collapse/CollapseContainer.vue b/src/components/Container/src/collapse/CollapseContainer.vue index 929e5aed1cd..c29c6099e39 100644 --- a/src/components/Container/src/collapse/CollapseContainer.vue +++ b/src/components/Container/src/collapse/CollapseContainer.vue @@ -32,7 +32,7 @@ import { triggerWindowResize } from '/@/utils/event/triggerWindowResizeEvent'; // hook - import { useTimeoutFn } from '@vueuse/core'; + import { useTimeoutFn } from '/@/hooks/core/useTimeout'; export default defineComponent({ components: { diff --git a/src/components/Modal/src/Modal.tsx b/src/components/Modal/src/Modal.tsx index 2220f4713f6..6b36493d84a 100644 --- a/src/components/Modal/src/Modal.tsx +++ b/src/components/Modal/src/Modal.tsx @@ -1,7 +1,7 @@ import { Modal } from 'ant-design-vue'; import { defineComponent, watchEffect } from 'vue'; import { basicProps } from './props'; -import { useTimeoutFn } from '@vueuse/core'; +import { useTimeoutFn } from '/@/hooks/core/useTimeout'; import { extendSlots } from '/@/utils/helper/tsxHelper'; export default defineComponent({ diff --git a/src/components/Table/src/hooks/useDataSource.ts b/src/components/Table/src/hooks/useDataSource.ts index 010cc25cfe6..4a65e9789ce 100644 --- a/src/components/Table/src/hooks/useDataSource.ts +++ b/src/components/Table/src/hooks/useDataSource.ts @@ -3,7 +3,7 @@ import type { PaginationProps } from '../types/pagination'; import { watch, ref, unref, ComputedRef, computed, onMounted, Ref } from 'vue'; -import { useTimeoutFn } from '@vueuse/core'; +import { useTimeoutFn } from '/@/hooks/core/useTimeout'; import { buildUUID } from '/@/utils/uuid'; import { isFunction, isBoolean } from '/@/utils/is'; diff --git a/src/components/Verify/src/DragVerify.tsx b/src/components/Verify/src/DragVerify.tsx index be164958810..6aa65aee17f 100644 --- a/src/components/Verify/src/DragVerify.tsx +++ b/src/components/Verify/src/DragVerify.tsx @@ -1,5 +1,5 @@ import { defineComponent, ref, computed, unref, reactive, watch, watchEffect } from 'vue'; -import { useTimeoutFn } from '@vueuse/core'; +import { useTimeoutFn } from '/@/hooks/core/useTimeout'; import { useEventListener } from '/@/hooks/event/useEventListener'; import { basicProps } from './props'; import { getSlot } from '/@/utils/helper/tsxHelper'; diff --git a/src/components/Verify/src/ImgRotate.tsx b/src/components/Verify/src/ImgRotate.tsx index 02ea773e2d3..f6397bfa27c 100644 --- a/src/components/Verify/src/ImgRotate.tsx +++ b/src/components/Verify/src/ImgRotate.tsx @@ -1,7 +1,7 @@ import type { MoveData, DragVerifyActionType } from './types'; import { defineComponent, computed, unref, reactive, watch, ref, getCurrentInstance } from 'vue'; -import { useTimeoutFn } from '@vueuse/core'; +import { useTimeoutFn } from '/@/hooks/core/useTimeout'; import BasicDragVerify from './DragVerify'; diff --git a/src/components/Verify/src/VerifyModal.vue b/src/components/Verify/src/VerifyModal.vue index b5bf8c47422..fe5c129c0e9 100644 --- a/src/components/Verify/src/VerifyModal.vue +++ b/src/components/Verify/src/VerifyModal.vue @@ -1,7 +1,7 @@