From 14ba72dd1ce9f741801141a991887b442dd9ec34 Mon Sep 17 00:00:00 2001
From: vben <anncwb@126.com>
Date: Thu, 6 Apr 2023 22:12:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=BB=E9=A2=98=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=97=A0=E6=95=88=EF=BC=8Cclose=20#2685?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  1 +
 packages/types/src/utils.ts                   | 22 ++++++++++++++-----
 pnpm-lock.yaml                                |  3 +++
 .../SimpleMenu/src/components/Menu.vue        |  2 +-
 .../SimpleMenu/src/components/SubMenuItem.vue |  7 +++---
 src/logics/mitt/routeChange.ts                |  2 +-
 src/main.ts                                   |  2 +-
 7 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 13ad7eeee..ce0b93a13 100644
--- a/package.json
+++ b/package.json
@@ -125,6 +125,7 @@
     "@vben/eslint-config": "workspace:*",
     "@vben/stylelint-config": "workspace:*",
     "@vben/ts-config": "workspace:*",
+    "@vben/types": "workspace:*",
     "@vben/vite-config": "workspace:*",
     "@vue/compiler-sfc": "^3.2.47",
     "@vue/test-utils": "^2.3.2",
diff --git a/packages/types/src/utils.ts b/packages/types/src/utils.ts
index 6cfbe824f..33c95e2a4 100644
--- a/packages/types/src/utils.ts
+++ b/packages/types/src/utils.ts
@@ -1,8 +1,3 @@
-/**
- * 任意类型的函数
- */
-type AnyFunction = AnyNormalFunction | AnyPromiseFunction;
-
 /**
  * 任意类型的异步函数
  */
@@ -13,6 +8,11 @@ type AnyPromiseFunction = (...arg: any) => PromiseLike<any>;
  */
 type AnyNormalFunction = (...arg: any) => any;
 
+/**
+ * 任意类型的函数
+ */
+type AnyFunction = AnyNormalFunction | AnyPromiseFunction;
+
 /**
  *  T | null 包装
  */
@@ -35,6 +35,16 @@ type ReadonlyRecordable<T = any> = {
   readonly [key: string]: T;
 };
 
+/**
+ * setTimeout 返回值类型
+ */
+type TimeoutHandle = ReturnType<typeof setTimeout>;
+
+/**
+ * setInterval 返回值类型
+ */
+type IntervalHandle = ReturnType<typeof setInterval>;
+
 export {
   type AnyFunction,
   type AnyPromiseFunction,
@@ -43,4 +53,6 @@ export {
   type NonNullable,
   type Recordable,
   type ReadonlyRecordable,
+  type TimeoutHandle,
+  type IntervalHandle,
 };
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 391416dc1..5b66c7920 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -176,6 +176,9 @@ importers:
       '@vben/ts-config':
         specifier: workspace:*
         version: link:internal/ts-config
+      '@vben/types':
+        specifier: workspace:*
+        version: link:packages/types
       '@vben/vite-config':
         specifier: workspace:*
         version: link:internal/vite-config
diff --git a/src/components/SimpleMenu/src/components/Menu.vue b/src/components/SimpleMenu/src/components/Menu.vue
index 10f1cc48e..28e0b3e6b 100644
--- a/src/components/SimpleMenu/src/components/Menu.vue
+++ b/src/components/SimpleMenu/src/components/Menu.vue
@@ -22,7 +22,7 @@
   import { useDesign } from '/@/hooks/web/useDesign';
   import { propTypes } from '/@/utils/propTypes';
   import { createSimpleRootMenuContext } from './useSimpleMenuContext';
-  import mitt from '/@/utils/mitt';
+  import { mitt } from '/@/utils/mitt';
 
   export default defineComponent({
     name: 'Menu',
diff --git a/src/components/SimpleMenu/src/components/SubMenuItem.vue b/src/components/SimpleMenu/src/components/SubMenuItem.vue
index 6d491f77d..e58b0b715 100644
--- a/src/components/SimpleMenu/src/components/SubMenuItem.vue
+++ b/src/components/SimpleMenu/src/components/SubMenuItem.vue
@@ -56,6 +56,7 @@
 </template>
 
 <script lang="ts">
+  import { type TimeoutHandle, type Recordable } from '@vben/types';
   import type { CSSProperties, PropType } from 'vue';
   import type { SubMenuProvider } from './types';
   import {
@@ -77,7 +78,7 @@
   import { Icon } from '/@/components/Icon';
   import { Popover } from 'ant-design-vue';
   import { isBoolean, isObject } from '/@/utils/is';
-  import mitt from '/@/utils/mitt';
+  import { mitt } from '/@/utils/mitt';
 
   const DELAY = 200;
   export default defineComponent({
@@ -267,14 +268,14 @@
 
         rootMenuEmitter.on(
           'on-update-opened',
-          (data: boolean | (string | number)[] | Recordable) => {
+          (data: boolean | (string | number)[] | Recordable<any>) => {
             if (unref(getCollapse)) return;
             if (isBoolean(data)) {
               state.opened = data;
               return;
             }
             if (isObject(data) && rootProps.accordion) {
-              const { opend, parent, uidList } = data as Recordable;
+              const { opend, parent, uidList } = data as Recordable<any>;
               if (parent === instance?.parent) {
                 state.opened = opend;
               } else if (!uidList.includes(instance?.uid)) {
diff --git a/src/logics/mitt/routeChange.ts b/src/logics/mitt/routeChange.ts
index 864828e29..a985fe2f5 100644
--- a/src/logics/mitt/routeChange.ts
+++ b/src/logics/mitt/routeChange.ts
@@ -2,7 +2,7 @@
  * Used to monitor routing changes to change the status of menus and tabs. There is no need to monitor the route, because the route status change is affected by the page rendering time, which will be slow
  */
 
-import mitt from '/@/utils/mitt';
+import { mitt } from '/@/utils/mitt';
 import type { RouteLocationNormalized } from 'vue-router';
 import { getRawRoute } from '/@/utils';
 
diff --git a/src/main.ts b/src/main.ts
index 481fe65ae..60c3c058f 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,7 +1,7 @@
 import 'uno.css';
 import '@/design/index.less';
 import '@/components/VxeTable/src/css/index.scss';
-import 'ant-design-vue/dist/antd.css';
+import 'ant-design-vue/dist/antd.less';
 // Register icon sprite
 import 'virtual:svg-icons-register';