From 78ca73d50007233cf2a137b226451986c9dcbdf7 Mon Sep 17 00:00:00 2001
From: tyh2001 <1469442737@qq.com>
Date: Tue, 9 Aug 2022 17:54:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=98=BF=F0=9F=98=BF=20=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E4=BF=AE=E5=A4=8D=E6=89=93=E5=8C=85=E5=BC=95=E5=85=A5?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=20=F0=9F=98=BF=F0=9F=98=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.en-US.md                            |  20 +++
 CHANGELOG.md                                  |  14 +-
 docs/docs/docs/changelog.md                   |  20 +++
 .../preview-list.vue                          |  12 +-
 .../_interface/{env.d.ts => vite-env.d.ts}    |   1 -
 packages/fighting-components/alert/index.ts   |   2 +
 .../fighting-components/alert/src/alert.vue   |   2 +-
 packages/fighting-components/aside/index.ts   |   2 +
 packages/fighting-components/avatar/index.ts  |   2 +
 .../fighting-components/avatar/src/avatar.vue |   2 +-
 .../fighting-components/back-top/index.ts     |   2 +
 packages/fighting-components/badge/index.ts   |   2 +
 .../breadcrumb-item/index.ts                  |   2 +
 .../breadcrumb-item/src/breadcrumb-item.vue   |   2 +-
 .../fighting-components/breadcrumb/index.ts   |   2 +
 .../fighting-components/button-group/index.ts |   2 +
 packages/fighting-components/button/index.ts  |   2 +
 .../fighting-components/button/src/button.vue |   2 +-
 packages/fighting-components/card/index.ts    |   2 +
 packages/fighting-components/components.d.ts  |  40 ------
 packages/fighting-components/components.ts    | 104 ++++++++++++++
 packages/fighting-components/dialog/index.ts  |   2 +
 .../fighting-components/dialog/src/dialog.vue |   2 +-
 packages/fighting-components/divider/index.ts |   2 +
 packages/fighting-components/drawer/index.ts  |   2 +
 packages/fighting-components/footer/index.ts  |   2 +
 .../global-components.d.ts                    |  38 +++++
 packages/fighting-components/header/index.ts  |   2 +
 packages/fighting-components/icon/index.ts    |   2 +
 packages/fighting-components/image/index.ts   |   2 +
 .../fighting-components/image/src/image.vue   |   2 +-
 packages/fighting-components/index-old.ts     | 132 ++++++++++++++++++
 packages/fighting-components/index.ts         | 125 +----------------
 packages/fighting-components/layout/index.ts  |   2 +
 packages/fighting-components/link/index.ts    |   2 +
 .../fighting-components/link/src/link.vue     |   2 +-
 .../fighting-components/list-item/index.ts    |   2 +
 packages/fighting-components/list/index.ts    |   2 +
 packages/fighting-components/loading/index.ts |   2 +
 .../loading/src/loading.vue                   |   2 +-
 packages/fighting-components/main/index.ts    |   2 +
 packages/fighting-components/message/index.ts |   4 +-
 .../message/src/message.vue                   |   2 +-
 .../novel-coronavirus/index.ts                |   2 +
 .../fighting-components/page-header/index.ts  |   2 +
 .../page-header/src/page-header.vue           |   2 +-
 .../fighting-components/progress/index.ts     |   2 +
 packages/fighting-components/rate/index.ts    |   2 +
 packages/fighting-components/space/index.ts   |   2 +
 packages/fighting-components/switch/index.ts  |   2 +
 .../fighting-components/switch/src/switch.vue |   2 +-
 packages/fighting-components/tag/index.ts     |   2 +
 packages/fighting-components/tag/src/tag.vue  |   2 +-
 packages/fighting-components/text/index.ts    |   2 +
 .../fighting-components/toolbar-item/index.ts |   2 +
 packages/fighting-components/toolbar/index.ts |   2 +
 packages/fighting-components/tooltip/index.ts |   2 +
 .../fighting-components/watermark/index.ts    |   2 +
 packages/fighting-design/package.json         |  12 +-
 start/main.ts                                 |   2 +-
 start/src/App.vue                             |   5 +-
 start/{env.d.ts => src/vite-env.d.ts}         |   1 -
 vite.config.lib.ts                            |   9 +-
 vite.config.ts                                |   5 +-
 64 files changed, 442 insertions(+), 196 deletions(-)
 rename packages/fighting-components/{image/components => _components}/preview-list.vue (93%)
 rename packages/fighting-components/_interface/{env.d.ts => vite-env.d.ts} (66%)
 delete mode 100644 packages/fighting-components/components.d.ts
 create mode 100644 packages/fighting-components/components.ts
 create mode 100644 packages/fighting-components/global-components.d.ts
 create mode 100644 packages/fighting-components/index-old.ts
 rename start/{env.d.ts => src/vite-env.d.ts} (66%)

diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
index ae8068ec93..84bc015a67 100644
--- a/CHANGELOG.en-US.md
+++ b/CHANGELOG.en-US.md
@@ -4,6 +4,26 @@
 
 English | [Chinese](https://github.com/FightingDesign/fighting-design/blob/master/CHANGELOG.md)
 
+## 0.5.1-bate.4 (2022-08-09)
+
+- Test and fix the problem of path error introduced by packaging
+
+## 0.5.1-bate.3 (2022-08-09)
+
+- Test and fix the problem of path error introduced by packaging
+
+## 0.5.1-bate.2 (2022-08-09)
+
+- Test and fix the problem of path error introduced by packaging
+
+## 0.5.1-bate.1 (2022-08-09)
+
+- Fixed issues related to packaging type
+
+## 0.5.0-bate.2 (2022-08-08)
+
+- Fixed issues related to packaging type
+
 ## 0.5.0-bate.1 (2022-08-08)
 
 It mainly fixes the related configuration items of packaging. In the [previous version](<(https://github.com/FightingDesign/fighting-design/releases/tag/0.4.2-bate.9)>), if you need to import components on demand, there will be many abnormal error messages. This version is mainly optimized for packaging and has fixed the fatal error caused by on-demand import.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 19a0e2256f..e65a192a01 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,13 +2,25 @@
 
 中文 | [英文](https://github.com/FightingDesign/fighting-design/blob/master/CHANGELOG.en-US.md)
 
+## 0.5.1-bate.4 (2022-08-09)
+
+- 测试修复打包引入路径错误的问题
+
+## 0.5.1-bate.3 (2022-08-09)
+
+- 测试修复打包引入路径错误的问题
+
+## 0.5.1-bate.2 (2022-08-09)
+
+- 测试修复打包引入路径错误的问题
+
 ## 0.5.1-bate.1 (2022-08-09)
 
 - 修复了打包类型相关的问题
 
 ## 0.5.0-bate.2 (2022-08-08)
 
-测试修复打包的错误信息
+- 修复了打包类型相关的问题
 
 ## 0.5.0-bate.1 (2022-08-08)
 
diff --git a/docs/docs/docs/changelog.md b/docs/docs/docs/changelog.md
index cdc687de73..e65a192a01 100644
--- a/docs/docs/docs/changelog.md
+++ b/docs/docs/docs/changelog.md
@@ -2,6 +2,26 @@
 
 中文 | [英文](https://github.com/FightingDesign/fighting-design/blob/master/CHANGELOG.en-US.md)
 
+## 0.5.1-bate.4 (2022-08-09)
+
+- 测试修复打包引入路径错误的问题
+
+## 0.5.1-bate.3 (2022-08-09)
+
+- 测试修复打包引入路径错误的问题
+
+## 0.5.1-bate.2 (2022-08-09)
+
+- 测试修复打包引入路径错误的问题
+
+## 0.5.1-bate.1 (2022-08-09)
+
+- 修复了打包类型相关的问题
+
+## 0.5.0-bate.2 (2022-08-08)
+
+- 修复了打包类型相关的问题
+
 ## 0.5.0-bate.1 (2022-08-08)
 
 主要修复了打包的相关的配置项，在[上一个版本](https://github.com/FightingDesign/fighting-design/releases/tag/0.4.2-bate.9)中，如果需要按需引入组件，那么会有很多异常的错误信息，这个版本主要是针对打包做了很大的优化，已经修复了按需引入导致的致命错误。
diff --git a/packages/fighting-components/image/components/preview-list.vue b/packages/fighting-components/_components/preview-list.vue
similarity index 93%
rename from packages/fighting-components/image/components/preview-list.vue
rename to packages/fighting-components/_components/preview-list.vue
index b5b9f35b65..9767ebc206 100644
--- a/packages/fighting-components/image/components/preview-list.vue
+++ b/packages/fighting-components/_components/preview-list.vue
@@ -1,17 +1,17 @@
 <script lang="ts" setup name="FPreviewList">
   import { ref, inject, toRefs } from 'vue'
-  import { FIcon } from '@fighting-design/fighting-components'
-  import { keepDecimal } from '../../_utils'
-  import { ImagePropsKey } from '../src/image'
+  import FIcon from '../icon'
+  import { keepDecimal } from '../_utils'
+  import { ImagePropsKey } from '../image/src/image'
   import type { Ref } from 'vue'
   import type {
     switchImageInterface as a,
     optionClickInterface as b,
     onImgMousewheelInterface as c,
     handleCloseInterface as d
-  } from '../src/interface'
-  import type { ordinaryFunctionInterface as e } from '../../button/src/interface'
-  import type { ImagePropsType as f } from '../src/image'
+  } from '../image/src/interface'
+  import type { ordinaryFunctionInterface as e } from '../button/src/interface'
+  import type { ImagePropsType as f } from '../image/src/image'
 
   const injectImageProps: f = inject(ImagePropsKey)!
   const emit = defineEmits({
diff --git a/packages/fighting-components/_interface/env.d.ts b/packages/fighting-components/_interface/vite-env.d.ts
similarity index 66%
rename from packages/fighting-components/_interface/env.d.ts
rename to packages/fighting-components/_interface/vite-env.d.ts
index aafef9509d..323c78a6cd 100644
--- a/packages/fighting-components/_interface/env.d.ts
+++ b/packages/fighting-components/_interface/vite-env.d.ts
@@ -2,7 +2,6 @@
 
 declare module '*.vue' {
   import type { DefineComponent } from 'vue'
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types
   const component: DefineComponent<{}, {}, any>
   export default component
 }
diff --git a/packages/fighting-components/alert/index.ts b/packages/fighting-components/alert/index.ts
index 7ac8d85458..c0bc854552 100644
--- a/packages/fighting-components/alert/index.ts
+++ b/packages/fighting-components/alert/index.ts
@@ -4,4 +4,6 @@ import { install } from '../_utils'
 
 install(FAlert, FAlert.name)
 
+export type FAlertInstance = InstanceType<typeof FAlert>
+
 export default FAlert
diff --git a/packages/fighting-components/alert/src/alert.vue b/packages/fighting-components/alert/src/alert.vue
index 5bb63b741f..18d8048da9 100644
--- a/packages/fighting-components/alert/src/alert.vue
+++ b/packages/fighting-components/alert/src/alert.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="FAlert">
   import { Props, Emits } from './alert'
   import { computed, ref } from 'vue'
-  import { FIcon } from '@fighting-design/fighting-components'
+  import FIcon from '../../icon'
   import type { ComputedRef, CSSProperties, Ref } from 'vue'
   import type { handleCloseInterface as a } from './interface'
 
diff --git a/packages/fighting-components/aside/index.ts b/packages/fighting-components/aside/index.ts
index ec6b0faab8..ed3ef9e05e 100644
--- a/packages/fighting-components/aside/index.ts
+++ b/packages/fighting-components/aside/index.ts
@@ -4,4 +4,6 @@ import { install } from '../_utils'
 
 install(FAside, FAside.name)
 
+export type FAsideInstance = InstanceType<typeof FAside>
+
 export default FAside
diff --git a/packages/fighting-components/avatar/index.ts b/packages/fighting-components/avatar/index.ts
index b2441d0b0d..aaa6b04f5c 100644
--- a/packages/fighting-components/avatar/index.ts
+++ b/packages/fighting-components/avatar/index.ts
@@ -4,4 +4,6 @@ import { install } from '../_utils'
 
 install(FAvatar, FAvatar.name)
 
+export type FAvatarInstance = InstanceType<typeof FAvatar>
+
 export default FAvatar
diff --git a/packages/fighting-components/avatar/src/avatar.vue b/packages/fighting-components/avatar/src/avatar.vue
index 289c5a75c2..30e8471dae 100644
--- a/packages/fighting-components/avatar/src/avatar.vue
+++ b/packages/fighting-components/avatar/src/avatar.vue
@@ -2,7 +2,7 @@
   import { Props, Emits } from './avatar'
   import { computed, ref, onMounted } from 'vue'
   import { loadImage, isNumber, isString } from '../../_utils'
-  import { FIcon } from '@fighting-design/fighting-components'
+  import FIcon from '../../icon'
   import type { ComputedRef, Ref, CSSProperties } from 'vue'
 
   const prop = defineProps(Props)
diff --git a/packages/fighting-components/back-top/index.ts b/packages/fighting-components/back-top/index.ts
index f6a3169888..1695c13b4e 100644
--- a/packages/fighting-components/back-top/index.ts
+++ b/packages/fighting-components/back-top/index.ts
@@ -4,4 +4,6 @@ import { install } from '../_utils'
 
 install(FBackTop, FBackTop.name)
 
+export type FBackTopInstance = InstanceType<typeof FBackTop>
+
 export default FBackTop
diff --git a/packages/fighting-components/badge/index.ts b/packages/fighting-components/badge/index.ts
index 61f824e986..bc3b3d6087 100644
--- a/packages/fighting-components/badge/index.ts
+++ b/packages/fighting-components/badge/index.ts
@@ -4,4 +4,6 @@ import { install } from '../_utils'
 
 install(FBadge, FBadge.name)
 
+export type FBadgeInstance = InstanceType<typeof FBadge>
+
 export default FBadge
diff --git a/packages/fighting-components/breadcrumb-item/index.ts b/packages/fighting-components/breadcrumb-item/index.ts
index c724ef530f..291ee743aa 100644
--- a/packages/fighting-components/breadcrumb-item/index.ts
+++ b/packages/fighting-components/breadcrumb-item/index.ts
@@ -4,4 +4,6 @@ import { install } from '../_utils'
 
 install(FBreadcrumbItem, FBreadcrumbItem.name)
 
+export type FBreadcrumbItemInstance = InstanceType<typeof FBreadcrumbItem>
+
 export default FBreadcrumbItem
diff --git a/packages/fighting-components/breadcrumb-item/src/breadcrumb-item.vue b/packages/fighting-components/breadcrumb-item/src/breadcrumb-item.vue
index 3fd03f733d..93816de01d 100644
--- a/packages/fighting-components/breadcrumb-item/src/breadcrumb-item.vue
+++ b/packages/fighting-components/breadcrumb-item/src/breadcrumb-item.vue
@@ -2,7 +2,7 @@
   import { getCurrentInstance, inject, ref, toRefs } from 'vue'
   import { BreadcrumbPropsKey } from '../../breadcrumb/src/breadcrumb'
   import { Props } from './breadcrumb-item'
-  import { FIcon } from '@fighting-design/fighting-components'
+  import FIcon from '../../icon'
   import type { ComponentInternalInstance, Ref } from 'vue'
   import type { handleClickInterface as a } from './interface'
 
diff --git a/packages/fighting-components/breadcrumb/index.ts b/packages/fighting-components/breadcrumb/index.ts
index 80dabe6642..7754a731a9 100644
--- a/packages/fighting-components/breadcrumb/index.ts
+++ b/packages/fighting-components/breadcrumb/index.ts
@@ -4,4 +4,6 @@ import { install } from '../_utils'
 
 install(FBreadcrumb, FBreadcrumb.name)
 
+export type FBreadcrumbInstance = InstanceType<typeof FBreadcrumb>
+
 export default FBreadcrumb
diff --git a/packages/fighting-components/button-group/index.ts b/packages/fighting-components/button-group/index.ts
index 39d00e718b..162f6e7add 100644
--- a/packages/fighting-components/button-group/index.ts
+++ b/packages/fighting-components/button-group/index.ts
@@ -4,4 +4,6 @@ import { install } from '../_utils'
 
 install(FButtonGroup, FButtonGroup.name)
 
+export type FButtonGroupInstance = InstanceType<typeof FButtonGroup>
+
 export default FButtonGroup
diff --git a/packages/fighting-components/button/index.ts b/packages/fighting-components/button/index.ts
index 5b5f09ee11..ec26fc6e64 100644
--- a/packages/fighting-components/button/index.ts
+++ b/packages/fighting-components/button/index.ts
@@ -4,4 +4,6 @@ import { install } from '../_utils'
 
 install(FButton, FButton.name)
 
+export type FButtonInstance = InstanceType<typeof FButton>
+
 export default FButton
diff --git a/packages/fighting-components/button/src/button.vue b/packages/fighting-components/button/src/button.vue
index 09964858af..ea6175af26 100644
--- a/packages/fighting-components/button/src/button.vue
+++ b/packages/fighting-components/button/src/button.vue
@@ -2,7 +2,7 @@
   import { computed, ref, onMounted } from 'vue'
   import { Props, Emits } from './button'
   import { Ripples, ChangeColor } from '../../_utils'
-  import { FIcon } from '@fighting-design/fighting-components'
+  import FIcon from '../../icon'
   import type { ComputedRef, Ref, CSSProperties } from 'vue'
   import type {
     onClickInterface as a,
diff --git a/packages/fighting-components/card/index.ts b/packages/fighting-components/card/index.ts
index 6c25b6fbe5..7fe14ed642 100644
--- a/packages/fighting-components/card/index.ts
+++ b/packages/fighting-components/card/index.ts
@@ -4,4 +4,6 @@ import { install } from '../_utils'
 
 install(FCard, FCard.name)
 
+export type FCardInstance = InstanceType<typeof FCard>
+
 export default FCard
diff --git a/packages/fighting-components/components.d.ts b/packages/fighting-components/components.d.ts
deleted file mode 100644
index 86f3be872a..0000000000
--- a/packages/fighting-components/components.d.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-declare module 'vue' {
-  export interface GlobalComponents {
-    FButton: typeof import('./button/src/button.vue')['default']
-    FButtonGroup: typeof import('./button-group/src/button-group.vue')['default']
-    FIcon: typeof import('./icon/src/icon.vue')['default']
-    FLink: typeof import('./link/src/link.vue')['default']
-    FImage: typeof import('./image/src/image.vue')['default']
-    FCard: typeof import('./card/src/card.vue')['default']
-    FTag: typeof import('./tag/src/tag.vue')['default']
-    FDivider: typeof import('./divider/src/divider.vue')['default']
-    FFooter: typeof import('./footer/src/footer.vue')['default']
-    FHeader: typeof import('./header/src/header.vue')['default']
-    FAside: typeof import('./aside/src/aside.vue')['default']
-    FMain: typeof import('./main/src/main.vue')['default']
-    FLayout: typeof import('./layout/src/layout.vue')['default']
-    FSwitch: typeof import('./switch/src/switch.vue')['default']
-    FBadge: typeof import('./badge/src/badge.vue')['default']
-    FAvatar: typeof import('./avatar/src/avatar.vue')['default']
-    FBackTop: typeof import('./back-top/src/back-top.vue')['default']
-    FBreadcrumbItem: typeof import('./breadcrumb-item/src/breadcrumb-item.vue')['default']
-    FBreadcrumb: typeof import('./breadcrumb/src/breadcrumb.vue')['default']
-    FText: typeof import('./text/src/text.vue')['default']
-    FLoading: typeof import('./loading/src/loading.vue')['default']
-    FProgress: typeof import('./progress/src/progress.vue')['default']
-    FSpace: typeof import('./space/src/space.vue')['default']
-    FDialog: typeof import('./dialog/src/dialog.vue')['default']
-    FTooltip: typeof import('./tooltip/src/tooltip.vue')['default']
-    FDrawer: typeof import('./drawer/src/drawer.vue')['default']
-    FPageHeader: typeof import('./page-header/src/page-header.vue')['default']
-    FAlert: typeof import('./alert/src/alert.vue')['default']
-    FNovelCoronavirus: typeof import('./novel-coronavirus/src/novel-coronavirus.vue')['default']
-    FList: typeof import('./list/src/list.vue')['default']
-    FListItem: typeof import('./list-item/src/list-item.vue')['default']
-    FToolbar: typeof import('./toolbar/src/toolbar.vue')['default']
-    FToolbarItem: typeof import('./toolbar-item/src/toolbar-item.vue')['default']
-    FWatermark: typeof import('./watermark/src/watermark.vue')['default']
-  }
-}
-
-export {}
diff --git a/packages/fighting-components/components.ts b/packages/fighting-components/components.ts
new file mode 100644
index 0000000000..36a7791614
--- /dev/null
+++ b/packages/fighting-components/components.ts
@@ -0,0 +1,104 @@
+export { default as FButton } from './button'
+export type { FButtonInstance } from './button'
+
+export { default as FIcon } from './icon'
+export type { FIconInstance } from './icon'
+
+export { default as FButtonGroup } from './button-group'
+export type { FButtonGroupInstance } from './button-group'
+
+export { default as FLink } from './link'
+export type { FLinkInstance } from './link'
+
+export { default as FImage } from './image'
+export type { FImageInstance } from './image'
+
+export { default as FCard } from './card'
+export type { FCardInstance } from './card'
+
+export { default as FTag } from './tag'
+export type { FTagInstance } from './tag'
+
+export { default as FDivider } from './divider'
+export type { FDividerInstance } from './divider'
+
+export { default as FFooter } from './footer'
+export type { FFooterInstance } from './footer'
+
+export { default as FHeader } from './header'
+export type { FHeaderInstance } from './header'
+
+export { default as FAside } from './aside'
+export type { FAsideInstance } from './aside'
+
+export { default as FMain } from './main'
+export type { FMainInstance } from './main'
+
+export { default as FLayout } from './layout'
+export type { FLayoutInstance } from './layout'
+
+export { default as FSwitch } from './switch'
+export type { FSwitchInstance } from './switch'
+
+export { default as FBadge } from './badge'
+export type { FBadgeInstance } from './badge'
+
+export { default as FAvatar } from './avatar'
+export type { FAvatarInstance } from './avatar'
+
+export { default as FBackTop } from './back-top'
+export type { FBackTopInstance } from './back-top'
+
+export { default as FBreadcrumb } from './breadcrumb'
+export type { FBreadcrumbInstance } from './breadcrumb'
+
+export { default as FBreadcrumbItem } from './breadcrumb-item'
+export type { FBreadcrumbItemInstance } from './breadcrumb-item'
+
+export { default as FText } from './text'
+export type { FTextInstance } from './text'
+
+export { default as FLoading } from './loading'
+export type { FLoadingInstance } from './loading'
+
+export { default as FProgress } from './progress'
+export type { FProgressInstance } from './progress'
+
+export { default as FSpace } from './space'
+export type { FSpaceInstance } from './space'
+
+export { default as FDialog } from './dialog'
+export type { FDialogInstance } from './dialog'
+
+export { default as FTooltip } from './tooltip'
+export type { FTooltipInstance } from './tooltip'
+
+export { default as FDrawer } from './drawer'
+export type { FDrawerInstance } from './drawer'
+
+export { default as FPageHeader } from './page-header'
+export type { FPageHeaderInstance } from './page-header'
+
+export { default as FAlert } from './alert'
+export type { FAlertInstance } from './alert'
+
+export { default as FNovelCoronavirus } from './novel-coronavirus'
+export type { FNovelCoronavirusInstance } from './novel-coronavirus'
+
+export { default as FList } from './list'
+export type { FListInstance } from './list'
+
+export { default as FListItem } from './list-item'
+export type { FListItemInstance } from './list-item'
+
+export { default as FToolbar } from './toolbar'
+export type { FToolbarInstance } from './toolbar'
+
+export { default as FToolbarItem } from './toolbar-item'
+export type { FToolbarItemInstance } from './toolbar-item'
+
+export { default as FMessage } from './message'
+export type { FMessageInstance } from './message'
+
+export { default as FWatermark } from './watermark'
+export type { FWatermarkInstance } from './watermark'
diff --git a/packages/fighting-components/dialog/index.ts b/packages/fighting-components/dialog/index.ts
index e6edf26302..3ae2a75bb2 100644
--- a/packages/fighting-components/dialog/index.ts
+++ b/packages/fighting-components/dialog/index.ts
@@ -4,4 +4,6 @@ import { install } from '../_utils'
 
 install(FDialog, FDialog.name)
 
+export type FDialogInstance = InstanceType<typeof FDialog>
+
 export default FDialog
diff --git a/packages/fighting-components/dialog/src/dialog.vue b/packages/fighting-components/dialog/src/dialog.vue
index 25365a4121..26ff20f96e 100644
--- a/packages/fighting-components/dialog/src/dialog.vue
+++ b/packages/fighting-components/dialog/src/dialog.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup name="FDialog">
   import { Props, Emits } from './dialog'
-  import { FIcon } from '@fighting-design/fighting-components'
+  import FIcon from '../../icon'
   import type {
     transitionEventInterface as a,
     closeDialogInterface as b
diff --git a/packages/fighting-components/divider/index.ts b/packages/fighting-components/divider/index.ts
index da0b4570c1..69d565831f 100644
--- a/packages/fighting-components/divider/index.ts
+++ b/packages/fighting-components/divider/index.ts
@@ -4,4 +4,6 @@ import { install } from '../_utils'
 
 install(FDivider, FDivider.name)
 
+export type FDividerInstance = InstanceType<typeof FDivider>
+
 export default FDivider
diff --git a/packages/fighting-components/drawer/index.ts b/packages/fighting-components/drawer/index.ts
index a1981db226..a35eb64200 100644
--- a/packages/fighting-components/drawer/index.ts
+++ b/packages/fighting-components/drawer/index.ts
@@ -4,4 +4,6 @@ import { install } from '../_utils'
 
 install(FDrawer, FDrawer.name)
 
+export type FDrawerInstance = InstanceType<typeof FDrawer>
+
 export default FDrawer
diff --git a/packages/fighting-components/footer/index.ts b/packages/fighting-components/footer/index.ts
index 615a7e4f8f..e3c7f621fb 100644
--- a/packages/fighting-components/footer/index.ts
+++ b/packages/fighting-components/footer/index.ts
@@ -4,4 +4,6 @@ import { install } from '../_utils'
 
 install(FFooter, FFooter.name)
 
+export type FFooterInstance = InstanceType<typeof FFooter>
+
 export default FFooter
diff --git a/packages/fighting-components/global-components.d.ts b/packages/fighting-components/global-components.d.ts
new file mode 100644
index 0000000000..8593495aad
--- /dev/null
+++ b/packages/fighting-components/global-components.d.ts
@@ -0,0 +1,38 @@
+declare module 'vue' {
+  export interface GlobalComponents {
+    FButton: typeof import('./button/src/button.vue')
+    FButtonGroup: typeof import('./button-group/src/button-group.vue')
+    FIcon: typeof import('./icon/src/icon.vue')
+    FLink: typeof import('./link/src/link.vue')
+    FImage: typeof import('./image/src/image.vue')
+    FCard: typeof import('./card/src/card.vue')
+    FTag: typeof import('./tag/src/tag.vue')
+    FDivider: typeof import('./divider/src/divider.vue')
+    FFooter: typeof import('./footer/src/footer.vue')
+    FHeader: typeof import('./header/src/header.vue')
+    FAside: typeof import('./aside/src/aside.vue')
+    FMain: typeof import('./main/src/main.vue')
+    FLayout: typeof import('./layout/src/layout.vue')
+    FSwitch: typeof import('./switch/src/switch.vue')
+    FBadge: typeof import('./badge/src/badge.vue')
+    FAvatar: typeof import('./avatar/src/avatar.vue')
+    FBackTop: typeof import('./back-top/src/back-top.vue')
+    FBreadcrumbItem: typeof import('./breadcrumb-item/src/breadcrumb-item.vue')
+    FBreadcrumb: typeof import('./breadcrumb/src/breadcrumb.vue')
+    FText: typeof import('./text/src/text.vue')
+    FLoading: typeof import('./loading/src/loading.vue')
+    FProgress: typeof import('./progress/src/progress.vue')
+    FSpace: typeof import('./space/src/space.vue')
+    FDialog: typeof import('./dialog/src/dialog.vue')
+    FTooltip: typeof import('./tooltip/src/tooltip.vue')
+    FDrawer: typeof import('./drawer/src/drawer.vue')
+    FPageHeader: typeof import('./page-header/src/page-header.vue')
+    FAlert: typeof import('./alert/src/alert.vue')
+    FList: typeof import('./list/src/list.vue')
+    FToolbar: typeof import('./toolbar/src/toolbar.vue')
+    FToolbarItem: typeof import('./toolbar-item/src/toolbar-item.vue')
+    FWatermark: typeof import('./watermark/src/watermark.vue')
+  }
+}
+
+export {}
diff --git a/packages/fighting-components/header/index.ts b/packages/fighting-components/header/index.ts
index fb468f3a0c..6898de4910 100644
--- a/packages/fighting-components/header/index.ts
+++ b/packages/fighting-components/header/index.ts
@@ -4,4 +4,6 @@ import { install } from '../_utils'
 
 install(FHeader, FHeader.name)
 
+export type FHeaderInstance = InstanceType<typeof FHeader>
+
 export default FHeader
diff --git a/packages/fighting-components/icon/index.ts b/packages/fighting-components/icon/index.ts
index c38a05166b..83c4978a24 100644
--- a/packages/fighting-components/icon/index.ts
+++ b/packages/fighting-components/icon/index.ts
@@ -4,4 +4,6 @@ import { install } from '../_utils'
 
 install(FIcon, FIcon.name)
 
+export type FIconInstance = InstanceType<typeof FIcon>
+
 export default FIcon
diff --git a/packages/fighting-components/image/index.ts b/packages/fighting-components/image/index.ts
index 094072f173..e5a5910f55 100644
--- a/packages/fighting-components/image/index.ts
+++ b/packages/fighting-components/image/index.ts
@@ -4,4 +4,6 @@ import { install } from '../_utils'
 
 install(FImage, FImage.name)
 
+export type FImageInstance = InstanceType<typeof FImage>
+
 export default FImage
diff --git a/packages/fighting-components/image/src/image.vue b/packages/fighting-components/image/src/image.vue
index 80efe20aa3..48130b1e60 100644
--- a/packages/fighting-components/image/src/image.vue
+++ b/packages/fighting-components/image/src/image.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup name="FImage">
-  import FPreviewList from '../components/preview-list.vue'
+  import FPreviewList from '../../_components/preview-list.vue'
   import { Props, Emits, ImagePropsKey } from './image'
   import { onMounted, ref, provide } from 'vue'
   import { loadImage } from '../../_utils'
diff --git a/packages/fighting-components/index-old.ts b/packages/fighting-components/index-old.ts
new file mode 100644
index 0000000000..8d0483dc37
--- /dev/null
+++ b/packages/fighting-components/index-old.ts
@@ -0,0 +1,132 @@
+import type { FMessageInstance } from './message'
+import type { App } from 'vue'
+import FButton from './button'
+import FIcon from './icon'
+import FButtonGroup from './button-group'
+import FLink from './link'
+import FImage from './image'
+import FCard from './card'
+import FTag from './tag'
+import FDivider from './divider'
+import FFooter from './footer'
+import FHeader from './header'
+import FAside from './aside'
+import FMain from './main'
+import FLayout from './layout'
+import FSwitch from './switch'
+import FBadge from './badge'
+import FAvatar from './avatar'
+import FBackTop from './back-top'
+import FBreadcrumb from './breadcrumb'
+import FBreadcrumbItem from './breadcrumb-item'
+import FText from './text'
+import FLoading from './loading'
+import FProgress from './progress'
+import FSpace from './space'
+import FDialog from './dialog'
+import FTooltip from './tooltip'
+import FDrawer from './drawer'
+import FPageHeader from './page-header'
+import FAlert from './alert'
+import FNovelCoronavirus from './novel-coronavirus'
+import FList from './list'
+import FListItem from './list-item'
+import FToolbar from './toolbar'
+import FToolbarItem from './toolbar-item'
+import FMessage from './message'
+import FWatermark from './watermark'
+
+const components = {
+  FButton,
+  FButtonGroup,
+  FIcon,
+  FLink,
+  FImage,
+  FCard,
+  FTag,
+  FDivider,
+  FFooter,
+  FHeader,
+  FAside,
+  FMain,
+  FLayout,
+  FSwitch,
+  FBadge,
+  FAvatar,
+  FBackTop,
+  FBreadcrumbItem,
+  FBreadcrumb,
+  FText,
+  FLoading,
+  FProgress,
+  FSpace,
+  FDialog,
+  FTooltip,
+  FDrawer,
+  FPageHeader,
+  FAlert,
+  FNovelCoronavirus,
+  FList,
+  FListItem,
+  FToolbar,
+  FToolbarItem,
+  FWatermark
+}
+
+const plugins = {
+  FMessage
+}
+
+const install = (app: App): void => {
+  Object.entries(components).forEach(([key, value]) => {
+    app.component(key, value)
+  })
+  Object.entries(plugins).forEach(([key, value]) => {
+    app.config.globalProperties[key] = value
+  })
+}
+
+export {
+  FButton,
+  FButtonGroup,
+  FIcon,
+  FLink,
+  FImage,
+  FCard,
+  FTag,
+  FDivider,
+  FFooter,
+  FHeader,
+  FAside,
+  FMain,
+  FLayout,
+  FSwitch,
+  FBadge,
+  FAvatar,
+  FBackTop,
+  FBreadcrumbItem,
+  FBreadcrumb,
+  FText,
+  FLoading,
+  FProgress,
+  FSpace,
+  FDialog,
+  FTooltip,
+  FDrawer,
+  FPageHeader,
+  FAlert,
+  FNovelCoronavirus,
+  FList,
+  FListItem,
+  FMessage,
+  FToolbar,
+  FToolbarItem,
+  FWatermark
+}
+
+export type { FMessageInstance }
+
+export default {
+  install,
+  ...components
+}
diff --git a/packages/fighting-components/index.ts b/packages/fighting-components/index.ts
index 8d0483dc37..e8c49b5976 100644
--- a/packages/fighting-components/index.ts
+++ b/packages/fighting-components/index.ts
@@ -1,132 +1,21 @@
-import type { FMessageInstance } from './message'
 import type { App } from 'vue'
-import FButton from './button'
-import FIcon from './icon'
-import FButtonGroup from './button-group'
-import FLink from './link'
-import FImage from './image'
-import FCard from './card'
-import FTag from './tag'
-import FDivider from './divider'
-import FFooter from './footer'
-import FHeader from './header'
-import FAside from './aside'
-import FMain from './main'
-import FLayout from './layout'
-import FSwitch from './switch'
-import FBadge from './badge'
-import FAvatar from './avatar'
-import FBackTop from './back-top'
-import FBreadcrumb from './breadcrumb'
-import FBreadcrumbItem from './breadcrumb-item'
-import FText from './text'
-import FLoading from './loading'
-import FProgress from './progress'
-import FSpace from './space'
-import FDialog from './dialog'
-import FTooltip from './tooltip'
-import FDrawer from './drawer'
-import FPageHeader from './page-header'
-import FAlert from './alert'
-import FNovelCoronavirus from './novel-coronavirus'
-import FList from './list'
-import FListItem from './list-item'
-import FToolbar from './toolbar'
-import FToolbarItem from './toolbar-item'
-import FMessage from './message'
-import FWatermark from './watermark'
-
-const components = {
-  FButton,
-  FButtonGroup,
-  FIcon,
-  FLink,
-  FImage,
-  FCard,
-  FTag,
-  FDivider,
-  FFooter,
-  FHeader,
-  FAside,
-  FMain,
-  FLayout,
-  FSwitch,
-  FBadge,
-  FAvatar,
-  FBackTop,
-  FBreadcrumbItem,
-  FBreadcrumb,
-  FText,
-  FLoading,
-  FProgress,
-  FSpace,
-  FDialog,
-  FTooltip,
-  FDrawer,
-  FPageHeader,
-  FAlert,
-  FNovelCoronavirus,
-  FList,
-  FListItem,
-  FToolbar,
-  FToolbarItem,
-  FWatermark
-}
+import * as components from './components'
+export * from './components'
 
 const plugins = {
-  FMessage
+  FMessage: components.FMessage
 }
 
 const install = (app: App): void => {
-  Object.entries(components).forEach(([key, value]) => {
+  Object.entries(components).forEach(([key, value]): void => {
     app.component(key, value)
   })
-  Object.entries(plugins).forEach(([key, value]) => {
+
+  Object.entries(plugins).forEach(([key, value]): void => {
     app.config.globalProperties[key] = value
   })
 }
 
-export {
-  FButton,
-  FButtonGroup,
-  FIcon,
-  FLink,
-  FImage,
-  FCard,
-  FTag,
-  FDivider,
-  FFooter,
-  FHeader,
-  FAside,
-  FMain,
-  FLayout,
-  FSwitch,
-  FBadge,
-  FAvatar,
-  FBackTop,
-  FBreadcrumbItem,
-  FBreadcrumb,
-  FText,
-  FLoading,
-  FProgress,
-  FSpace,
-  FDialog,
-  FTooltip,
-  FDrawer,
-  FPageHeader,
-  FAlert,
-  FNovelCoronavirus,
-  FList,
-  FListItem,
-  FMessage,
-  FToolbar,
-  FToolbarItem,
-  FWatermark
-}
-
-export type { FMessageInstance }
-
 export default {
-  install,
-  ...components
+  install
 }
diff --git a/packages/fighting-components/layout/index.ts b/packages/fighting-components/layout/index.ts
index b1b07081eb..073a3d61df 100644
--- a/packages/fighting-components/layout/index.ts
+++ b/packages/fighting-components/layout/index.ts
@@ -4,4 +4,6 @@ import { install } from '../_utils'
 
 install(FLayout, FLayout.name)
 
+export type FLayoutInstance = InstanceType<typeof FLayout>
+
 export default FLayout
diff --git a/packages/fighting-components/link/index.ts b/packages/fighting-components/link/index.ts
index fabcff2c7e..ab84f4a9d9 100644
--- a/packages/fighting-components/link/index.ts
+++ b/packages/fighting-components/link/index.ts
@@ -4,4 +4,6 @@ import { install } from '../_utils'
 
 install(FLink, FLink.name)
 
+export type FLinkInstance = InstanceType<typeof FLink>
+
 export default FLink
diff --git a/packages/fighting-components/link/src/link.vue b/packages/fighting-components/link/src/link.vue
index 3d0486394a..944934f1b4 100644
--- a/packages/fighting-components/link/src/link.vue
+++ b/packages/fighting-components/link/src/link.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup name="FLink">
   import { Props, Emits } from './link'
-  import { FIcon } from '@fighting-design/fighting-components'
+  import FIcon from '../../icon'
   import type { handleClickInterface as a } from './interface'
 
   const prop = defineProps(Props)
diff --git a/packages/fighting-components/list-item/index.ts b/packages/fighting-components/list-item/index.ts
index 814cb864a5..e9dc3c576c 100644
--- a/packages/fighting-components/list-item/index.ts
+++ b/packages/fighting-components/list-item/index.ts
@@ -4,4 +4,6 @@ import { install } from '../_utils'
 
 install(FListItem, FListItem.name)
 
+export type FListItemInstance = InstanceType<typeof FListItem>
+
 export default FListItem
diff --git a/packages/fighting-components/list/index.ts b/packages/fighting-components/list/index.ts
index d3261b219d..45fd35b08c 100644
--- a/packages/fighting-components/list/index.ts
+++ b/packages/fighting-components/list/index.ts
@@ -4,4 +4,6 @@ import { install } from '../_utils'
 
 install(FList, FList.name)
 
+export type FListInstance = InstanceType<typeof FList>
+
 export default FList
diff --git a/packages/fighting-components/loading/index.ts b/packages/fighting-components/loading/index.ts
index 5ee65ed9a6..36ac50c17d 100644
--- a/packages/fighting-components/loading/index.ts
+++ b/packages/fighting-components/loading/index.ts
@@ -4,4 +4,6 @@ import { install } from '../_utils'
 
 install(FLoading, FLoading.name)
 
+export type FLoadingInstance = InstanceType<typeof FLoading>
+
 export default FLoading
diff --git a/packages/fighting-components/loading/src/loading.vue b/packages/fighting-components/loading/src/loading.vue
index b50452f9f8..10ffe3ebd1 100644
--- a/packages/fighting-components/loading/src/loading.vue
+++ b/packages/fighting-components/loading/src/loading.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts" name="FLoading">
   import { computed } from 'vue'
   import { Props, Emits } from './loading'
-  import { FIcon } from '@fighting-design/fighting-components'
+  import FIcon from '../../icon'
   import type { handleClickInterface as a } from './interface'
   import type { ComputedRef, CSSProperties } from 'vue'
 
diff --git a/packages/fighting-components/main/index.ts b/packages/fighting-components/main/index.ts
index e1750952da..d1f8466330 100644
--- a/packages/fighting-components/main/index.ts
+++ b/packages/fighting-components/main/index.ts
@@ -4,4 +4,6 @@ import { install } from '../_utils'
 
 install(FMain, FMain.name)
 
+export type FMainInstance = InstanceType<typeof FMain>
+
 export default FMain
diff --git a/packages/fighting-components/message/index.ts b/packages/fighting-components/message/index.ts
index 4d6a5deb41..d675f43e9c 100644
--- a/packages/fighting-components/message/index.ts
+++ b/packages/fighting-components/message/index.ts
@@ -4,6 +4,6 @@ import { installFn } from '../_utils'
 
 installFn(FMessage, 'FMessage')
 
-export default FMessage
-
 export type { FMessageInstance } from './src/interface'
+
+export default FMessage
diff --git a/packages/fighting-components/message/src/message.vue b/packages/fighting-components/message/src/message.vue
index ad4652c30d..75109da6bf 100644
--- a/packages/fighting-components/message/src/message.vue
+++ b/packages/fighting-components/message/src/message.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup name="FMessage">
   import { computed, onMounted, ref, isVNode, nextTick } from 'vue'
-  import { FIcon } from '@fighting-design/fighting-components'
+  import FIcon from '../../icon'
   import { isString } from '../../_utils'
   import { Props, Emits } from './message'
   import { getSiblingOffset, removeInstance } from './instances'
diff --git a/packages/fighting-components/novel-coronavirus/index.ts b/packages/fighting-components/novel-coronavirus/index.ts
index 241ca75c6d..cc15887420 100644
--- a/packages/fighting-components/novel-coronavirus/index.ts
+++ b/packages/fighting-components/novel-coronavirus/index.ts
@@ -4,4 +4,6 @@ import { install } from '../_utils'
 
 install(FNovelCoronavirus, FNovelCoronavirus.name)
 
+export type FNovelCoronavirusInstance = InstanceType<typeof FNovelCoronavirus>
+
 export default FNovelCoronavirus
diff --git a/packages/fighting-components/page-header/index.ts b/packages/fighting-components/page-header/index.ts
index 9a1656a6ef..af19504dd7 100644
--- a/packages/fighting-components/page-header/index.ts
+++ b/packages/fighting-components/page-header/index.ts
@@ -4,4 +4,6 @@ import { install } from '../_utils'
 
 install(FPageHeader, FPageHeader.name)
 
+export type FPageHeaderInstance = InstanceType<typeof FPageHeader>
+
 export default FPageHeader
diff --git a/packages/fighting-components/page-header/src/page-header.vue b/packages/fighting-components/page-header/src/page-header.vue
index ec344569e9..0cdb71dbb1 100644
--- a/packages/fighting-components/page-header/src/page-header.vue
+++ b/packages/fighting-components/page-header/src/page-header.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup name="FPageHeader">
-  import { FIcon } from '@fighting-design/fighting-components'
+  import FIcon from '../../icon'
   import { Props, Emits } from './page-header'
   import type { ordinaryFunctionInterface as a } from '../../button/src/interface'
 
diff --git a/packages/fighting-components/progress/index.ts b/packages/fighting-components/progress/index.ts
index 1475a39be0..8fe80730b4 100644
--- a/packages/fighting-components/progress/index.ts
+++ b/packages/fighting-components/progress/index.ts
@@ -4,4 +4,6 @@ import { install } from '../_utils'
 
 install(FProgress, FProgress.name)
 
+export type FProgressInstance = InstanceType<typeof FProgress>
+
 export default FProgress
diff --git a/packages/fighting-components/rate/index.ts b/packages/fighting-components/rate/index.ts
index 3438294b5b..26b9f3628c 100644
--- a/packages/fighting-components/rate/index.ts
+++ b/packages/fighting-components/rate/index.ts
@@ -4,4 +4,6 @@ import { install } from '../_utils'
 
 install(FRate, FRate.name)
 
+export type FRateInstance = InstanceType<typeof FRate>
+
 export default FRate
diff --git a/packages/fighting-components/space/index.ts b/packages/fighting-components/space/index.ts
index b0e2055553..46f13ffcb7 100644
--- a/packages/fighting-components/space/index.ts
+++ b/packages/fighting-components/space/index.ts
@@ -4,4 +4,6 @@ import { install } from '../_utils'
 
 install(FSpace, FSpace.name)
 
+export type FSpaceInstance = InstanceType<typeof FSpace>
+
 export default FSpace
diff --git a/packages/fighting-components/switch/index.ts b/packages/fighting-components/switch/index.ts
index 8875964691..9044dac8d6 100644
--- a/packages/fighting-components/switch/index.ts
+++ b/packages/fighting-components/switch/index.ts
@@ -4,4 +4,6 @@ import { install } from '../_utils'
 
 install(FSwitch, FSwitch.name)
 
+export type FSwitchInstance = InstanceType<typeof FSwitch>
+
 export default FSwitch
diff --git a/packages/fighting-components/switch/src/switch.vue b/packages/fighting-components/switch/src/switch.vue
index 7f7fd8ea07..4d4b238755 100644
--- a/packages/fighting-components/switch/src/switch.vue
+++ b/packages/fighting-components/switch/src/switch.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="FSwitch">
   import { computed } from 'vue'
   import { Props, Emits } from './switch'
-  import { FIcon } from '@fighting-design/fighting-components'
+  import FIcon from '../../icon'
   import type { ordinaryFunctionInterface as a } from '../../button/src/interface'
   import type { ComputedRef, CSSProperties } from 'vue'
 
diff --git a/packages/fighting-components/tag/index.ts b/packages/fighting-components/tag/index.ts
index fccb4a7717..de1515d106 100644
--- a/packages/fighting-components/tag/index.ts
+++ b/packages/fighting-components/tag/index.ts
@@ -4,4 +4,6 @@ import { install } from '../_utils'
 
 install(FTag, FTag.name)
 
+export type FTagInstance = InstanceType<typeof FTag>
+
 export default FTag
diff --git a/packages/fighting-components/tag/src/tag.vue b/packages/fighting-components/tag/src/tag.vue
index 63dbcea474..cce676037d 100644
--- a/packages/fighting-components/tag/src/tag.vue
+++ b/packages/fighting-components/tag/src/tag.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup name="FTag">
   import { Props, Emits } from './tag'
   import { computed, ref } from 'vue'
-  import { FIcon } from '@fighting-design/fighting-components'
+  import FIcon from '../../icon'
   import type { handleCloseInterface as a } from './interface'
   import type { ComputedRef, Ref } from 'vue'
 
diff --git a/packages/fighting-components/text/index.ts b/packages/fighting-components/text/index.ts
index 727e7a85d4..b144d7ffa0 100644
--- a/packages/fighting-components/text/index.ts
+++ b/packages/fighting-components/text/index.ts
@@ -4,4 +4,6 @@ import { install } from '../_utils'
 
 install(FText, FText.name)
 
+export type FTextInstance = InstanceType<typeof FText>
+
 export default FText
diff --git a/packages/fighting-components/toolbar-item/index.ts b/packages/fighting-components/toolbar-item/index.ts
index 87ab9d6111..7c078d68ad 100644
--- a/packages/fighting-components/toolbar-item/index.ts
+++ b/packages/fighting-components/toolbar-item/index.ts
@@ -4,4 +4,6 @@ import { install } from '../_utils'
 
 install(FToolbarItem, FToolbarItem.name)
 
+export type FToolbarItemInstance = InstanceType<typeof FToolbarItem>
+
 export default FToolbarItem
diff --git a/packages/fighting-components/toolbar/index.ts b/packages/fighting-components/toolbar/index.ts
index 0f6852d82b..b8163afdd1 100644
--- a/packages/fighting-components/toolbar/index.ts
+++ b/packages/fighting-components/toolbar/index.ts
@@ -4,4 +4,6 @@ import { install } from '../_utils'
 
 install(FToolbar, FToolbar.name)
 
+export type FToolbarInstance = InstanceType<typeof FToolbar>
+
 export default FToolbar
diff --git a/packages/fighting-components/tooltip/index.ts b/packages/fighting-components/tooltip/index.ts
index e7e8abd0c6..d91081e50d 100644
--- a/packages/fighting-components/tooltip/index.ts
+++ b/packages/fighting-components/tooltip/index.ts
@@ -4,4 +4,6 @@ import { install } from '../_utils'
 
 install(FTooltip, FTooltip.name)
 
+export type FTooltipInstance = InstanceType<typeof FTooltip>
+
 export default FTooltip
diff --git a/packages/fighting-components/watermark/index.ts b/packages/fighting-components/watermark/index.ts
index 485cfb2824..09283afdec 100644
--- a/packages/fighting-components/watermark/index.ts
+++ b/packages/fighting-components/watermark/index.ts
@@ -4,4 +4,6 @@ import { install } from '../_utils'
 
 install(FWatermark, FWatermark.name)
 
+export type FWatermarkInstance = InstanceType<typeof FWatermark>
+
 export default FWatermark
diff --git a/packages/fighting-design/package.json b/packages/fighting-design/package.json
index b239a20b2a..267346fd54 100644
--- a/packages/fighting-design/package.json
+++ b/packages/fighting-design/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fighting-design",
-  "version": "0.5.1-bate.2",
+  "version": "0.5.1-bate.4",
   "description": "Fighting design is a Vue3 lightweight component library written with TypeScript + Template.",
   "keywords": [
     "fighting",
@@ -10,14 +10,8 @@
     "components",
     "ui"
   ],
-  "main": "./lib/index.js",
-  "module": "./es/index.js",
-  "exports": {
-    ".": {
-      "require": "./lib/index.js",
-      "import": "./es/index.js"
-    }
-  },
+  "main": "lib/index.js",
+  "module": "es/index.js",
   "author": {
     "name": "tyh2001",
     "url": "https://tianyuhao.cn"
diff --git a/start/main.ts b/start/main.ts
index 79cfe3bc8d..c10c510b5d 100644
--- a/start/main.ts
+++ b/start/main.ts
@@ -6,8 +6,8 @@ import App from './src/App.vue'
 import '@fighting-design/fighting-theme'
 
 // 打包阶段引入
-import FightingDesign from '../dist'
 // import FightingDesign from '../dist/es/index'
+import FightingDesign from '../dist'
 // import '../dist/dist/style.css'
 
 console.log(FightingDesign)
diff --git a/start/src/App.vue b/start/src/App.vue
index 1c772edac4..d12a45263f 100644
--- a/start/src/App.vue
+++ b/start/src/App.vue
@@ -1,3 +1,6 @@
-<script lang="ts" setup></script>
+<script lang="ts" setup>
+  import { FButton } from '@fighting-design/fighting-components'
+  console.log(FButton)
+</script>
 
 <template></template>
diff --git a/start/env.d.ts b/start/src/vite-env.d.ts
similarity index 66%
rename from start/env.d.ts
rename to start/src/vite-env.d.ts
index aafef9509d..323c78a6cd 100644
--- a/start/env.d.ts
+++ b/start/src/vite-env.d.ts
@@ -2,7 +2,6 @@
 
 declare module '*.vue' {
   import type { DefineComponent } from 'vue'
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types
   const component: DefineComponent<{}, {}, any>
   export default component
 }
diff --git a/vite.config.lib.ts b/vite.config.lib.ts
index 7126d46ebd..d0234cc9d8 100644
--- a/vite.config.lib.ts
+++ b/vite.config.lib.ts
@@ -18,7 +18,10 @@ export default (): UserConfigExport => {
         copyDtsFiles: true
       }),
       Components({
-        dts: resolve(__dirname, '/packages/fighting-components/components.d.ts')
+        dts: resolve(
+          __dirname,
+          '/packages/fighting-components/global-components.d.ts'
+        )
       })
     ],
     mode: 'production',
@@ -39,8 +42,8 @@ export default (): UserConfigExport => {
         external: ['vue'],
         preserveModules: true,
         output: {
-          // format: 'cjs',
-          // preserveModules: true,
+          format: 'cjs',
+          preserveModules: true,
           globals: {
             vue: 'Vue'
           }
diff --git a/vite.config.ts b/vite.config.ts
index 55b54d2e8c..9b98693385 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -18,7 +18,10 @@ export default (): UserConfigExport => {
         copyDtsFiles: true // 是否将 .d.ts 源文件复制到 outputDir 中
       }),
       Components({
-        dts: resolve(__dirname, '/packages/fighting-components/components.d.ts')
+        dts: resolve(
+          __dirname,
+          '/packages/fighting-components/global-components.d.ts'
+        )
       })
     ],
     mode: 'production',