diff --git a/package.json b/package.json index 13ad7eee..ce0b93a1 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 6cfbe824..33c95e2a 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; */ type AnyNormalFunction = (...arg: any) => any; +/** + * 任意类型的函数 + */ +type AnyFunction = AnyNormalFunction | AnyPromiseFunction; + /** * T | null 包装 */ @@ -35,6 +35,16 @@ type ReadonlyRecordable = { readonly [key: string]: T; }; +/** + * setTimeout 返回值类型 + */ +type TimeoutHandle = ReturnType; + +/** + * setInterval 返回值类型 + */ +type IntervalHandle = ReturnType; + 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 391416dc..5b66c792 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 10f1cc48..28e0b3e6 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 6d491f77..e58b0b71 100644 --- a/src/components/SimpleMenu/src/components/SubMenuItem.vue +++ b/src/components/SimpleMenu/src/components/SubMenuItem.vue @@ -56,6 +56,7 @@