From 948ecc3fe1ec5ca3d008d0205cfbc82d4bf0c78a Mon Sep 17 00:00:00 2001
From: anlyyao <anly_yaw@163.com>
Date: Tue, 15 Aug 2023 19:06:55 +0800
Subject: [PATCH 1/2] fix(Drawer): export drawer component

---
 src/drawer/demos/plugin.vue |  5 ++--
 src/drawer/index.ts         | 58 ++++++-------------------------------
 src/drawer/plugin.ts        | 48 ++++++++++++++++++++++++++++++
 src/drawer/type.ts          |  4 +--
 src/plugins.ts              |  1 +
 5 files changed, 62 insertions(+), 54 deletions(-)
 create mode 100644 src/drawer/plugin.ts

diff --git a/src/drawer/demos/plugin.vue b/src/drawer/demos/plugin.vue
index 37a94e9b0..77ba6decb 100644
--- a/src/drawer/demos/plugin.vue
+++ b/src/drawer/demos/plugin.vue
@@ -3,11 +3,10 @@
 </template>
 
 <script lang="ts" setup>
-import { inject } from 'vue';
+import { DrawerPlugin } from 'tdesign-mobile-vue';
 
-const $drawer: any = inject('$drawer');
 const showDrawer = () => {
-  const instance = $drawer({
+  const instance = DrawerPlugin({
     items: new Array(20).fill({ title: '菜单' }).map((item, index: number) => ({ title: `标题 ${index + 1}` })),
     onItemClick(index: number) {
       console.log(index);
diff --git a/src/drawer/index.ts b/src/drawer/index.ts
index 30cbe67a6..6993407e5 100644
--- a/src/drawer/index.ts
+++ b/src/drawer/index.ts
@@ -1,55 +1,15 @@
-import { createApp, App, h, ref, nextTick } from 'vue';
-import vueDrawer from './drawer.vue';
-import { WithInstallType } from '../shared';
-import { TdDrawerProps } from './type';
+import _Drawer from './drawer.vue';
+import { withInstall, WithInstallType } from '../shared';
 
 import './style';
 
-type DrawerOptions = Omit<TdDrawerProps, 'attach'>;
-
-const Drawer = (options: DrawerOptions) => {
-  const root = document.createElement('div');
-  document.body.appendChild(root);
-  const visible = ref(false);
-  const props = ref({});
-  const destroyOnClose = ref(false);
-
-  createApp(() =>
-    h(vueDrawer, { ...options, visible: visible.value, destroyOnClose: destroyOnClose.value, ...props.value }),
-  ).mount(root);
-
-  const handler = {
-    destroy() {
-      destroyOnClose.value = true;
-      nextTick(() => {
-        visible.value = false;
-        document.body.removeChild(root);
-      });
-    },
-    hide() {
-      visible.value = false;
-    },
-    show() {
-      visible.value = true;
-    },
-    update(options: DrawerOptions) {
-      props.value = options;
-    },
-  };
-
-  return handler;
-};
-
-Drawer.install = (app: App, name = '') => {
-  app.component(name || vueDrawer.name, vueDrawer);
-
-  // 添加插件入口
-  app.config.globalProperties.$drawer = Drawer;
-  app.provide('$drawer', Drawer);
-};
-
-const _Drawer: WithInstallType<typeof Drawer> = Drawer;
+import { TdDrawerProps } from './type';
 
-export default _Drawer;
+export type DividerProps = TdDrawerProps;
 
 export * from './type';
+export * from './plugin';
+export { default as DrawerPlugin } from './plugin';
+
+const Drawer: WithInstallType<typeof _Drawer> = withInstall(_Drawer);
+export default Drawer;
diff --git a/src/drawer/plugin.ts b/src/drawer/plugin.ts
new file mode 100644
index 000000000..2704959de
--- /dev/null
+++ b/src/drawer/plugin.ts
@@ -0,0 +1,48 @@
+import { createApp, App, h, ref, nextTick } from 'vue';
+import vueDrawer from './drawer.vue';
+import { WithInstallType } from '../shared';
+import { TdDrawerProps } from './type';
+
+type DrawerOptions = Omit<TdDrawerProps, 'attach'>;
+
+const Drawer = (options: DrawerOptions) => {
+  const root = document.createElement('div');
+  document.body.appendChild(root);
+  const visible = ref(false);
+  const props = ref({});
+  const destroyOnClose = ref(false);
+
+  createApp(() =>
+    h(vueDrawer, { ...options, visible: visible.value, destroyOnClose: destroyOnClose.value, ...props.value }),
+  ).mount(root);
+
+  const handler = {
+    destroy() {
+      destroyOnClose.value = true;
+      nextTick(() => {
+        visible.value = false;
+        document.body.removeChild(root);
+      });
+    },
+    hide() {
+      visible.value = false;
+    },
+    show() {
+      visible.value = true;
+    },
+    update(options: DrawerOptions) {
+      props.value = options;
+    },
+  };
+
+  return handler;
+};
+
+Drawer.install = (app: App): void => {
+  // 添加插件入口
+  app.config.globalProperties.$drawer = Drawer;
+};
+
+const DrawerPlugin: WithInstallType<typeof Drawer> = Drawer;
+
+export default DrawerPlugin;
diff --git a/src/drawer/type.ts b/src/drawer/type.ts
index 05314b310..01162fc72 100644
--- a/src/drawer/type.ts
+++ b/src/drawer/type.ts
@@ -97,8 +97,8 @@ export interface DrawerInstance {
 }
 
 export interface DrawerItem {
-  title: string;
-  icon: TNode;
+  title?: string;
+  icon?: TNode;
 }
 
 export type TriggerSource = 'overlay';
diff --git a/src/plugins.ts b/src/plugins.ts
index 1f71ffb84..7fda2de90 100644
--- a/src/plugins.ts
+++ b/src/plugins.ts
@@ -1,3 +1,4 @@
 export { DialogPlugin } from './dialog';
 export { MessagePlugin } from './message';
 export { ToastPlugin } from './toast';
+export { DrawerPlugin } from './drawer';

From f0dd8a6a4b64297dc7b3367b87661121cf6d622b Mon Sep 17 00:00:00 2001
From: yaogengzhu <455947455@qq.com>
Date: Tue, 15 Aug 2023 19:36:49 +0800
Subject: [PATCH 2/2] fix: fix type

---
 src/drawer/type.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/drawer/type.ts b/src/drawer/type.ts
index 01162fc72..15f8d7b31 100644
--- a/src/drawer/type.ts
+++ b/src/drawer/type.ts
@@ -97,7 +97,7 @@ export interface DrawerInstance {
 }
 
 export interface DrawerItem {
-  title?: string;
+  title: string;
   icon?: TNode;
 }