From 687808ebb1e694dad19b734e677d6bd2f30e39fa Mon Sep 17 00:00:00 2001
From: nowisfuture <lnzhangsong@live.com>
Date: Mon, 6 Dec 2021 17:12:51 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat(drawer):=20=E5=A2=9E=E5=8A=A0=E5=A4=B4?=
 =?UTF-8?q?=E9=83=A8=E6=8F=92=E6=A7=BD,=E4=BF=AE=E6=94=B9=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3=E4=BB=A5=E5=8F=8A=E8=BF=9B=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/devui-vue/devui/drawer/index.ts      |  2 +-
 .../devui-vue/devui/drawer/src/drawer.tsx     | 10 ++--
 .../devui-vue/docs/components/drawer/index.md | 57 +++++++++++++++++++
 3 files changed, 63 insertions(+), 6 deletions(-)

diff --git a/packages/devui-vue/devui/drawer/index.ts b/packages/devui-vue/devui/drawer/index.ts
index 342b0f93..2ad72eb0 100644
--- a/packages/devui-vue/devui/drawer/index.ts
+++ b/packages/devui-vue/devui/drawer/index.ts
@@ -10,7 +10,7 @@ export { Drawer }
 export default {
   title: 'Drawer 抽屉板',
   category: '反馈',
-  status: '30%',
+  status: '50%',
   install(app: App): void {
     
     app.use(Drawer as any)
diff --git a/packages/devui-vue/devui/drawer/src/drawer.tsx b/packages/devui-vue/devui/drawer/src/drawer.tsx
index c19346a9..ff363404 100644
--- a/packages/devui-vue/devui/drawer/src/drawer.tsx
+++ b/packages/devui-vue/devui/drawer/src/drawer.tsx
@@ -22,12 +22,10 @@ export default defineComponent({
 
     const closeDrawer = async () => {
       const beforeHidden = props.beforeHidden;
-      let result = (typeof beforeHidden === 'function' ? beforeHidden(): beforeHidden) ?? true;
+      let result = (typeof beforeHidden === 'function' ? beforeHidden(): beforeHidden) ?? false;
       if (result instanceof Promise) {
-        console.log(result);
-        
         result = await result;
-      }
+      }    
       if (result) return;
 
       emit('update:visible', false)
@@ -82,7 +80,9 @@ export default defineComponent({
     return (
       <Teleport to="body">
         <DrawerBody>
-          <DrawerHeader onToggleFullScreen={fullScreenEvent} onClose={closeDrawer} />
+          {this.slots.header ? this.slots.header() : 
+            <DrawerHeader onToggleFullScreen={fullScreenEvent} onClose={closeDrawer} />
+          }
           {this.slots.default ? this.slots.default() : <DrawerContainer />}
         </DrawerBody>
       </Teleport>
diff --git a/packages/devui-vue/docs/components/drawer/index.md b/packages/devui-vue/docs/components/drawer/index.md
index e94b9f9a..7e838dda 100644
--- a/packages/devui-vue/docs/components/drawer/index.md
+++ b/packages/devui-vue/docs/components/drawer/index.md
@@ -77,6 +77,56 @@ export default ({
 
 :::
 
+### 自定义模板
+
+<h4>自定义抽屉板模板。</h4>
+
+:::demo
+
+```vue
+<template>
+  <d-button  @click="drawerShow"> drawer </d-button>
+  <d-drawer
+    v-model:visible="isDrawerShow" 
+    :isCover="false" 
+  >
+    <template v-slot>
+      内容区插槽
+    </template>
+    <template v-slot:header>
+      <div @click="drawerClose">
+        <span class="icon icon-close" />
+      </div>
+    </template>
+  </d-drawer>
+</template>
+<script>
+import { ref } from 'vue'
+
+export default ({
+  setup() {
+    let isDrawerShow = ref(false)
+
+    const drawerShow = () => {
+      isDrawerShow.value = !isDrawerShow.value
+    }
+
+    const drawerClose = () => {
+      isDrawerShow.value = false;
+    }
+
+    return {
+      isDrawerShow,
+      drawerShow,
+      drawerClose,
+    }
+  }
+})
+</script>
+```
+
+:::
+
 ### 参数及API
 
 | 参数 | 类型 | 默认 | 说明 | 跳转 Demo |
@@ -91,3 +141,10 @@ export default ({
 | beforeHidden | `Function \| Promise` | -- | 可选，关闭窗口之前的回调 | [基本用法](#基本用法) |
 | onClose | `Function` | -- | 可选，关闭 drawer 时候调用 | [基本用法](#基本用法) |
 | onAfterOpened | `Function` | -- | 可选，打开 drawer 后时候调用 | [基本用法](#基本用法) |
+
+### 插槽
+
+| 名称 | 类型 | 说明 | 跳转 Demo |
+| :--: | :---------: | :------: | :-------: |
+| default | 默认 | 抽屉板内容 | [自定义模板](#自定义模板) |
+| header  | 头部 | 抽屉板头部 | [自定义模板](#自定义模板) |
-- 
Gitee


From 45ef98994e5994474780a2b41871f4f0389ce393 Mon Sep 17 00:00:00 2001
From: nowisfuture <lnzhangsong@live.com>
Date: Thu, 9 Dec 2021 15:46:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(drawer):=20=E7=A7=BB=E9=99=A4=E5=A4=9A?=
 =?UTF-8?q?=E4=BD=99=E7=9A=84=E7=A9=BA=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/devui-vue/devui/drawer/src/drawer.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/devui-vue/devui/drawer/src/drawer.tsx b/packages/devui-vue/devui/drawer/src/drawer.tsx
index ff363404..09c84e4d 100644
--- a/packages/devui-vue/devui/drawer/src/drawer.tsx
+++ b/packages/devui-vue/devui/drawer/src/drawer.tsx
@@ -25,7 +25,7 @@ export default defineComponent({
       let result = (typeof beforeHidden === 'function' ? beforeHidden(): beforeHidden) ?? false;
       if (result instanceof Promise) {
         result = await result;
-      }    
+      }
       if (result) return;
 
       emit('update:visible', false)
-- 
Gitee