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

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

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

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

@@ -1,8 +1,6 @@
 <script setup lang="ts">
 import type { PointSelectionCaptchaCardProps } from '../types';
 
-import { computed } from 'vue';
-
 import { $t } from '@vben/locales';
 import {
   Card,
@@ -11,6 +9,7 @@ import {
   CardHeader,
   CardTitle,
 } from '@vben-core/shadcn-ui';
+import { computed } from 'vue';
 
 const props = withDefaults(defineProps<PointSelectionCaptchaCardProps>(), {
   height: '220px',

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

@@ -5,12 +5,10 @@ import type {
   SliderRotateVerifyPassingData,
 } from '../types';
 
-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';
+import { reactive, unref, useTemplateRef, watch, watchEffect } from 'vue';
 
 import SliderCaptchaAction from './slider-captcha-action.vue';
 import SliderCaptchaBar from './slider-captcha-bar.vue';

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

@@ -1,9 +1,9 @@
 <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';
+import { computed, ref, useTemplateRef } from 'vue';
 
 const props = defineProps<{
   actionStyle: CSSProperties;

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,8 +1,8 @@
 <script setup lang="ts">
 import type { CSSProperties } from 'vue';
-import { computed, useTemplateRef } from 'vue';
 
 import { VbenSpineText } from '@vben-core/shadcn-ui';
+import { computed, useTemplateRef } from 'vue';
 
 const props = defineProps<{
   contentStyle: CSSProperties;

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

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

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

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

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

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, h, ref, type VNode, watch, watchEffect } from 'vue';
+import type { VNode } from 'vue';
 
 import { usePagination } from '@vben/hooks';
 import { EmptyIcon, Grip, listIcons } from '@vben/icons';
@@ -18,8 +18,8 @@ import {
   VbenIconButton,
   VbenPopover,
 } from '@vben-core/shadcn-ui';
-
 import { refDebounced } from '@vueuse/core';
+import { computed, h, ref, watch, watchEffect } from 'vue';
 
 interface Props {
   pageSize?: number;

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

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

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

@@ -1,14 +1,13 @@
 <script setup lang="ts">
 import type { AboutProps, DescriptionItem } from './about';
 
-import { h } from 'vue';
-
 import {
   VBEN_DOC_URL,
   VBEN_GITHUB_URL,
   VBEN_PREVIEW_URL,
 } from '@vben/constants';
 import { VbenRenderContent } from '@vben-core/shadcn-ui';
+import { h } from 'vue';
 
 import { Page } from '../../components';
 

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

@@ -1,12 +1,11 @@
 <script setup lang="ts">
 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';
+import { computed, reactive } from 'vue';
+import { useRouter } from 'vue-router';
 
 import Title from './auth-title.vue';
 

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

@@ -1,12 +1,11 @@
 <script setup lang="ts">
 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';
+import { computed, reactive } from 'vue';
+import { useRouter } from 'vue-router';
 
 import Title from './auth-title.vue';
 

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

@@ -3,13 +3,12 @@ import type { VbenFormSchema } from '@vben-core/form-ui';
 
 import type { AuthenticationProps, LoginAndRegisterParams } from './types';
 
-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';
 import { cloneDeep } from '@vben-core/shared/utils';
+import { computed, onMounted, reactive, ref } from 'vue';
+import { useRouter } from 'vue-router';
 
 import Title from './auth-title.vue';
 import ThirdPartyLogin from './third-party-login.vue';

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

@@ -1,11 +1,9 @@
 <script setup lang="ts">
-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';
+import { ref } from 'vue';
+import { useRouter } from 'vue-router';
 
 import Title from './auth-title.vue';
 

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

@@ -2,12 +2,11 @@
 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';
+import { computed, reactive } from 'vue';
+import { useRouter } from 'vue-router';
 
 import Title from './auth-title.vue';
 

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

@@ -1,12 +1,11 @@
 <script setup lang="ts">
 import type { FallbackProps } from './fallback';
 
-import { computed, defineAsyncComponent } from 'vue';
-import { useRouter } from 'vue-router';
-
 import { ArrowLeft, RotateCw } from '@vben/icons';
 import { $t } from '@vben/locales';
 import { VbenButton } from '@vben-core/shadcn-ui';
+import { computed, defineAsyncComponent } from 'vue';
+import { useRouter } from 'vue-router';
 
 interface Props extends FallbackProps {}