Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev

packages/effects/layouts/src/basic/content/content.vue

@@ -1,14 +1,13 @@
 <script lang="ts" setup>
+import type { VNode } from 'vue';
 import type {
   RouteLocationNormalizedLoaded,
   RouteLocationNormalizedLoadedGeneric,
 } from 'vue-router';
 
-import { type VNode } from 'vue';
-import { RouterView } from 'vue-router';
-
 import { preferences, usePreferences } from '@vben/preferences';
 import { storeToRefs, useTabbarStore } from '@vben/stores';
+import { RouterView } from 'vue-router';
 
 import { IFrameRouterView } from '../../iframe';
 

packages/effects/layouts/src/basic/header/header.vue

@@ -1,11 +1,10 @@
 <script lang="ts" setup>
-import { computed, useSlots } from 'vue';
-
 import { useRefresh } from '@vben/hooks';
 import { RotateCw } from '@vben/icons';
 import { preferences, usePreferences } from '@vben/preferences';
 import { useAccessStore } from '@vben/stores';
 import { VbenFullScreen, VbenIconButton } from '@vben-core/shadcn-ui';
+import { computed, useSlots } from 'vue';
 
 import {
   GlobalSearch,

packages/effects/layouts/src/basic/layout.vue

@@ -1,7 +1,6 @@
 <script lang="ts" setup>
 import type { MenuRecordRaw } from '@vben/types';
-
-import { computed, type SetupContext, useSlots, watch } from 'vue';
+import type { SetupContext } from 'vue';
 
 import { useRefresh } from '@vben/hooks';
 import { $t } from '@vben/locales';
@@ -14,6 +13,7 @@ import { useLockStore } from '@vben/stores';
 import { cloneDeep, mapTree } from '@vben/utils';
 import { VbenAdminLayout } from '@vben-core/layout-ui';
 import { VbenBackTop, VbenLogo } from '@vben-core/shadcn-ui';
+import { computed, useSlots, watch } from 'vue';
 
 import { Breadcrumb, CheckUpdates, Preferences } from '../widgets';
 import { LayoutContent, LayoutContentSpinner } from './content';

packages/effects/layouts/src/basic/menu/extra-menu.vue

@@ -2,9 +2,8 @@
 import type { MenuRecordRaw } from '@vben/types';
 import type { MenuProps } from '@vben-core/menu-ui';
 
-import { useRoute } from 'vue-router';
-
 import { Menu } from '@vben-core/menu-ui';
+import { useRoute } from 'vue-router';
 
 import { useNavigation } from './use-navigation';
 

packages/effects/layouts/src/basic/menu/mixed-menu.vue

@@ -2,11 +2,10 @@
 import type { MenuRecordRaw } from '@vben/types';
 import type { NormalMenuProps } from '@vben-core/menu-ui';
 
-import { onBeforeMount } from 'vue';
-import { useRoute } from 'vue-router';
-
 import { findMenuByPath } from '@vben/utils';
 import { NormalMenu } from '@vben-core/menu-ui';
+import { onBeforeMount } from 'vue';
+import { useRoute } from 'vue-router';
 
 interface Props extends NormalMenuProps {}
 

packages/effects/layouts/src/basic/menu/use-extra-menu.ts

@@ -1,11 +1,11 @@
 import type { MenuRecordRaw } from '@vben/types';
-
-import { computed, type ComputedRef, ref, watch } from 'vue';
-import { useRoute } from 'vue-router';
+import type { ComputedRef } from 'vue';
 
 import { preferences } from '@vben/preferences';
 import { useAccessStore } from '@vben/stores';
 import { findRootMenuByPath } from '@vben/utils';
+import { computed, ref, watch } from 'vue';
+import { useRoute } from 'vue-router';
 
 import { useNavigation } from './use-navigation';
 

packages/effects/layouts/src/basic/menu/use-navigation.ts

@@ -1,6 +1,7 @@
-import { type RouteRecordNormalized, useRouter } from 'vue-router';
+import type { RouteRecordNormalized } from 'vue-router';
 
 import { isHttpUrl, openRouteInNewWindow, openWindow } from '@vben/utils';
+import { useRouter } from 'vue-router';
 
 function useNavigation() {
   const router = useRouter();

packages/effects/layouts/src/basic/tabbar/tabbar.vue

@@ -1,11 +1,10 @@
 <script lang="ts" setup>
-import { computed } from 'vue';
-import { useRoute } from 'vue-router';
-
 import { useContentMaximize, useTabs } from '@vben/hooks';
 import { preferences } from '@vben/preferences';
 import { useTabbarStore } from '@vben/stores';
 import { TabsToolMore, TabsToolScreen, TabsView } from '@vben-core/tabs-ui';
+import { computed } from 'vue';
+import { useRoute } from 'vue-router';
 
 import { useTabbar } from './use-tabbar';
 

packages/effects/layouts/src/basic/tabbar/use-tabbar.ts

@@ -2,9 +2,6 @@ import type { TabDefinition } from '@vben/types';
 import type { IContextMenuItem } from '@vben-core/tabs-ui';
 import type { RouteLocationNormalizedGeneric } from 'vue-router';
 
-import { computed, ref, watch } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
-
 import { useContentMaximize, useTabs } from '@vben/hooks';
 import {
   ArrowLeftToLine,
@@ -22,6 +19,8 @@ import {
 import { $t, useI18n } from '@vben/locales';
 import { useAccessStore, useTabbarStore } from '@vben/stores';
 import { filterTree } from '@vben/utils';
+import { computed, ref, watch } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
 
 export function useTabbar() {
   const router = useRouter();