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();

packages/effects/layouts/src/iframe/iframe-router-view.vue

@@ -1,12 +1,11 @@
 <script lang="ts" setup>
 import type { RouteLocationNormalized } from 'vue-router';
 
-import { computed, ref } from 'vue';
-import { useRoute } from 'vue-router';
-
 import { preferences } from '@vben/preferences';
 import { useTabbarStore } from '@vben/stores';
 import { VbenSpinner } from '@vben-core/shadcn-ui';
+import { computed, ref } from 'vue';
+import { useRoute } from 'vue-router';
 
 defineOptions({ name: 'IFrameRouterView' });
 

packages/effects/layouts/src/widgets/breadcrumb.vue

@@ -2,11 +2,10 @@
 import type { BreadcrumbStyleType } from '@vben/types';
 import type { IBreadcrumb } from '@vben-core/shadcn-ui';
 
-import { computed } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
-
 import { $t } from '@vben/locales';
 import { VbenBreadcrumbView } from '@vben-core/shadcn-ui';
+import { computed } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
 
 interface Props {
   hideWhenOnlyOne?: boolean;

packages/effects/layouts/src/widgets/check-updates/check-updates.vue

@@ -1,8 +1,7 @@
 <script setup lang="ts">
-import { onMounted, onUnmounted, ref } from 'vue';
-
 import { $t } from '@vben/locales';
 import { useVbenModal } from '@vben-core/popup-ui';
+import { onMounted, onUnmounted, ref } from 'vue';
 
 interface Props {
   // 轮训时间，分钟

packages/effects/layouts/src/widgets/global-search/global-search.vue

@@ -1,8 +1,6 @@
 <script setup lang="ts">
 import type { MenuRecordRaw } from '@vben/types';
 
-import { nextTick, onMounted, onUnmounted, ref, watch } from 'vue';
-
 import {
   ArrowDown,
   ArrowUp,
@@ -13,8 +11,8 @@ import {
 import { $t } from '@vben/locales';
 import { isWindowsOs } from '@vben/utils';
 import { useVbenModal } from '@vben-core/popup-ui';
-
 import { useMagicKeys, whenever } from '@vueuse/core';
+import { nextTick, onMounted, onUnmounted, ref, watch } from 'vue';
 
 import SearchPanel from './search-panel.vue';
 

packages/effects/layouts/src/widgets/global-search/search-panel.vue

@@ -1,16 +1,14 @@
 <script setup lang="ts">
 import type { MenuRecordRaw } from '@vben/types';
 
-import { nextTick, onMounted, ref, shallowRef, watch } from 'vue';
-import { useRouter } from 'vue-router';
-
 import { SearchX, X } from '@vben/icons';
 import { $t } from '@vben/locales';
 import { mapTree, traverseTreeValues, uniqueByField } from '@vben/utils';
 import { VbenIcon, VbenScrollbar } from '@vben-core/shadcn-ui';
 import { isHttpUrl } from '@vben-core/shared/utils';
-
 import { onKeyStroke, useLocalStorage, useThrottleFn } from '@vueuse/core';
+import { nextTick, onMounted, ref, shallowRef, watch } from 'vue';
+import { useRouter } from 'vue-router';
 
 defineOptions({
   name: 'SearchPanel',

packages/effects/layouts/src/widgets/layout-toggle.vue

@@ -2,8 +2,6 @@
 import type { AuthPageLayoutType } from '@vben/types';
 import type { VbenDropdownMenuItem } from '@vben-core/shadcn-ui';
 
-import { computed } from 'vue';
-
 import { InspectionPanel, PanelLeft, PanelRight } from '@vben/icons';
 import { $t } from '@vben/locales';
 import {
@@ -12,6 +10,7 @@ import {
   usePreferences,
 } from '@vben/preferences';
 import { VbenDropdownRadioMenu, VbenIconButton } from '@vben-core/shadcn-ui';
+import { computed } from 'vue';
 
 defineOptions({
   name: 'AuthenticationLayoutToggle',

packages/effects/layouts/src/widgets/lock-screen/lock-screen-modal.vue

@@ -1,12 +1,11 @@
 <script setup lang="ts">
 import type { Recordable } from '@vben/types';
 
-import { computed, reactive } from 'vue';
-
 import { $t } from '@vben/locales';
 import { useVbenForm, z } from '@vben-core/form-ui';
 import { useVbenModal } from '@vben-core/popup-ui';
 import { VbenAvatar, VbenButton } from '@vben-core/shadcn-ui';
+import { computed, reactive } from 'vue';
 
 interface Props {
   avatar?: string;

packages/effects/layouts/src/widgets/lock-screen/lock-screen.vue

@@ -1,14 +1,12 @@
 <script setup lang="ts">
-import { computed, reactive, ref } from 'vue';
-
 import { LockKeyhole } from '@vben/icons';
 import { $t, useI18n } from '@vben/locales';
 import { storeToRefs, useLockStore } from '@vben/stores';
 import { useScrollLock } from '@vben-core/composables';
 import { useVbenForm, z } from '@vben-core/form-ui';
 import { VbenAvatar, VbenButton } from '@vben-core/shadcn-ui';
-
 import { useDateFormat, useNow } from '@vueuse/core';
+import { computed, reactive, ref } from 'vue';
 
 interface Props {
   avatar?: string;

packages/effects/layouts/src/widgets/notification/notification.vue

@@ -9,7 +9,6 @@ import {
   VbenPopover,
   VbenScrollbar,
 } from '@vben-core/shadcn-ui';
-
 import { useToggle } from '@vueuse/core';
 
 interface Props {

packages/effects/layouts/src/widgets/preferences/blocks/input-item.vue

@@ -1,10 +1,9 @@
 <script setup lang="ts">
 import type { SelectOption } from '@vben/types';
 
-import { useSlots } from 'vue';
-
 import { CircleHelp } from '@vben/icons';
 import { Input, VbenTooltip } from '@vben-core/shadcn-ui';
+import { useSlots } from 'vue';
 
 defineOptions({
   name: 'PreferenceSelectItem',

packages/effects/layouts/src/widgets/preferences/blocks/layout/content.vue

@@ -1,7 +1,8 @@
 <script setup lang="ts">
-import { type Component, computed } from 'vue';
+import type { Component } from 'vue';
 
 import { $t } from '@vben/locales';
+import { computed } from 'vue';
 
 import { ContentCompact, ContentWide } from '../../icons';
 

packages/effects/layouts/src/widgets/preferences/blocks/layout/layout.vue

@@ -1,11 +1,11 @@
 <script setup lang="ts">
 import type { LayoutType } from '@vben/types';
-
-import { type Component, computed } from 'vue';
+import type { Component } from 'vue';
 
 import { CircleHelp } from '@vben/icons';
 import { $t } from '@vben/locales';
 import { VbenTooltip } from '@vben-core/shadcn-ui';
+import { computed } from 'vue';
 
 import {
   FullContent,

packages/effects/layouts/src/widgets/preferences/blocks/number-field-item.vue

@@ -1,8 +1,6 @@
 <script setup lang="ts">
 import type { SelectOption } from '@vben/types';
 
-import { useSlots } from 'vue';
-
 import { CircleHelp } from '@vben/icons';
 import {
   NumberField,
@@ -12,6 +10,7 @@ import {
   NumberFieldInput,
   VbenTooltip,
 } from '@vben-core/shadcn-ui';
+import { useSlots } from 'vue';
 
 defineOptions({
   name: 'PreferenceSelectItem',

packages/effects/layouts/src/widgets/preferences/blocks/select-item.vue

@@ -1,8 +1,6 @@
 <script setup lang="ts">
 import type { SelectOption } from '@vben/types';
 
-import { useSlots } from 'vue';
-
 import { CircleHelp } from '@vben/icons';
 import {
   Select,
@@ -12,6 +10,7 @@ import {
   SelectValue,
   VbenTooltip,
 } from '@vben-core/shadcn-ui';
+import { useSlots } from 'vue';
 
 defineOptions({
   name: 'PreferenceSelectItem',

packages/effects/layouts/src/widgets/preferences/blocks/switch-item.vue

@@ -1,8 +1,7 @@
 <script setup lang="ts">
-import { useSlots } from 'vue';
-
 import { CircleHelp } from '@vben/icons';
 import { Switch, VbenTooltip } from '@vben-core/shadcn-ui';
+import { useSlots } from 'vue';
 
 defineOptions({
   name: 'PreferenceSwitchItem',

packages/effects/layouts/src/widgets/preferences/blocks/theme/builtin.vue

@@ -1,15 +1,12 @@
 <script setup lang="ts">
+import type { BuiltinThemePreset } from '@vben/preferences';
 import type { BuiltinThemeType } from '@vben/types';
 
-import { computed, ref } from 'vue';
-
 import { UserRoundPen } from '@vben/icons';
 import { $t } from '@vben/locales';
-import {
-  BUILT_IN_THEME_PRESETS,
-  type BuiltinThemePreset,
-} from '@vben/preferences';
+import { BUILT_IN_THEME_PRESETS } from '@vben/preferences';
 import { convertToHsl, TinyColor } from '@vben/utils';
+import { computed, ref } from 'vue';
 
 defineOptions({
   name: 'PreferenceBuiltinTheme',

packages/effects/layouts/src/widgets/preferences/blocks/theme/theme.vue

@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import type { ThemeModeType } from '@vben/types';
-
 import type { Component } from 'vue';
 
 import { MoonStar, Sun, SunMoon } from '@vben/icons';

packages/effects/layouts/src/widgets/preferences/preferences-drawer.vue

@@ -13,8 +13,6 @@ import type {
 } from '@vben/types';
 import type { SegmentedItem } from '@vben-core/shadcn-ui';
 
-import { computed, ref } from 'vue';
-
 import { Copy, RotateCw } from '@vben/icons';
 import { $t, loadLocaleMessages } from '@vben/locales';
 import {
@@ -30,8 +28,8 @@ import {
   VbenSegmented,
 } from '@vben-core/shadcn-ui';
 import { globalShareState } from '@vben-core/shared/global-state';
-
 import { useClipboard } from '@vueuse/core';
+import { computed, ref } from 'vue';
 
 import {
   Animation,

packages/effects/layouts/src/widgets/preferences/preferences.vue

@@ -1,12 +1,11 @@
 <script lang="ts" setup>
-import { computed } from 'vue';
-
 import { Settings } from '@vben/icons';
 import { $t, loadLocaleMessages } from '@vben/locales';
 import { preferences, updatePreferences } from '@vben/preferences';
 import { capitalizeFirstLetter } from '@vben/utils';
 import { useVbenDrawer } from '@vben-core/popup-ui';
 import { VbenButton } from '@vben-core/shadcn-ui';
+import { computed } from 'vue';
 
 import PreferencesDrawer from './preferences-drawer.vue';
 

packages/effects/layouts/src/widgets/user-dropdown/user-dropdown.vue

@@ -1,8 +1,6 @@
 <script setup lang="ts">
 import type { AnyFunction } from '@vben/types';
-
 import type { Component } from 'vue';
-import { computed, useTemplateRef, watch } from 'vue';
 
 import { useHoverToggle } from '@vben/hooks';
 import { LockKeyhole, LogOut } from '@vben/icons';
@@ -23,8 +21,8 @@ import {
   VbenAvatar,
   VbenIcon,
 } from '@vben-core/shadcn-ui';
-
 import { useMagicKeys, whenever } from '@vueuse/core';
+import { computed, useTemplateRef, watch } from 'vue';
 
 import { LockScreenModal } from '../lock-screen';