diff --git a/src/components/Application/src/search/AppSearchFooter.vue b/src/components/Application/src/search/AppSearchFooter.vue
index fc20833437a998dcc90d92906e877a7d4e4065f7..6c39938541e6dd7c6310cec3b7928ba3e555ce34 100644
--- a/src/components/Application/src/search/AppSearchFooter.vue
+++ b/src/components/Application/src/search/AppSearchFooter.vue
@@ -14,6 +14,7 @@
   import AppSearchKeyItem from './AppSearchKeyItem.vue';
   import { useDesign } from '/@/hooks/web/useDesign';
   import { useI18n } from '/@/hooks/web/useI18n';
+
   const { prefixCls } = useDesign('app-search-footer');
   const { t } = useI18n();
 </script>
diff --git a/src/components/Application/src/search/AppSearchKeyItem.vue b/src/components/Application/src/search/AppSearchKeyItem.vue
index aba36a5afdeee8124e8eb916a40f184074fef495..e2db5daa6864bd490d8fb80169911ada6901e7d5 100644
--- a/src/components/Application/src/search/AppSearchKeyItem.vue
+++ b/src/components/Application/src/search/AppSearchKeyItem.vue
@@ -5,6 +5,7 @@
 </template>
 <script lang="ts" setup>
   import { Icon } from '/@/components/Icon';
+
   defineProps({
     icon: String,
   });
diff --git a/src/components/Application/src/search/AppSearchModal.vue b/src/components/Application/src/search/AppSearchModal.vue
index 2ff023446f7012bb8d57912e354f974f78960b91..b37b226130c24d38f7fcc3f9fa541183df0f06e8 100644
--- a/src/components/Application/src/search/AppSearchModal.vue
+++ b/src/components/Application/src/search/AppSearchModal.vue
@@ -61,8 +61,7 @@
   import { computed, unref, ref, watch, nextTick } from 'vue';
   import { SearchOutlined } from '@ant-design/icons-vue';
   import AppSearchFooter from './AppSearchFooter.vue';
-  import Icon from '/@/components/Icon';
-  // @ts-ignore
+  import { Icon } from '/@/components/Icon';
   import vClickOutside from '/@/directives/clickOutside';
   import { useDesign } from '/@/hooks/web/useDesign';
   import { useRefs } from '/@/hooks/core/useRefs';
diff --git a/src/components/CardList/src/CardList.vue b/src/components/CardList/src/CardList.vue
index d14f7c6facc2e2ac5fb5fe819e4be6a6d8b5358d..083545f68ab085df5634744d3eb76b8eb062a154 100644
--- a/src/components/CardList/src/CardList.vue
+++ b/src/components/CardList/src/CardList.vue
@@ -90,6 +90,7 @@
   import { Button } from '/@/components/Button';
   import { isFunction } from '/@/utils/is';
   import { useSlider, grid } from './data';
+
   const ListItem = List.Item;
   const CardMeta = Card.Meta;
   const TypographyText = Typography.Text;
diff --git a/src/components/ClickOutSide/src/ClickOutSide.vue b/src/components/ClickOutSide/src/ClickOutSide.vue
index c043cc190e3e9f6a2b588c27f97cb3748ed712e2..829129d50e98aef22642fb22215755a1f48f2713 100644
--- a/src/components/ClickOutSide/src/ClickOutSide.vue
+++ b/src/components/ClickOutSide/src/ClickOutSide.vue
@@ -6,6 +6,7 @@
 <script lang="ts" setup>
   import { ref, onMounted } from 'vue';
   import { onClickOutside } from '@vueuse/core';
+
   const emit = defineEmits(['mounted', 'clickOutside']);
   const wrap = ref<ElRef>(null);
 
diff --git a/src/components/ContextMenu/src/ContextMenu.vue b/src/components/ContextMenu/src/ContextMenu.vue
index a2028f5c5c638ef369139b1ab08b0ce38962c9ae..078077bb4f78681395ac10b127faf26ae7eaabfe 100644
--- a/src/components/ContextMenu/src/ContextMenu.vue
+++ b/src/components/ContextMenu/src/ContextMenu.vue
@@ -2,7 +2,7 @@
   import type { ContextMenuItem, ItemContentProps, Axis } from './typing';
   import type { FunctionalComponent, CSSProperties, PropType } from 'vue';
   import { defineComponent, nextTick, onMounted, computed, ref, unref, onUnmounted } from 'vue';
-  import Icon from '/@/components/Icon';
+  import { Icon } from '/@/components/Icon';
   import { Menu, Divider } from 'ant-design-vue';
 
   const prefixCls = 'context-menu';
