perf: format code with better style (#5283)

packages/effects/common-ui/package.json

@@ -22,7 +22,6 @@
   "dependencies": {
     "@vben-core/form-ui": "workspace:*",
     "@vben-core/popup-ui": "workspace:*",
-    "@vben-core/preferences": "workspace:*",
     "@vben-core/shadcn-ui": "workspace:*",
     "@vben-core/shared": "workspace:*",
     "@vben/constants": "workspace:*",

packages/effects/common-ui/src/components/api-component/api-component.vue

@@ -1,9 +1,12 @@
 <script lang="ts" setup>
+import type { Component } from 'vue';
+
 import type { AnyPromiseFunction } from '@vben/types';
 
-import { type Component, computed, ref, unref, useAttrs, watch } from 'vue';
+import { computed, ref, unref, useAttrs, watch } from 'vue';
 
 import { LoaderCircle } from '@vben/icons';
+
 import { get, isEqual, isFunction } from '@vben-core/shared/utils';
 
 import { objectOmit } from '@vueuse/core';

packages/effects/common-ui/src/components/captcha/point-selection-captcha/index.vue

@@ -3,6 +3,7 @@ import type { CaptchaPoint, PointSelectionCaptchaProps } from '../types';
 
 import { RotateCw } from '@vben/icons';
 import { $t } from '@vben/locales';
+
 import { VbenButton, VbenIconButton } from '@vben-core/shadcn-ui';
 
 import { useCaptchaPoints } from '../hooks/useCaptchaPoints';

packages/effects/common-ui/src/components/captcha/point-selection-captcha/point-selection-captcha-card.vue

@@ -4,6 +4,7 @@ import type { PointSelectionCaptchaCardProps } from '../types';
 import { computed } from 'vue';
 
 import { $t } from '@vben/locales';
+
 import {
   Card,
   CardContent,

packages/effects/common-ui/src/components/captcha/slider-captcha/index.vue

@@ -8,6 +8,7 @@ import type {
 import { reactive, unref, useTemplateRef, watch, watchEffect } from 'vue';
 
 import { $t } from '@vben/locales';
+
 import { cn } from '@vben-core/shared/utils';
 
 import { useTimeoutFn } from '@vueuse/core';

packages/effects/common-ui/src/components/captcha/slider-captcha/slider-captcha-action.vue

@@ -1,8 +1,10 @@
 <script setup lang="ts">
 import type { CSSProperties } from 'vue';
+
 import { computed, ref, useTemplateRef } from 'vue';
 
 import { Check, ChevronsRight } from '@vben/icons';
+
 import { Slot } from '@vben-core/shadcn-ui';
 
 const props = defineProps<{

packages/effects/common-ui/src/components/captcha/slider-captcha/slider-captcha-bar.vue

@@ -1,5 +1,7 @@
 <script setup lang="ts">
-import { computed, type CSSProperties, ref, useTemplateRef } from 'vue';
+import type { CSSProperties } from 'vue';
+
+import { computed, ref, useTemplateRef } from 'vue';
 
 const props = defineProps<{
   barStyle: CSSProperties;

packages/effects/common-ui/src/components/captcha/slider-captcha/slider-captcha-content.vue

@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { CSSProperties } from 'vue';
+
 import { computed, useTemplateRef } from 'vue';
 
 import { VbenSpineText } from '@vben-core/shadcn-ui';

packages/effects/common-ui/src/components/captcha/types.ts

@@ -1,7 +1,7 @@
-import type { ClassType } from '@vben/types';
-
 import type { CSSProperties } from 'vue';
 
+import type { ClassType } from '@vben/types';
+
 export interface CaptchaData {
   /**
    * x

packages/effects/common-ui/src/components/ellipsis-text/ellipsis-text.vue

@@ -1,5 +1,7 @@
 <script setup lang="ts">
-import { computed, type CSSProperties, ref, watchEffect } from 'vue';
+import type { CSSProperties } from 'vue';
+
+import { computed, ref, watchEffect } from 'vue';
 
 import { VbenTooltip } from '@vben-core/shadcn-ui';
 

packages/effects/common-ui/src/components/icon-picker/icon-picker.vue

@@ -1,9 +1,12 @@
 <script setup lang="ts">
-import { computed, h, ref, type VNode, watch, watchEffect } from 'vue';
+import type { VNode } from 'vue';
+
+import { computed, h, ref, watch, watchEffect } from 'vue';
 
 import { usePagination } from '@vben/hooks';
 import { EmptyIcon, Grip, listIcons } from '@vben/icons';
 import { $t } from '@vben/locales';
+
 import {
   Button,
   Pagination,

packages/effects/common-ui/src/components/page/__tests__/page.test.ts

@@ -1,4 +1,5 @@
 import { mount } from '@vue/test-utils';
+
 import { describe, expect, it } from 'vitest';
 
 import { Page } from '..';

packages/effects/common-ui/src/components/page/page.vue

@@ -1,14 +1,9 @@
 <script setup lang="ts">
+import type { StyleValue } from 'vue';
+
 import type { PageProps } from './types';
 
-import {
-  computed,
-  nextTick,
-  onMounted,
-  ref,
-  type StyleValue,
-  useTemplateRef,
-} from 'vue';
+import { computed, nextTick, onMounted, ref, useTemplateRef } from 'vue';
 
 import { CSS_VARIABLE_LAYOUT_CONTENT_HEIGHT } from '@vben-core/shared/constants';
 import { cn } from '@vben-core/shared/utils';

packages/effects/common-ui/src/ui/about/about.vue

@@ -8,6 +8,7 @@ import {
   VBEN_GITHUB_URL,
   VBEN_PREVIEW_URL,
 } from '@vben/constants';
+
 import { VbenRenderContent } from '@vben-core/shadcn-ui';
 
 import { Page } from '../../components';

packages/effects/common-ui/src/ui/authentication/code-login.vue

@@ -1,11 +1,13 @@
 <script setup lang="ts">
 import type { Recordable } from '@vben/types';
+
 import type { VbenFormSchema } from '@vben-core/form-ui';
 
 import { computed, reactive } from 'vue';
 import { useRouter } from 'vue-router';
 
 import { $t } from '@vben/locales';
+
 import { useVbenForm } from '@vben-core/form-ui';
 import { VbenButton } from '@vben-core/shadcn-ui';
 

packages/effects/common-ui/src/ui/authentication/forget-password.vue

@@ -5,6 +5,7 @@ import { computed, reactive } from 'vue';
 import { useRouter } from 'vue-router';
 
 import { $t } from '@vben/locales';
+
 import { useVbenForm } from '@vben-core/form-ui';
 import { VbenButton } from '@vben-core/shadcn-ui';
 

packages/effects/common-ui/src/ui/authentication/index.ts

@@ -1,7 +1,7 @@
 export { default as AuthenticationCodeLogin } from './code-login.vue';
 export { default as AuthenticationForgetPassword } from './forget-password.vue';
-export { default as AuthenticationLogin } from './login.vue';
 export { default as AuthenticationLoginExpiredModal } from './login-expired-modal.vue';
+export { default as AuthenticationLogin } from './login.vue';
 export { default as AuthenticationQrCodeLogin } from './qrcode-login.vue';
 export { default as AuthenticationRegister } from './register.vue';
 export type { AuthenticationProps } from './types';

packages/effects/common-ui/src/ui/authentication/login.vue

@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { Recordable } from '@vben/types';
+
 import type { VbenFormSchema } from '@vben-core/form-ui';
 
 import type { AuthenticationProps } from './types';
@@ -8,6 +9,7 @@ import { computed, onMounted, reactive, ref } from 'vue';
 import { useRouter } from 'vue-router';
 
 import { $t } from '@vben/locales';
+
 import { useVbenForm } from '@vben-core/form-ui';
 import { VbenButton, VbenCheckbox } from '@vben-core/shadcn-ui';
 

packages/effects/common-ui/src/ui/authentication/qrcode-login.vue

@@ -3,6 +3,7 @@ import { ref } from 'vue';
 import { useRouter } from 'vue-router';
 
 import { $t } from '@vben/locales';
+
 import { VbenButton } from '@vben-core/shadcn-ui';
 
 import { useQRCode } from '@vueuse/integrations/useQRCode';

packages/effects/common-ui/src/ui/authentication/register.vue

@@ -1,11 +1,13 @@
 <script setup lang="ts">
 import type { Recordable } from '@vben/types';
+
 import type { VbenFormSchema } from '@vben-core/form-ui';
 
 import { computed, reactive } from 'vue';
 import { useRouter } from 'vue-router';
 
 import { $t } from '@vben/locales';
+
 import { useVbenForm } from '@vben-core/form-ui';
 import { VbenButton } from '@vben-core/shadcn-ui';
 

packages/effects/common-ui/src/ui/authentication/third-party-login.vue

@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { MdiGithub, MdiGoogle, MdiQqchat, MdiWechat } from '@vben/icons';
 import { $t } from '@vben/locales';
+
 import { VbenIconButton } from '@vben-core/shadcn-ui';
 
 defineOptions({

packages/effects/common-ui/src/ui/fallback/fallback.vue

@@ -6,6 +6,7 @@ import { useRouter } from 'vue-router';
 
 import { ArrowLeft, RotateCw } from '@vben/icons';
 import { $t } from '@vben/locales';
+
 import { VbenButton } from '@vben-core/shadcn-ui';
 
 interface Props extends FallbackProps {}

packages/effects/hooks/src/use-hover-toggle.ts

@@ -1,8 +1,9 @@
 import type { Arrayable, MaybeElementRef } from '@vueuse/core';
 
-import { computed, onUnmounted, ref, watch } from 'vue';
 import type { Ref } from 'vue';
 
+import { computed, onUnmounted, ref, watch } from 'vue';
+
 import { isFunction } from '@vben/utils';
 
 import { useMouseInElement } from '@vueuse/core';

packages/effects/hooks/src/use-pagination.ts

@@ -1,4 +1,5 @@
 import type { Ref } from 'vue';
+
 import { computed, ref, unref } from 'vue';
 
 /**

packages/effects/hooks/src/use-tabs.ts

@@ -1,4 +1,6 @@
-import { type RouteLocationNormalized, useRoute, useRouter } from 'vue-router';
+import type { RouteLocationNormalized } from 'vue-router';
+
+import { useRoute, useRouter } from 'vue-router';
 
 import { useTabbarStore } from '@vben/stores';
 

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

@@ -1,10 +1,10 @@
 <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';

packages/effects/layouts/src/basic/content/index.ts

@@ -1,2 +1,2 @@
-export { default as LayoutContent } from './content.vue';
 export { default as LayoutContentSpinner } from './content-spinner.vue';
+export { default as LayoutContent } from './content.vue';

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

@@ -5,6 +5,7 @@ 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 {

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

@@ -1,7 +1,9 @@
 <script lang="ts" setup>
+import type { SetupContext } from 'vue';
+
 import type { MenuRecordRaw } from '@vben/types';
 
-import { computed, type SetupContext, useSlots, watch } from 'vue';
+import { computed, useSlots, watch } from 'vue';
 
 import { useRefresh } from '@vben/hooks';
 import { $t } from '@vben/locales';
@@ -12,6 +14,7 @@ import {
 } from '@vben/preferences';
 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';
 

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

@@ -1,5 +1,6 @@
 <script lang="ts" setup>
 import type { MenuRecordRaw } from '@vben/types';
+
 import type { MenuProps } from '@vben-core/menu-ui';
 
 import { useRoute } from 'vue-router';

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

@@ -1,5 +1,6 @@
 <script lang="ts" setup>
 import type { MenuRecordRaw } from '@vben/types';
+
 import type { MenuProps } from '@vben-core/menu-ui';
 
 import { Menu } from '@vben-core/menu-ui';

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

@@ -1,11 +1,13 @@
 <script lang="ts" setup>
 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';
 
 interface Props extends NormalMenuProps {}

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

@@ -1,6 +1,8 @@
+import type { ComputedRef } from 'vue';
+
 import type { MenuRecordRaw } from '@vben/types';
 
-import { computed, type ComputedRef, ref, watch } from 'vue';
+import { computed, ref, watch } from 'vue';
 import { useRoute } from 'vue-router';
 
 import { preferences } from '@vben/preferences';

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

@@ -1,4 +1,6 @@
-import { type RouteRecordNormalized, useRouter } from 'vue-router';
+import type { RouteRecordNormalized } from 'vue-router';
+
+import { useRouter } from 'vue-router';
 
 import { isHttpUrl, openRouteInNewWindow, openWindow } from '@vben/utils';
 

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

@@ -5,6 +5,7 @@ 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 { useTabbar } from './use-tabbar';

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

@@ -1,7 +1,9 @@
-import type { TabDefinition } from '@vben/types';
-import type { IContextMenuItem } from '@vben-core/tabs-ui';
 import type { RouteLocationNormalizedGeneric } from 'vue-router';
 
+import type { TabDefinition } from '@vben/types';
+
+import type { IContextMenuItem } from '@vben-core/tabs-ui';
+
 import { computed, ref, watch } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 

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

@@ -6,6 +6,7 @@ import { useRoute } from 'vue-router';
 
 import { preferences } from '@vben/preferences';
 import { useTabbarStore } from '@vben/stores';
+
 import { VbenSpinner } from '@vben-core/shadcn-ui';
 
 defineOptions({ name: 'IFrameRouterView' });

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

@@ -1,11 +1,13 @@
 <script lang="ts" setup>
 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';
 
 interface Props {

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

@@ -2,6 +2,7 @@
 import { onMounted, onUnmounted, ref } from 'vue';
 
 import { $t } from '@vben/locales';
+
 import { useVbenModal } from '@vben-core/popup-ui';
 
 interface Props {

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

@@ -7,6 +7,7 @@ import {
   preferences,
   updatePreferences,
 } from '@vben/preferences';
+
 import { VbenIconButton } from '@vben-core/shadcn-ui';
 
 defineOptions({

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

@@ -12,6 +12,7 @@ import {
 } from '@vben/icons';
 import { $t } from '@vben/locales';
 import { isWindowsOs } from '@vben/utils';
+
 import { useVbenModal } from '@vben-core/popup-ui';
 
 import { useMagicKeys, whenever } from '@vueuse/core';

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

@@ -7,6 +7,7 @@ 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';
 

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

@@ -5,6 +5,7 @@ import { SUPPORT_LANGUAGES } from '@vben/constants';
 import { Languages } from '@vben/icons';
 import { loadLocaleMessages } from '@vben/locales';
 import { preferences, updatePreferences } from '@vben/preferences';
+
 import { VbenDropdownRadioMenu, VbenIconButton } from '@vben-core/shadcn-ui';
 
 defineOptions({

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

@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import type { AuthPageLayoutType } from '@vben/types';
+
 import type { VbenDropdownMenuItem } from '@vben-core/shadcn-ui';
 
 import { computed } from 'vue';
@@ -11,6 +12,7 @@ import {
   updatePreferences,
   usePreferences,
 } from '@vben/preferences';
+
 import { VbenDropdownRadioMenu, VbenIconButton } from '@vben-core/shadcn-ui';
 
 defineOptions({

packages/effects/layouts/src/widgets/lock-screen/index.ts

@@ -1,2 +1,2 @@
-export { default as LockScreen } from './lock-screen.vue';
 export { default as LockScreenModal } from './lock-screen-modal.vue';
+export { default as LockScreen } from './lock-screen.vue';

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

@@ -4,6 +4,7 @@ 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';

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

@@ -4,6 +4,7 @@ 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';

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

@@ -3,6 +3,7 @@ import type { NotificationItem } from './types';
 
 import { Bell, MailCheck } from '@vben/icons';
 import { $t } from '@vben/locales';
+
 import {
   VbenButton,
   VbenIconButton,

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

@@ -4,6 +4,7 @@ import type { SelectOption } from '@vben/types';
 import { useSlots } from 'vue';
 
 import { CircleHelp } from '@vben/icons';
+
 import { Input, VbenTooltip } from '@vben-core/shadcn-ui';
 
 defineOptions({

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

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

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

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

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

@@ -4,6 +4,7 @@ import type { SelectOption } from '@vben/types';
 import { useSlots } from 'vue';
 
 import { CircleHelp } from '@vben/icons';
+
 import {
   NumberField,
   NumberFieldContent,

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

@@ -4,6 +4,7 @@ import type { SelectOption } from '@vben/types';
 import { useSlots } from 'vue';
 
 import { CircleHelp } from '@vben/icons';
+
 import {
   Select,
   SelectContent,

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

@@ -2,6 +2,7 @@
 import { useSlots } from 'vue';
 
 import { CircleHelp } from '@vben/icons';
+
 import { Switch, VbenTooltip } from '@vben-core/shadcn-ui';
 
 defineOptions({

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

@@ -1,14 +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';
 
 defineOptions({

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

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

packages/effects/layouts/src/widgets/preferences/index.ts

@@ -1,3 +1,3 @@
-export { default as Preferences } from './preferences.vue';
 export { default as PreferencesButton } from './preferences-button.vue';
+export { default as Preferences } from './preferences.vue';
 export * from './use-open-preferences';

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

@@ -1,5 +1,6 @@
 <script lang="ts" setup>
 import { Settings } from '@vben/icons';
+
 import { VbenIconButton } from '@vben-core/shadcn-ui';
 
 import Preferences from './preferences.vue';

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

@@ -11,6 +11,7 @@ import type {
   PreferencesButtonPositionType,
   ThemeModeType,
 } from '@vben/types';
+
 import type { SegmentedItem } from '@vben-core/shadcn-ui';
 
 import { computed, ref } from 'vue';
@@ -23,6 +24,7 @@ import {
   resetPreferences,
   usePreferences,
 } from '@vben/preferences';
+
 import { useVbenDrawer } from '@vben-core/popup-ui';
 import {
   VbenButton,

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

@@ -5,6 +5,7 @@ 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';
 

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

@@ -8,6 +8,7 @@ import {
   updatePreferences,
   usePreferences,
 } from '@vben/preferences';
+
 import {
   ToggleGroup,
   ToggleGroupItem,

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

@@ -1,7 +1,8 @@
 <script setup lang="ts">
+import type { Component } from 'vue';
+
 import type { AnyFunction } from '@vben/types';
 
-import type { Component } from 'vue';
 import { computed, useTemplateRef, watch } from 'vue';
 
 import { useHoverToggle } from '@vben/hooks';
@@ -10,6 +11,7 @@ import { $t } from '@vben/locales';
 import { preferences, usePreferences } from '@vben/preferences';
 import { useLockStore } from '@vben/stores';
 import { isWindowsOs } from '@vben/utils';
+
 import { useVbenModal } from '@vben-core/popup-ui';
 import {
   Badge,

packages/effects/plugins/src/echarts/use-echarts.ts

@@ -1,8 +1,9 @@
 import type { EChartsOption } from 'echarts';
 
+import type { Ref } from 'vue';
+
 import type EchartsUI from './echarts-ui.vue';
 
-import type { Ref } from 'vue';
 import { computed, nextTick, watch } from 'vue';
 
 import { usePreferences } from '@vben/preferences';

packages/effects/plugins/src/vxe-table/api.ts

@@ -1,6 +1,7 @@
-import type { ExtendedFormApi } from '@vben-core/form-ui';
 import type { VxeGridInstance } from 'vxe-table';
 
+import type { ExtendedFormApi } from '@vben-core/form-ui';
+
 import type { VxeGridProps } from './types';
 
 import { toRaw } from 'vue';
@@ -26,18 +27,18 @@ function getDefaultState(): VxeGridProps {
 }
 
 export class VxeGridApi {
-  private isMounted = false;
-
-  private stateHandler: StateHandler;
   public formApi = {} as ExtendedFormApi;
 
   // private prevState: null | VxeGridProps = null;
   public grid = {} as VxeGridInstance;
-
   public state: null | VxeGridProps = null;
 
   public store: Store<VxeGridProps>;
 
+  private isMounted = false;
+
+  private stateHandler: StateHandler;
+
   constructor(options: VxeGridProps = {}) {
     const storeState = { ...options };
 

packages/effects/plugins/src/vxe-table/extends.ts

@@ -1,6 +1,7 @@
-import type { Recordable } from '@vben/types';
 import type { VxeGridProps, VxeUIExport } from 'vxe-table';
 
+import type { Recordable } from '@vben/types';
+
 import type { VxeGridApi } from './api';
 
 import { formatDate, formatDateTime, isFunction } from '@vben/utils';

packages/effects/plugins/src/vxe-table/init.ts

@@ -3,6 +3,7 @@ import type { SetupVxeTable } from './types';
 import { defineComponent, watch } from 'vue';
 
 import { usePreferences } from '@vben/preferences';
+
 import { useVbenForm } from '@vben-core/form-ui';
 
 import {
@@ -34,7 +35,6 @@ import {
   // VxeTextarea,
 } from 'vxe-pc-ui';
 import enUS from 'vxe-pc-ui/lib/language/en-US';
-
 // 导入默认的语言
 import zhCN from 'vxe-pc-ui/lib/language/zh-CN';
 import {

packages/effects/plugins/src/vxe-table/types.ts

@@ -1,5 +1,3 @@
-import type { ClassType, DeepPartial } from '@vben/types';
-import type { VbenFormProps } from '@vben-core/form-ui';
 import type {
   VxeGridListeners,
   VxeGridPropTypes,
@@ -7,10 +5,14 @@ import type {
   VxeUIExport,
 } from 'vxe-table';
 
-import type { VxeGridApi } from './api';
-
 import type { Ref } from 'vue';
 
+import type { ClassType, DeepPartial } from '@vben/types';
+
+import type { VbenFormProps } from '@vben-core/form-ui';
+
+import type { VxeGridApi } from './api';
+
 import { useVbenForm } from '@vben-core/form-ui';
 
 export interface VxePaginationInfo {
@@ -64,11 +66,11 @@ export interface VxeGridProps {
   showSearchForm?: boolean;
 }
 
-export type ExtendedVxeGridApi = {
+export type ExtendedVxeGridApi = VxeGridApi & {
   useStore: <T = NoInfer<VxeGridProps>>(
     selector?: (state: NoInfer<VxeGridProps>) => T,
   ) => Readonly<Ref<T>>;
-} & VxeGridApi;
+};
 
 export interface SetupVxeTable {
   configVxeTable: (ui: VxeUIExport) => void;

packages/effects/plugins/src/vxe-table/use-vxe-grid.vue

@@ -1,5 +1,4 @@
 <script lang="ts" setup>
-import type { VbenFormProps } from '@vben-core/form-ui';
 import type {
   VxeGridDefines,
   VxeGridInstance,
@@ -9,6 +8,8 @@ import type {
   VxeToolbarPropTypes,
 } from 'vxe-table';
 
+import type { VbenFormProps } from '@vben-core/form-ui';
+
 import type { ExtendedVxeGridApi, VxeGridProps } from './types';
 
 import {
@@ -27,6 +28,7 @@ import { EmptyIcon } from '@vben/icons';
 import { $t } from '@vben/locales';
 import { usePreferences } from '@vben/preferences';
 import { cloneDeep, cn, mergeWithArrayOverride } from '@vben/utils';
+
 import { VbenHelpTooltip, VbenLoading } from '@vben-core/shadcn-ui';
 
 import { VxeGrid, VxeUI } from 'vxe-table';

packages/effects/request/src/request-client/modules/uploader.ts

@@ -11,7 +11,7 @@ class FileUploader {
 
   public async upload(
     url: string,
-    data: { file: Blob | File } & Record<string, any>,
+    data: Record<string, any> & { file: Blob | File },
     config?: AxiosRequestConfig,
   ): Promise<AxiosResponse> {
     const formData = new FormData();

packages/effects/request/src/request-client/request-client.ts

@@ -5,6 +5,8 @@ import type {
   CreateAxiosDefaults,
 } from 'axios';
 
+import type { RequestClientOptions } from './types';
+
 import { bindMethods, merge } from '@vben/utils';
 
 import axios from 'axios';
@@ -12,20 +14,19 @@ import axios from 'axios';
 import { FileDownloader } from './modules/downloader';
 import { InterceptorManager } from './modules/interceptor';
 import { FileUploader } from './modules/uploader';
-import { type RequestClientOptions } from './types';
 
 class RequestClient {
-  private readonly instance: AxiosInstance;
-
   public addRequestInterceptor: InterceptorManager['addRequestInterceptor'];
-  public addResponseInterceptor: InterceptorManager['addResponseInterceptor'];
 
+  public addResponseInterceptor: InterceptorManager['addResponseInterceptor'];
   public download: FileDownloader['download'];
+
   // 是否正在刷新token
   public isRefreshing = false;
   // 刷新token队列
   public refreshTokenQueue: ((token: string) => void)[] = [];
   public upload: FileUploader['upload'];
+  private readonly instance: AxiosInstance;
 
   /**
    * 构造函数，用于创建Axios实例