Merge branch 'main' into main

vbenjs · Sep 14, 2024 · ad07c24 · ad07c24
2 parents 03c2861 + b8a4fba
commit ad07c24
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/packages/@core/ui-kit/popup-ui/src/modal/__tests__/modal-api.test.ts b/packages/@core/ui-kit/popup-ui/src/modal/__tests__/modal-api.test.ts
@@ -1,8 +1,9 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-
-import { ModalApi } from '../modal-api'; // 假设 ModalApi 位于同一目录
 import type { ModalState } from '../modal';
 
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+// 假设 ModalApi 位于同一目录
+import { ModalApi } from '../modal-api';
+
 vi.mock('@vben-core/shared/store', () => {
   return {
     isFunction: (fn: any) => typeof fn === 'function',

diff --git a/packages/utils/src/helpers/__tests__/generate-menus.test.ts b/packages/utils/src/helpers/__tests__/generate-menus.test.ts
@@ -1,13 +1,14 @@
-import { describe, expect, it, vi } from 'vitest';
-
-import { generateMenus } from '../generate-menus'; // 替换为您的实际路径
 import {
   createRouter,
   createWebHistory,
   type Router,
   type RouteRecordRaw,
 } from 'vue-router';
 
+import { describe, expect, it, vi } from 'vitest';
+// 替换为您的实际路径
+import { generateMenus } from '../generate-menus';
+
 // Nested route setup to test child inclusion and hideChildrenInMenu functionality
 
 describe('generateMenus', () => {