diff --git a/src/components/Cropper/src/CropperAvatar.vue b/src/components/Cropper/src/CropperAvatar.vue
index 9f14bc497f699760e6a387b752a64f832bcd4ce5..8c4aae863b6f3dbcc5d176ab4721eae70c9332d4 100644
--- a/src/components/Cropper/src/CropperAvatar.vue
+++ b/src/components/Cropper/src/CropperAvatar.vue
@@ -45,7 +45,7 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useI18n } from '/@/hooks/web/useI18n';
   import type { ButtonProps } from '/@/components/Button';
-  import Icon from '/@/components/Icon';
+  import { Icon } from '/@/components/Icon';
 
   const props = {
     width: { type: [String, Number], default: '200px' },
diff --git a/src/components/Drawer/src/components/DrawerFooter.vue b/src/components/Drawer/src/components/DrawerFooter.vue
index 9fed6eea24c79ac7d5c8b095fadfc71873978617..507b693e32e9b6ce81e40d1ef608a2ee04fa4a96 100644
--- a/src/components/Drawer/src/components/DrawerFooter.vue
+++ b/src/components/Drawer/src/components/DrawerFooter.vue
@@ -30,6 +30,7 @@
   import { useDesign } from '/@/hooks/web/useDesign';
 
   import { footerProps } from '../props';
+
   export default defineComponent({
     name: 'BasicDrawerFooter',
     props: {
diff --git a/src/components/Drawer/src/components/DrawerHeader.vue b/src/components/Drawer/src/components/DrawerHeader.vue
index 2404a30360a5deac34f3a4afa5afdafd2bcc37e9..09a3ad040e68313a7ea5ccb3f99e319b6faba0b8 100644
--- a/src/components/Drawer/src/components/DrawerHeader.vue
+++ b/src/components/Drawer/src/components/DrawerHeader.vue
@@ -25,6 +25,7 @@
   import { useDesign } from '/@/hooks/web/useDesign';
 
   import { propTypes } from '/@/utils/propTypes';
+
   export default defineComponent({
     name: 'BasicDrawerHeader',
     components: { BasicTitle, ArrowLeftOutlined },
diff --git a/src/components/Excel/src/ImportExcel.vue b/src/components/Excel/src/ImportExcel.vue
index d227504960bd5e1f5b5e8bbef62cee8936a48fbe..99217a29db94d74904ac70db9435275e408bae04 100644
--- a/src/components/Excel/src/ImportExcel.vue
+++ b/src/components/Excel/src/ImportExcel.vue
@@ -18,6 +18,7 @@
   import { dateUtil } from '/@/utils/dateUtil';
 
   import type { ExcelData } from './typing';
+
   export default defineComponent({
     name: 'ImportExcel',
     props: {
diff --git a/src/components/Form/src/components/ApiCascader.vue b/src/components/Form/src/components/ApiCascader.vue
index 948386a7c6b84f433099b60d4ef4a807d9e7a438..af00cb0b509e0d29a842634e1a973e74e7ec1eb7 100644
--- a/src/components/Form/src/components/ApiCascader.vue
+++ b/src/components/Form/src/components/ApiCascader.vue
@@ -27,6 +27,7 @@
   import { useRuleFormItem } from '/@/hooks/component/useFormItem';
   import { LoadingOutlined } from '@ant-design/icons-vue';
   import { useI18n } from '/@/hooks/web/useI18n';
+
   interface Option {
     value: string;
     label: string;
diff --git a/src/components/Form/src/components/ApiTransfer.vue b/src/components/Form/src/components/ApiTransfer.vue
index 96d396c557e4164f056a62d5921db60dafa847de..7eccd43b88f4eb11054457f8f63fcae5411a9873 100644
--- a/src/components/Form/src/components/ApiTransfer.vue
+++ b/src/components/Form/src/components/ApiTransfer.vue
@@ -19,6 +19,7 @@
   import { propTypes } from '/@/utils/propTypes';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { TransferDirection, TransferItem } from 'ant-design-vue/lib/transfer';
+
   export default defineComponent({
     name: 'ApiTransfer',
     components: { Transfer },
diff --git a/src/components/Form/src/components/ApiTree.vue b/src/components/Form/src/components/ApiTree.vue
index 0ec6917dd19af6d354b6ab07a3a4591ec2523031..61cc4380ec5b855e098977a7fb0196e3f1a7e26a 100644
--- a/src/components/Form/src/components/ApiTree.vue
+++ b/src/components/Form/src/components/ApiTree.vue
@@ -16,6 +16,7 @@
   import { get } from 'lodash-es';
   import { propTypes } from '/@/utils/propTypes';
   import { LoadingOutlined } from '@ant-design/icons-vue';
+
   export default defineComponent({
     name: 'ApiTree',
     components: { ATree: Tree, LoadingOutlined },
diff --git a/src/components/Form/src/components/ApiTreeSelect.vue b/src/components/Form/src/components/ApiTreeSelect.vue
index 3f073d34ba22aeac4d413dab249373fad85d727f..35c6c3a8686c70b070f46479bd19babca95eae9e 100644
--- a/src/components/Form/src/components/ApiTreeSelect.vue
+++ b/src/components/Form/src/components/ApiTreeSelect.vue
@@ -16,6 +16,7 @@
   import { get } from 'lodash-es';
   import { propTypes } from '/@/utils/propTypes';
   import { LoadingOutlined } from '@ant-design/icons-vue';
+
   export default defineComponent({
     name: 'ApiTreeSelect',
     components: { ATreeSelect: TreeSelect, LoadingOutlined },
diff --git a/src/components/Form/src/components/FormItem.vue b/src/components/Form/src/components/FormItem.vue
index 595b4a9293ac01d172afad9e9e16221b90e372d8..37e684d3723859d060146f93a27fde3c9b09f09b 100644
--- a/src/components/Form/src/components/FormItem.vue
+++ b/src/components/Form/src/components/FormItem.vue
@@ -2,7 +2,7 @@
   import type { PropType, Ref } from 'vue';
   import { computed, defineComponent, toRefs, unref } from 'vue';
   import type { FormActionType, FormProps, FormSchema } from '../types/form';
-  import type { ValidationRule } from 'ant-design-vue/lib/form/Form';
+  import type { Rule } from 'ant-design-vue/lib/form';
   import type { TableActionType } from '/@/components/Table';
   import { Col, Divider, Form } from 'ant-design-vue';
   import { componentMap } from '../componentMap';
@@ -138,7 +138,7 @@
         return { isShow, isIfShow };
       }
 
-      function handleRules(): ValidationRule[] {
+      function handleRules(): Rule[] {
         const {
           rules: defRules = [],
           component,
@@ -149,10 +149,10 @@
         } = props.schema;
 
         if (isFunction(dynamicRules)) {
-          return dynamicRules(unref(getValues)) as ValidationRule[];
+          return dynamicRules(unref(getValues)) as Rule[];
         }
 
-        let rules: ValidationRule[] = cloneDeep(defRules) as ValidationRule[];
+        let rules: Rule[] = cloneDeep(defRules) as Rule[];
         const { rulesMessageJoinLabel: globalRulesMessageJoinLabel } = props.formProps;
 
         const joinLabel = Reflect.has(props.schema, 'rulesMessageJoinLabel')
diff --git a/src/components/Icon/index.ts b/src/components/Icon/index.ts
index 01e7d2361c39fe04c7c564ef8a7ce4b5ac74875f..69dc2b5863913ccf8c4182f99c770444b4f04d9a 100644
--- a/src/components/Icon/index.ts
+++ b/src/components/Icon/index.ts
@@ -4,4 +4,4 @@ import IconPicker from './src/IconPicker.vue';
 
 export { Icon, IconPicker, SvgIcon };
 
-export default Icon;
+// export default Icon;
diff --git a/src/components/Loading/src/Loading.vue b/src/components/Loading/src/Loading.vue
index 5e4479ef838238f3d42cd125d0229dd2e4bae562..3803085ae4bc5ee8f063049337f1622d6c36764f 100644
--- a/src/components/Loading/src/Loading.vue
+++ b/src/components/Loading/src/Loading.vue
@@ -9,8 +9,7 @@
   </section>
 </template>
 <script lang="ts">
-  import { PropType } from 'vue';
-  import { defineComponent } from 'vue';
+  import { PropType, defineComponent } from 'vue';
   import { Spin } from 'ant-design-vue';
   import { SizeEnum } from '/@/enums/sizeEnum';
 
diff --git a/src/components/Markdown/src/MarkdownViewer.vue b/src/components/Markdown/src/MarkdownViewer.vue
index ea5d7fa450640c9061ec0e9fb27c64759c9bde8d..f58854374a4c2b2fb5d7f4b0f2bfc8b0ac6e1e48 100644
--- a/src/components/Markdown/src/MarkdownViewer.vue
+++ b/src/components/Markdown/src/MarkdownViewer.vue
@@ -8,6 +8,7 @@
   import { onMountedOrActivated } from '@vben/hooks';
   import { useRootSetting } from '/@/hooks/setting/useRootSetting';
   import { getTheme } from './getTheme';
+
   const props = defineProps({
     value: { type: String },
     class: { type: String },
diff --git a/src/components/Menu/src/components/BasicMenuItem.vue b/src/components/Menu/src/components/BasicMenuItem.vue
index 2a5656278dcf9ae7de45a8e5285eee600d0e0556..4d483624b6c8904e8d7e19f9f25cce013ec81c12 100644
--- a/src/components/Menu/src/components/BasicMenuItem.vue
+++ b/src/components/Menu/src/components/BasicMenuItem.vue
@@ -9,6 +9,7 @@
   import { itemProps } from '../props';
 
   import MenuItemContent from './MenuItemContent.vue';
+
   export default defineComponent({
     name: 'BasicMenuItem',
     components: { MenuItem: Menu.Item, MenuItemContent },
diff --git a/src/components/Menu/src/components/MenuItemContent.vue b/src/components/Menu/src/components/MenuItemContent.vue
index 3044fbc0781d06bb6e3e0b8047fb9deb1950f203..a1293c3deb74203022fb1e3791102028ed82dfab 100644
--- a/src/components/Menu/src/components/MenuItemContent.vue
+++ b/src/components/Menu/src/components/MenuItemContent.vue
@@ -7,10 +7,11 @@
 <script lang="ts">
   import { computed, defineComponent } from 'vue';
 
-  import Icon from '/@/components/Icon/index';
+  import { Icon } from '/@/components/Icon';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { useDesign } from '/@/hooks/web/useDesign';
   import { contentProps } from '../props';
+
   const { t } = useI18n();
 
   export default defineComponent({
diff --git a/src/components/Modal/src/components/ModalFooter.vue b/src/components/Modal/src/components/ModalFooter.vue
index d8cefdb1a826a3ac01751ae291006923a2eb09e7..30fefc629b4ae1d2089a26787b5ff3c351b3cd6f 100644
--- a/src/components/Modal/src/components/ModalFooter.vue
+++ b/src/components/Modal/src/components/ModalFooter.vue
@@ -19,8 +19,8 @@
 </template>
 <script lang="ts">
   import { defineComponent } from 'vue';
-
   import { basicProps } from '../props';
+
   export default defineComponent({
     name: 'BasicModalFooter',
     props: basicProps,
diff --git a/src/components/Page/src/PageWrapper.vue b/src/components/Page/src/PageWrapper.vue
index baca629f0136577d4c883b7e807cefc789934154..ec406040ffa4fe5666c96628767344cfc7eec80a 100644
--- a/src/components/Page/src/PageWrapper.vue
+++ b/src/components/Page/src/PageWrapper.vue
@@ -33,7 +33,7 @@
   </div>
 </template>
 <script lang="ts">
-  import { CSSProperties, PropType, provide } from 'vue';
+  import type { CSSProperties, PropType, provide } from 'vue';
 
   import { defineComponent, computed, watch, ref, unref } from 'vue';
   import PageFooter from './PageFooter.vue';
diff --git a/src/components/Scrollbar/src/Scrollbar.vue b/src/components/Scrollbar/src/Scrollbar.vue
index 939d66f7022cbd0e6ac02697a9cfd777b0b239a7..daeb2307f6e0f88ca33d0d77467ff1b16b7b1d35 100644
--- a/src/components/Scrollbar/src/Scrollbar.vue
+++ b/src/components/Scrollbar/src/Scrollbar.vue
@@ -19,7 +19,6 @@
 <script lang="ts">
   import { addResizeListener, removeResizeListener } from '/@/utils/event';
   import componentSetting from '/@/settings/componentSetting';
-  const { scrollbar } = componentSetting;
   import { toObject } from './util';
   import {
     defineComponent,
@@ -33,6 +32,8 @@
   } from 'vue';
   import Bar from './bar';
 
+  const { scrollbar } = componentSetting;
+
   export default defineComponent({
     name: 'Scrollbar',
     // inheritAttrs: false,
diff --git a/src/components/SimpleMenu/src/SimpleMenu.vue b/src/components/SimpleMenu/src/SimpleMenu.vue
index 030d77c62dd8366896f0557c0578712dac152278..a391d069eb91f8a2c7b2a614c027c449103ddd99 100644
--- a/src/components/SimpleMenu/src/SimpleMenu.vue
+++ b/src/components/SimpleMenu/src/SimpleMenu.vue
@@ -33,6 +33,7 @@
   import { openWindow } from '/@/utils';
 
   import { useOpenKeys } from './useOpenKeys';
+
   export default defineComponent({
     name: 'SimpleMenu',
     components: {
diff --git a/src/components/SimpleMenu/src/SimpleSubMenu.vue b/src/components/SimpleMenu/src/SimpleSubMenu.vue
index 5c66a2dabd8b8602e0dba9699784c6555073af35..5e2a3d3f4b18ddf4c31e7f310f8391fba1571158 100644
--- a/src/components/SimpleMenu/src/SimpleSubMenu.vue
+++ b/src/components/SimpleMenu/src/SimpleSubMenu.vue
@@ -48,7 +48,7 @@
 
   import { defineComponent, computed } from 'vue';
   import { useDesign } from '/@/hooks/web/useDesign';
-  import Icon from '/@/components/Icon/index';
+  import { Icon } from '/@/components/Icon';
 
   import MenuItem from './components/MenuItem.vue';
   import SubMenu from './components/SubMenuItem.vue';
diff --git a/src/components/SimpleMenu/src/components/Menu.vue b/src/components/SimpleMenu/src/components/Menu.vue
index 61c1936459b1053d482e3a9e348b660d1da8aa47..10f1cc48ed365fdeb69a8df6aa2c50afa46c2c7a 100644
--- a/src/components/SimpleMenu/src/components/Menu.vue
+++ b/src/components/SimpleMenu/src/components/Menu.vue
@@ -23,6 +23,7 @@
   import { propTypes } from '/@/utils/propTypes';
   import { createSimpleRootMenuContext } from './useSimpleMenuContext';
   import mitt from '/@/utils/mitt';
+
   export default defineComponent({
     name: 'Menu',
     props: {
diff --git a/src/components/SimpleMenu/src/components/MenuItem.vue b/src/components/SimpleMenu/src/components/MenuItem.vue
index c4976dec9606c5cc2db5090b8e7a970e3bd1a309..faf5ea40798feef97a4def0065c32e15cd297705 100644
--- a/src/components/SimpleMenu/src/components/MenuItem.vue
+++ b/src/components/SimpleMenu/src/components/MenuItem.vue
@@ -17,13 +17,14 @@
 </template>
 
 <script lang="ts">
-  import { PropType } from 'vue';
+  import type { PropType } from 'vue';
   import { defineComponent, ref, computed, unref, getCurrentInstance, watch } from 'vue';
   import { useDesign } from '/@/hooks/web/useDesign';
   import { propTypes } from '/@/utils/propTypes';
   import { useMenuItem } from './useMenu';
   import { Tooltip } from 'ant-design-vue';
   import { useSimpleRootMenuContext } from './useSimpleMenuContext';
+
   export default defineComponent({
     name: 'MenuItem',
     components: { Tooltip },
diff --git a/src/components/SimpleMenu/src/components/SubMenuItem.vue b/src/components/SimpleMenu/src/components/SubMenuItem.vue
index 7d1b5a62b20b871f04c3eeb093c1881f06794606..6d491f77d9c20c584e08203e5b6c4a7ea8440a27 100644
--- a/src/components/SimpleMenu/src/components/SubMenuItem.vue
+++ b/src/components/SimpleMenu/src/components/SubMenuItem.vue
@@ -74,7 +74,7 @@
   import { useMenuItem } from './useMenu';
   import { useSimpleRootMenuContext } from './useSimpleMenuContext';
   import { CollapseTransition } from '/@/components/Transition';
-  import Icon from '/@/components/Icon';
+  import { Icon } from '/@/components/Icon';
   import { Popover } from 'ant-design-vue';
   import { isBoolean, isObject } from '/@/utils/is';
   import mitt from '/@/utils/mitt';
diff --git a/src/components/Table/src/components/EditTableHeaderIcon.vue b/src/components/Table/src/components/EditTableHeaderIcon.vue
index 369820e7ac5985abf33f9bb93f715ace321b4426..98240c070477884b063ce559dc376189b4079536 100644
--- a/src/components/Table/src/components/EditTableHeaderIcon.vue
+++ b/src/components/Table/src/components/EditTableHeaderIcon.vue
@@ -8,6 +8,7 @@
 <script lang="ts">
   import { defineComponent } from 'vue';
   import { FormOutlined } from '@ant-design/icons-vue';
+
   export default defineComponent({
     name: 'EditTableHeaderIcon',
     components: { FormOutlined },
diff --git a/src/components/Table/src/components/TableAction.vue b/src/components/Table/src/components/TableAction.vue
index 99425f9da7e6b08b2282cdf738c04098b3332ff9..2fea63eb0b769400e25b7c2c5694f54273e47c05 100644
--- a/src/components/Table/src/components/TableAction.vue
+++ b/src/components/Table/src/components/TableAction.vue
@@ -34,7 +34,7 @@
   import { defineComponent, PropType, computed, toRaw, unref } from 'vue';
   import { MoreOutlined } from '@ant-design/icons-vue';
   import { Divider, Tooltip, TooltipProps } from 'ant-design-vue';
-  import Icon from '/@/components/Icon/index';
+  import { Icon } from '/@/components/Icon';
   import { ActionItem, TableActionType } from '/@/components/Table';
   import { PopConfirmButton } from '/@/components/Button';
   import { Dropdown } from '/@/components/Dropdown';
diff --git a/src/layouts/default/header/components/Breadcrumb.vue b/src/layouts/default/header/components/Breadcrumb.vue
index 6aba97d89f7772390fad08f309cf7bc94974e2ec..ac389ab933529260d16804026f291e5a6c34f4d9 100644
--- a/src/layouts/default/header/components/Breadcrumb.vue
+++ b/src/layouts/default/header/components/Breadcrumb.vue
@@ -21,7 +21,7 @@
   import { defineComponent, ref, watchEffect } from 'vue';
 
   import { Breadcrumb } from 'ant-design-vue';
-  import Icon from '/@/components/Icon';
+  import { Icon } from '/@/components/Icon';
 
   import { useDesign } from '/@/hooks/web/useDesign';
   import { useRootSetting } from '/@/hooks/setting/useRootSetting';
diff --git a/src/layouts/default/header/components/ErrorAction.vue b/src/layouts/default/header/components/ErrorAction.vue
index 243e587000a6215221eb2b068a42910647e77b79..add0d067463f28d44e44210c70259b0798e5b0a4 100644
--- a/src/layouts/default/header/components/ErrorAction.vue
+++ b/src/layouts/default/header/components/ErrorAction.vue
@@ -13,7 +13,7 @@
 <script lang="ts">
   import { defineComponent, computed } from 'vue';
   import { Tooltip, Badge } from 'ant-design-vue';
-  import Icon from '/@/components/Icon';
+  import { Icon } from '/@/components/Icon';
 
   import { useI18n } from '/@/hooks/web/useI18n';
   import { useErrorLogStore } from '/@/store/modules/errorLog';
diff --git a/src/layouts/default/header/components/user-dropdown/DropMenuItem.vue b/src/layouts/default/header/components/user-dropdown/DropMenuItem.vue
index 987af275636fc0181c065fec391b63731b78417d..031455cbfe99900587b710d98c9323fd194688a1 100644
--- a/src/layouts/default/header/components/user-dropdown/DropMenuItem.vue
+++ b/src/layouts/default/header/components/user-dropdown/DropMenuItem.vue
@@ -11,7 +11,7 @@
 
   import { computed, defineComponent, getCurrentInstance } from 'vue';
 
-  import Icon from '/@/components/Icon/index';
+  import { Icon } from '/@/components/Icon';
   import { propTypes } from '/@/utils/propTypes';
 
   export default defineComponent({
diff --git a/src/layouts/default/setting/index.vue b/src/layouts/default/setting/index.vue
index 9c5bb87f4f175348d2aecfd519d99bb36a42a25e..f959366ef972bc65224d2b62e3fd82ec94c941f4 100644
--- a/src/layouts/default/setting/index.vue
+++ b/src/layouts/default/setting/index.vue
@@ -7,7 +7,7 @@
 <script lang="ts">
   import { defineComponent } from 'vue';
   import SettingDrawer from './SettingDrawer';
-  import Icon from '/@/components/Icon';
+  import { Icon } from '/@/components/Icon';
 
   import { useDrawer } from '/@/components/Drawer';
 
diff --git a/src/views/demo/page/account/center/Application.vue b/src/views/demo/page/account/center/Application.vue
index 640fe1b91d0b5c912a94a60c49540b5d913d8e52..567ac4c08167504dd549b4b8592c99b5f7ae79f7 100644
--- a/src/views/demo/page/account/center/Application.vue
+++ b/src/views/demo/page/account/center/Application.vue
@@ -30,7 +30,7 @@
 <script lang="ts">
   import { defineComponent } from 'vue';
   import { List, Card, Row, Col } from 'ant-design-vue';
-  import Icon from '/@/components/Icon/index';
+  import { Icon } from '/@/components/Icon';
   import { applicationList } from './data';
 
   export default defineComponent({
diff --git a/src/views/demo/page/account/center/Article.vue b/src/views/demo/page/account/center/Article.vue
index bb71cc9138e572cc67ca0c2e7aa83519e5b6b46d..7edddc58f5fba40772b9360ca3486ad4d4afd15b 100644
--- a/src/views/demo/page/account/center/Article.vue
+++ b/src/views/demo/page/account/center/Article.vue
@@ -42,7 +42,7 @@
 <script lang="ts">
   import { defineComponent } from 'vue';
   import { List, Tag } from 'ant-design-vue';
-  import Icon from '/@/components/Icon/index';
+  import { Icon } from '/@/components/Icon';
   import { actions, articleList } from './data';
 
   export default defineComponent({
diff --git a/src/views/demo/page/account/center/index.vue b/src/views/demo/page/account/center/index.vue
index 430c5392425f86cde4f358e83363b126991a3946..400a7a21e263c5abdca2293bc61cea55a3aedee9 100644
--- a/src/views/demo/page/account/center/index.vue
+++ b/src/views/demo/page/account/center/index.vue
@@ -56,7 +56,7 @@
   import { Tag, Tabs, Row, Col } from 'ant-design-vue';
   import { defineComponent, computed } from 'vue';
   import { CollapseContainer } from '/@/components/Container/index';
-  import Icon from '/@/components/Icon/index';
+  import { Icon } from '/@/components/Icon';
   import Article from './Article.vue';
   import Application from './Application.vue';
   import Project from './Project.vue';
diff --git a/src/views/demo/page/account/setting/AccountBind.vue b/src/views/demo/page/account/setting/AccountBind.vue
index d3b1a7b4c47dd51b43a3dc8320fc85b8e4b1c0bc..9d595d10c165144bea48846a96f88aa41526875a 100644
--- a/src/views/demo/page/account/setting/AccountBind.vue
+++ b/src/views/demo/page/account/setting/AccountBind.vue
@@ -26,7 +26,7 @@
   import { List } from 'ant-design-vue';
   import { defineComponent } from 'vue';
   import { CollapseContainer } from '/@/components/Container/index';
-  import Icon from '/@/components/Icon/index';
+  import { Icon } from '/@/components/Icon';
 
   import { accountBindList } from './data';
 
diff --git a/src/views/demo/page/list/basic/index.vue b/src/views/demo/page/list/basic/index.vue
index 9a3ed0f47106e334fc8c71e3c8f70bd83ae5fcc9..3a4ce82b66afd6589da9791eabb559d2ffd158d1 100644
--- a/src/views/demo/page/list/basic/index.vue
+++ b/src/views/demo/page/list/basic/index.vue
@@ -53,7 +53,7 @@
 <script lang="ts">
   import { Progress, Row, Col } from 'ant-design-vue';
   import { defineComponent } from 'vue';
-  import Icon from '/@/components/Icon/index';
+  import { Icon } from '/@/components/Icon';
   import { cardList } from './data';
   import { PageWrapper } from '/@/components/Page';
   import { List } from 'ant-design-vue';
diff --git a/src/views/demo/page/list/card/index.vue b/src/views/demo/page/list/card/index.vue
index cb960f2786bced2d1c7f58974a04ba32141dd51a..d218825d5e97775d847eb521d886f435fce14ab2 100644
--- a/src/views/demo/page/list/card/index.vue
+++ b/src/views/demo/page/list/card/index.vue
@@ -34,7 +34,7 @@
 </template>
 <script lang="ts">
   import { defineComponent } from 'vue';
-  import Icon from '/@/components/Icon/index';
+  import { Icon } from '/@/components/Icon';
   import { cardList } from './data';
   import { PageWrapper } from '/@/components/Page';
   import { Card, Row, Col, List } from 'ant-design-vue';
diff --git a/src/views/demo/page/list/search/index.vue b/src/views/demo/page/list/search/index.vue
index 9ada74f31916d75362e79941f4108d324008c47c..2f85d9e0fe4daf5a9522310d3e2a8276ecd189a5 100644
--- a/src/views/demo/page/list/search/index.vue
+++ b/src/views/demo/page/list/search/index.vue
@@ -53,13 +53,12 @@
   </PageWrapper>
 </template>
 <script lang="ts">
-  import { Tag } from 'ant-design-vue';
+  import { Tag, List } from 'ant-design-vue';
   import { defineComponent } from 'vue';
-  import Icon from '/@/components/Icon/index';
+  import { Icon } from '/@/components/Icon';
   import { BasicForm } from '/@/components/Form/index';
   import { actions, searchList, schemas } from './data';
   import { PageWrapper } from '/@/components/Page';
-  import { List } from 'ant-design-vue';
 
   export default defineComponent({
     components: {
diff --git a/src/views/form-design/components/VFormDesign/components/FormNodeOperate.vue b/src/views/form-design/components/VFormDesign/components/FormNodeOperate.vue
index 5a786e7980a9b8b75392a6ffc0d2b1921d8c47b4..22c1f3d919a9d2be6be5424b157beed310985823 100644
--- a/src/views/form-design/components/VFormDesign/components/FormNodeOperate.vue
+++ b/src/views/form-design/components/VFormDesign/components/FormNodeOperate.vue
@@ -17,7 +17,7 @@
   import { IVFormComponent } from '../../../typings/v-form-component';
   import { remove } from '../../../utils';
   import { useFormDesignState } from '../../../hooks/useFormDesignState';
-  import Icon from '/@/components/Icon/index';
+  import { Icon } from '/@/components/Icon';
 
   export default defineComponent({
     name: 'FormNodeOperate',
diff --git a/src/views/form-design/components/VFormDesign/components/FormOptions.vue b/src/views/form-design/components/VFormDesign/components/FormOptions.vue
index a5572278e4d83420457a1fe98685ae46fcba31e2..860784f00090eec056529226cff58dbd6829ffb6 100644
--- a/src/views/form-design/components/VFormDesign/components/FormOptions.vue
+++ b/src/views/form-design/components/VFormDesign/components/FormOptions.vue
@@ -38,7 +38,8 @@
   import { remove } from '../../../utils';
   import message from '../../../utils/message';
   import { Input } from 'ant-design-vue';
-  import Icon from '/@/components/Icon/index';
+  import { Icon } from '/@/components/Icon';
+
   export default defineComponent({
     name: 'FormOptions',
     components: { Input, Icon },
diff --git a/src/views/form-design/components/VFormDesign/components/RuleProps.vue b/src/views/form-design/components/VFormDesign/components/RuleProps.vue
index 47022daab24e9f98882679ea03fea95a02281956..f22361fb82ad2ad5644498a4e9c95c48c3012c86 100644
--- a/src/views/form-design/components/VFormDesign/components/RuleProps.vue
+++ b/src/views/form-design/components/VFormDesign/components/RuleProps.vue
@@ -38,7 +38,7 @@
   import { useFormDesignState } from '../../../hooks/useFormDesignState';
   import { isArray } from 'lodash-es';
   import { Form, FormItem, AutoComplete, Input } from 'ant-design-vue';
-  import Icon from '/@/components/Icon';
+  import { Icon } from '/@/components/Icon';
 
   export default defineComponent({
     name: 'RuleProps',
diff --git a/src/views/form-design/components/VFormDesign/modules/Toolbar.vue b/src/views/form-design/components/VFormDesign/modules/Toolbar.vue
index cfd9192d6e46902c2e96bb22f0c0055b4fb59f18..55be6920e6aaaef4300affbce6e640ab3a8b86ba 100644
--- a/src/views/form-design/components/VFormDesign/modules/Toolbar.vue
+++ b/src/views/form-design/components/VFormDesign/modules/Toolbar.vue
@@ -31,7 +31,7 @@
   import { UseRefHistoryReturn } from '@vueuse/core';
   import { IFormConfig } from '../../../typings/v-form-component';
   import { Tooltip, Divider } from 'ant-design-vue';
-  import Icon from '/@/components/Icon/index';
+  import { Icon } from '/@/components/Icon';
 
   interface IToolbarsConfig {
     type: string;
diff --git a/src/views/form-design/components/VFormItem/index.vue b/src/views/form-design/components/VFormItem/index.vue
index 3f11ac94818ed6d109ff79950b6b404cb32d655e..152a389af38756996c27320c4a012dcd3b98df4f 100644
--- a/src/views/form-design/components/VFormItem/index.vue
+++ b/src/views/form-design/components/VFormItem/index.vue
@@ -47,11 +47,10 @@
   import { handleAsyncOptions } from '../../utils';
   import { omit } from 'lodash-es';
   import { Tooltip, FormItem, Divider, Col } from 'ant-design-vue';
-
   // import FormItem from '/@/components/Form/src/components/FormItem.vue';
-
   import { Icon } from '/@/components/Icon';
   import { useFormModelState } from '../../hooks/useFormDesignState';
+
   export default defineComponent({
     name: 'VFormItem',
     components: {