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

playground/src/adapter/component/index.ts

@@ -4,13 +4,10 @@
  */
 
 import type { BaseFormComponentType } from '@vben/common-ui';
-
 import type { Component, SetupContext } from 'vue';
-import { h } from 'vue';
 
 import { ApiComponent, globalShareState, IconPicker } from '@vben/common-ui';
 import { $t } from '@vben/locales';
-
 import {
   AutoComplete,
   Button,
@@ -35,6 +32,7 @@ import {
   TreeSelect,
   Upload,
 } from 'ant-design-vue';
+import { h } from 'vue';
 
 const withDefaultPlaceholder = <T extends Component>(
   component: T,

playground/src/locales/index.ts

@@ -1,8 +1,6 @@
 import type { LocaleSetupOptions, SupportedLanguagesType } from '@vben/locales';
 import type { Locale } from 'ant-design-vue/es/locale';
-
 import type { App } from 'vue';
-import { ref } from 'vue';
 
 import {
   $t,
@@ -10,10 +8,10 @@ import {
   loadLocalesMapFromDir,
 } from '@vben/locales';
 import { preferences } from '@vben/preferences';
-
 import antdEnLocale from 'ant-design-vue/es/locale/en_US';
 import antdDefaultLocale from 'ant-design-vue/es/locale/zh_CN';
 import dayjs from 'dayjs';
+import { ref } from 'vue';
 
 const antdLocale = ref<Locale>(antdDefaultLocale);
 

playground/src/views/dashboard/analytics/analytics-trends.vue

@@ -1,11 +1,8 @@
 <script lang="ts" setup>
-import { onMounted, ref } from 'vue';
+import type { EchartsUIType } from '@vben/plugins/echarts';
 
-import {
-  EchartsUI,
-  type EchartsUIType,
-  useEcharts,
-} from '@vben/plugins/echarts';
+import { EchartsUI, useEcharts } from '@vben/plugins/echarts';
+import { onMounted, ref } from 'vue';
 
 const chartRef = ref<EchartsUIType>();
 const { renderEcharts } = useEcharts(chartRef);

playground/src/views/dashboard/analytics/analytics-visits-data.vue

@@ -1,11 +1,8 @@
 <script lang="ts" setup>
-import { onMounted, ref } from 'vue';
+import type { EchartsUIType } from '@vben/plugins/echarts';
 
-import {
-  EchartsUI,
-  type EchartsUIType,
-  useEcharts,
-} from '@vben/plugins/echarts';
+import { EchartsUI, useEcharts } from '@vben/plugins/echarts';
+import { onMounted, ref } from 'vue';
 
 const chartRef = ref<EchartsUIType>();
 const { renderEcharts } = useEcharts(chartRef);

playground/src/views/dashboard/analytics/analytics-visits-sales.vue

@@ -1,11 +1,8 @@
 <script lang="ts" setup>
-import { onMounted, ref } from 'vue';
+import type { EchartsUIType } from '@vben/plugins/echarts';
 
-import {
-  EchartsUI,
-  type EchartsUIType,
-  useEcharts,
-} from '@vben/plugins/echarts';
+import { EchartsUI, useEcharts } from '@vben/plugins/echarts';
+import { onMounted, ref } from 'vue';
 
 const chartRef = ref<EchartsUIType>();
 const { renderEcharts } = useEcharts(chartRef);

playground/src/views/dashboard/analytics/analytics-visits-source.vue

@@ -1,11 +1,8 @@
 <script lang="ts" setup>
-import { onMounted, ref } from 'vue';
+import type { EchartsUIType } from '@vben/plugins/echarts';
 
-import {
-  EchartsUI,
-  type EchartsUIType,
-  useEcharts,
-} from '@vben/plugins/echarts';
+import { EchartsUI, useEcharts } from '@vben/plugins/echarts';
+import { onMounted, ref } from 'vue';
 
 const chartRef = ref<EchartsUIType>();
 const { renderEcharts } = useEcharts(chartRef);

playground/src/views/dashboard/analytics/analytics-visits.vue

@@ -1,11 +1,8 @@
 <script lang="ts" setup>
-import { onMounted, ref } from 'vue';
+import type { EchartsUIType } from '@vben/plugins/echarts';
 
-import {
-  EchartsUI,
-  type EchartsUIType,
-  useEcharts,
-} from '@vben/plugins/echarts';
+import { EchartsUI, useEcharts } from '@vben/plugins/echarts';
+import { onMounted, ref } from 'vue';
 
 const chartRef = ref<EchartsUIType>();
 const { renderEcharts } = useEcharts(chartRef);

playground/src/views/demos/badge/index.vue

@@ -1,14 +1,11 @@
 <script lang="ts" setup>
-import { reactive } from 'vue';
-import { useRoute } from 'vue-router';
-
+import { useVbenForm } from '#/adapter/form';
 import { Page } from '@vben/common-ui';
 import { useAccessStore } from '@vben/stores';
 import { MenuBadge } from '@vben-core/menu-ui';
-
 import { Button, Card, Radio, RadioGroup } from 'ant-design-vue';
-
-import { useVbenForm } from '#/adapter/form';
+import { reactive } from 'vue';
+import { useRoute } from 'vue-router';
 
 const colors = [
   { label: '预设：默认', value: 'default' },

playground/src/views/demos/features/vue-query/paginated-queries.vue

@@ -1,10 +1,11 @@
 <script setup lang="ts">
-import type { IProducts } from './typing';
+import type { Ref } from 'vue';
 
-import { type Ref, ref } from 'vue';
+import type { IProducts } from './typing';
 
 import { keepPreviousData, useQuery } from '@tanstack/vue-query';
 import { Button } from 'ant-design-vue';
+import { ref } from 'vue';
 
 const LIMIT = 10;
 const fetcher = async (page: Ref<number>): Promise<IProducts> => {

playground/src/views/examples/drawer/index.vue

@@ -1,6 +1,7 @@
 <script lang="ts" setup>
-import { type DrawerPlacement, Page, useVbenDrawer } from '@vben/common-ui';
+import type { DrawerPlacement } from '@vben/common-ui';
 
+import { Page, useVbenDrawer } from '@vben/common-ui';
 import { Button, Card } from 'ant-design-vue';
 
 import DocButton from '../doc-button.vue';

playground/src/views/examples/form/basic.vue

@@ -1,14 +1,11 @@
 <script lang="ts" setup>
-import { h, ref } from 'vue';
-
+import { useVbenForm } from '#/adapter/form';
+import { getAllMenusApi } from '#/api';
 import { Page } from '@vben/common-ui';
-
 import { useDebounceFn } from '@vueuse/core';
 import { Button, Card, message, Spin, TabPane, Tabs } from 'ant-design-vue';
 import dayjs from 'dayjs';
-
-import { useVbenForm } from '#/adapter/form';
-import { getAllMenusApi } from '#/api';
+import { h, ref } from 'vue';
 
 import DocButton from '../doc-button.vue';