From 1f68ef0a54ae0a17cf907a4360dc647eb77814e1 Mon Sep 17 00:00:00 2001
From: Tyh2001 <1469442737@qq.com>
Date: Tue, 8 Aug 2023 21:21:39 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=20`f-drawer`=20`f-di?=
 =?UTF-8?q?alog`=20=E7=BB=84=E4=BB=B6=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/docs.yml              |  1 +
 CHANGELOG.md                            |  2 +
 docs/CNAME                              |  1 +
 docs/components/demos/drawer/demo1.vue  | 36 ----------------
 docs/components/demos/drawer/demo2.vue  | 15 -------
 docs/components/drawer.md               | 57 ++++++++++++++++++++-----
 packages/fighting-theme/src/dialog.scss |  2 +-
 packages/fighting-theme/src/drawer.scss |  2 +-
 8 files changed, 53 insertions(+), 63 deletions(-)
 create mode 100644 docs/CNAME
 delete mode 100644 docs/components/demos/drawer/demo1.vue
 delete mode 100644 docs/components/demos/drawer/demo2.vue

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 28289edbd2..a3c343b9c4 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -52,3 +52,4 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: docs/.vitepress/dist
+          publish_branch: gh-pages  # 将部署到 gh-pages 分支
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 673d12bda3..2a0991d474 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 中文 | [英文](https://github.com/FightingDesign/fighting-design/blob/master/CHANGELOG.en-US.md)
 
+- 优化 `f-drawer` `f-dialog` 组件样式
+
 ## 0.60.0 (2023-08-04)
 
 - 优化 `f-radio` 组件样式
diff --git a/docs/CNAME b/docs/CNAME
new file mode 100644
index 0000000000..74aa439d78
--- /dev/null
+++ b/docs/CNAME
@@ -0,0 +1 @@
+fighting.tianyuhao.cn
diff --git a/docs/components/demos/drawer/demo1.vue b/docs/components/demos/drawer/demo1.vue
deleted file mode 100644
index 1045da331f..0000000000
--- a/docs/components/demos/drawer/demo1.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-<script lang="ts" setup>
-  import { ref } from 'vue'
-
-  const visible1 = ref(false)
-  const direction = ref('right')
-
-  const onShow = (dir: string): void => {
-    direction.value = dir
-    visible1.value = true
-  }
-</script>
-
-<template>
-  <f-space>
-    <f-button type="primary" @click="onShow('left')">从左往右开</f-button>
-    <f-button type="primary" @click="onShow('right')">从右往左开</f-button>
-    <f-button type="primary" @click="onShow('top')">从上往下开</f-button>
-    <f-button type="primary" @click="onShow('bottom')">从下往上开</f-button>
-  </f-space>
-
-  <f-drawer v-model:visible="visible1" title="Title" :direction="direction">
-    <h3>沁园春·雪</h3>
-
-    <p>北国风光，千里冰封，万里雪飘。</p>
-    <p>望长城内外，惟余莽莽；大河上下，顿失滔滔。</p>
-    <p>山舞银蛇，原驰蜡象，欲与天公试比高。</p>
-    <p>须晴日，看红装素裹，分外妖娆。</p>
-
-    <br />
-
-    <p>江山如此多娇，引无数英雄竞折腰。</p>
-    <p>惜秦皇汉武，略输文采；唐宗宋祖，稍逊风骚。</p>
-    <p>一代天骄，成吉思汗，只识弯弓射大雕。</p>
-    <p>俱往矣，数风流人物，还看今朝。</p>
-  </f-drawer>
-</template>
diff --git a/docs/components/demos/drawer/demo2.vue b/docs/components/demos/drawer/demo2.vue
deleted file mode 100644
index db6b955bfc..0000000000
--- a/docs/components/demos/drawer/demo2.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<script lang="ts" setup>
-  import { ref } from 'vue'
-
-  const visible4 = ref(false)
-  const visible5 = ref(false)
-</script>
-
-<template>
-  <f-button type="primary" @click="visible4 = true">打开</f-button>
-
-  <f-drawer v-model:visible="visible4" title="Title" size="50%" append-to-body>
-    <f-button type="primary" @click="visible5 = true">打开内层 drawer</f-button>
-    <f-drawer v-model:visible="visible5" title="Title"> 内层 drawer </f-drawer>
-  </f-drawer>
-</template>
diff --git a/docs/components/drawer.md b/docs/components/drawer.md
index 03335faa4f..08785c8bea 100644
--- a/docs/components/drawer.md
+++ b/docs/components/drawer.md
@@ -12,7 +12,28 @@
 ::: demo
 
 <template #source>
-<demo1-vue />
+<f-space>
+<f-button type="primary" @click="onShow('left')">从左往右开</f-button>
+<f-button type="primary" @click="onShow('right')">从右往左开</f-button>
+<f-button type="primary" @click="onShow('top')">从上往下开</f-button>
+<f-button type="primary" @click="onShow('bottom')">从下往上开</f-button>
+</f-space>
+
+<f-drawer v-model:visible="visible1" title="Title" :direction="direction">
+<h3>沁园春·雪</h3>
+
+<p>北国风光，千里冰封，万里雪飘。</p>
+<p>望长城内外，惟余莽莽；大河上下，顿失滔滔。</p>
+<p>山舞银蛇，原驰蜡象，欲与天公试比高。</p>
+<p>须晴日，看红装素裹，分外妖娆。</p>
+
+<br />
+
+<p>江山如此多娇，引无数英雄竞折腰。</p>
+<p>惜秦皇汉武，略输文采；唐宗宋祖，稍逊风骚。</p>
+<p>一代天骄，成吉思汗，只识弯弓射大雕。</p>
+<p>俱往矣，数风流人物，还看今朝。</p>
+</f-drawer>
 </template>
 
 ```html
@@ -64,24 +85,31 @@
 ::: demo
 
 <template #source>
-<demo2-vue />
+
+<div>
+<f-button type="primary" @click="visible2 = true">打开</f-button>
+<f-drawer v-model:visible="visible2" title="Title" size="50%" append-to-body>
+<f-button type="primary" @click="visible3 = true">打开内层 drawer</f-button>
+<f-drawer v-model:visible="visible3" title="Title"> 内层 drawer </f-drawer>
+</f-drawer>
+</div>
 </template>
 
 ```html
 <template>
-  <f-button type="primary" @click="visible4 = true">打开</f-button>
+  <f-button type="primary" @click="visible2 = true">打开</f-button>
 
-  <f-drawer title="Title" append-to-body v-model:visible="visible4">
-    <f-button type="primary" @click="visible5 = true">打开内层 drawer</f-button>
-    <f-drawer title="Title" v-model:visible="visible5"> 内层 drawer </f-drawer>
+  <f-drawer title="Title" append-to-body v-model:visible="visible2">
+    <f-button type="primary" @click="visible3 = true">打开内层 drawer</f-button>
+    <f-drawer title="Title" v-model:visible="visible3"> 内层 drawer </f-drawer>
   </f-drawer>
 </template>
 
 <script lang="ts" setup>
   import { ref } from 'vue'
 
-  const visible4 = ref(false)
-  const visible5 = ref(false)
+  const visible2 = ref(false)
+  const visible3 = ref(false)
 </script>
 ```
 
@@ -143,6 +171,15 @@ type DrawerDirection = 'left' | 'top' | 'right' | 'bottom'
 </a>
 
 <script setup lang="ts">
-  import demo1Vue from './demos/drawer/demo1.vue'
-  import demo2Vue from './demos/drawer/demo2.vue'
+  import { ref } from 'vue'
+
+  const visible1 = ref(false)
+  const visible2 = ref(false)
+  const visible3 = ref(false)
+  const direction = ref('right')
+
+  const onShow = (dir: string): void => {
+    direction.value = dir
+    visible1.value = true
+  }
 </script>
diff --git a/packages/fighting-theme/src/dialog.scss b/packages/fighting-theme/src/dialog.scss
index e6e8fc21b4..9d42a39903 100644
--- a/packages/fighting-theme/src/dialog.scss
+++ b/packages/fighting-theme/src/dialog.scss
@@ -4,7 +4,7 @@
   right: 0;
   left: 0;
   bottom: 0;
-  z-index: var(--dialog-z-index);
+  z-index: var(--dialog-z-index, 2000);
 
   // 遮罩层
   &__mask {
diff --git a/packages/fighting-theme/src/drawer.scss b/packages/fighting-theme/src/drawer.scss
index 84cb617928..19fd62b091 100644
--- a/packages/fighting-theme/src/drawer.scss
+++ b/packages/fighting-theme/src/drawer.scss
@@ -4,7 +4,7 @@
   right: 0;
   left: 0;
   bottom: 0;
-  z-index: var(--drawer-z-index);
+  z-index: var(--drawer-z-index, 2000);
 
   // 不同方向
   &__top .f-drawer__container {