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

packages/@core/ui-kit/shadcn-ui/src/components/avatar/avatar.vue

@@ -10,7 +10,7 @@ import { computed } from 'vue';
 
 import { Avatar, AvatarFallback, AvatarImage } from '../../ui';
 
-interface Props extends AvatarRootProps, AvatarFallbackProps, AvatarImageProps {
+interface Props extends AvatarFallbackProps, AvatarImageProps, AvatarRootProps {
   alt?: string;
   class?: ClassType;
   dot?: boolean;

packages/@core/ui-kit/shadcn-ui/src/components/breadcrumb/types.ts

@@ -1,5 +1,4 @@
 import type { BreadcrumbStyleType } from '@vben-core/typings';
-
 import type { Component } from 'vue';
 
 export interface IBreadcrumb {

packages/@core/ui-kit/shadcn-ui/src/components/button/button.ts

@@ -1,9 +1,8 @@
 import type { AsTag } from 'radix-vue';
+import type { Component } from 'vue';
 
 import type { ButtonVariants, ButtonVariantSize } from '../../ui';
 
-import type { Component } from 'vue';
-
 export interface VbenButtonProps {
   /**
    * The element or component this component should render as. Can be overwrite by `asChild`

packages/@core/ui-kit/shadcn-ui/src/components/context-menu/context-menu.vue

@@ -8,9 +8,8 @@ import type {
 
 import type { IContextMenuItem } from './interface';
 
-import { computed } from 'vue';
-
 import { useForwardPropsEmits } from 'radix-vue';
+import { computed } from 'vue';
 
 import {
   ContextMenu,

packages/@core/ui-kit/shadcn-ui/src/components/hover-card/hover-card.vue

@@ -6,9 +6,8 @@ import type {
   HoverCardRootProps,
 } from 'radix-vue';
 
-import { computed } from 'vue';
-
 import { useForwardPropsEmits } from 'radix-vue';
+import { computed } from 'vue';
 
 import { HoverCard, HoverCardContent, HoverCardTrigger } from '../../ui';
 

packages/@core/ui-kit/shadcn-ui/src/components/icon/icon.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { type Component, computed } from 'vue';
+import type { Component } from 'vue';
 
 import { IconDefault, IconifyIcon } from '@vben-core/icons';
 import {
@@ -8,6 +8,7 @@ import {
   isObject,
   isString,
 } from '@vben-core/shared/utils';
+import { computed } from 'vue';
 
 const props = defineProps<{
   // 没有是否显示默认图标

packages/@core/ui-kit/shadcn-ui/src/components/popover/popover.vue

@@ -6,9 +6,8 @@ import type {
   PopoverRootProps,
 } from 'radix-vue';
 
-import { computed } from 'vue';
-
 import { useForwardPropsEmits } from 'radix-vue';
+import { computed } from 'vue';
 
 import {
   PopoverContent,

packages/@core/ui-kit/shadcn-ui/src/components/render-content/render-content.vue

@@ -1,8 +1,8 @@
 <script lang="ts">
 import type { Component, PropType } from 'vue';
-import { defineComponent, h } from 'vue';
 
 import { isFunction, isObject } from '@vben-core/shared/utils';
+import { defineComponent, h } from 'vue';
 
 export default defineComponent({
   name: 'RenderContent',

packages/@core/ui-kit/shadcn-ui/src/components/segmented/tabs-indicator.vue

@@ -1,11 +1,9 @@
 <script setup lang="ts">
 import type { TabsIndicatorProps } from 'radix-vue';
 
-import { computed } from 'vue';
-
 import { cn } from '@vben-core/shared/utils';
-
 import { TabsIndicator, useForwardProps } from 'radix-vue';
+import { computed } from 'vue';
 
 const props = defineProps<{ class?: any } & TabsIndicatorProps>();
 

packages/@core/ui-kit/shadcn-ui/src/components/tooltip/tooltip.vue

@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import type { ClassType } from '@vben-core/typings';
 import type { TooltipContentProps } from 'radix-vue';
-
 import type { StyleValue } from 'vue';
 
 import {