From dd4cc440c10238fd7425f236a23ab52dec4a415f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E8=BF=AA?= <liudi@cethik.com>
Date: Wed, 1 Dec 2021 11:12:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8Dcheckbox=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3=E4=B8=ADdemo=E6=95=B0=E6=8D=AE=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E7=94=A8=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/devui-vue/docs/components/checkbox/index.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/devui-vue/docs/components/checkbox/index.md b/packages/devui-vue/docs/components/checkbox/index.md
index 5d69d893..04fef2aa 100644
--- a/packages/devui-vue/docs/components/checkbox/index.md
+++ b/packages/devui-vue/docs/components/checkbox/index.md
@@ -207,11 +207,11 @@ import { defineComponent, ref } from 'vue'
 export default defineComponent({
   setup() {
     const options1 = ref([
-      { name: 'data1', disabled: 'true', value: 1, id: 1 },
-      { name: 'data2', value: 2, id: 2 },
-      { name: 'data3', value: 3, id: 3 },
+      { name: 'data1', disabled: true, value: '1', id: 1 },
+      { name: 'data2', value: '2', id: 2 },
+      { name: 'data3', value: '3', id: 3 },
     ])
-    const values1 = ref([{ name: 'data2', value: 2, id: 2 }])
+    const values1 = ref([{ name: 'data2', value: '2', id: 2 }])
     const options2 = ref([
       'data1',
       'data2',
-- 
Gitee


From 0299f7858a75686c6e6b96da58dacf7877f63da4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E8=BF=AA?= <liudi@cethik.com>
Date: Thu, 2 Dec 2021 09:43:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:Fullscreen=E4=BF=AE=E5=A4=8Dmd=E4=B8=AD?=
 =?UTF-8?q?demo=E5=85=A8=E5=B1=8F=E6=9C=AA=E9=81=AE=E7=9B=96nav-bar?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E7=82=B9=E5=87=BBchrome=E8=87=AA?=
 =?UTF-8?q?=E5=B8=A6=E5=85=B3=E9=97=AD=E5=85=A8=E5=B1=8F=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=9C=AA=E8=A7=A6=E5=8F=91=E5=9B=9E=E8=B0=83=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=8D=B8=E8=BD=BD=E6=97=B6=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E7=9B=91=E5=90=AC=E9=81=BF=E5=85=8D=E5=86=85=E5=AD=98?=
 =?UTF-8?q?=E6=B3=84=E6=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../devui-vue/devui/fullscreen/src/fullscreen.tsx  | 14 ++++++++++++--
 .../devui-vue/docs/components/fullscreen/index.md  |  4 ++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/packages/devui-vue/devui/fullscreen/src/fullscreen.tsx b/packages/devui-vue/devui/fullscreen/src/fullscreen.tsx
index 99495bf5..b10f75c3 100644
--- a/packages/devui-vue/devui/fullscreen/src/fullscreen.tsx
+++ b/packages/devui-vue/devui/fullscreen/src/fullscreen.tsx
@@ -5,6 +5,7 @@ import {
   useSlots,
   renderSlot,
   onMounted,
+  onBeforeUnmount,
   ref
 } from 'vue'
 import { fullscreenProps, FullscreenProps } from './fullscreen-types'
@@ -15,12 +16,12 @@ export default defineComponent({
   emits: ['fullscreenLaunch'],
   setup(props: FullscreenProps, ctx) {
 
-    let currentTarget = ref(null)
+    let currentTarget = null
     const isFullscreen = ref(false)
     const slotElement = ref(null)
 
     const onFullScreenChange = () => {
-      if (currentTarget.value) {
+      if (currentTarget) {
         const targetElement: HTMLElement = currentTarget
         if (document.fullscreenElement) { // 进入全屏
           addFullScreenStyle()
@@ -139,6 +140,15 @@ export default defineComponent({
       document.addEventListener('webkitfullscreenchange', onFullScreenChange)
       document.addEventListener('keydown', handleKeyDown)
     })
+    onBeforeUnmount(()=>{
+      const btnLaunch = slotElement.value.querySelector('[fullscreen-launch]')
+      if (btnLaunch) { btnLaunch.removeEventListener('click', handleFullscreen) }
+      document.removeEventListener('fullscreenchange', onFullScreenChange)
+      document.removeEventListener('MSFullscreenChange', onFullScreenChange)
+      document.removeEventListener('webkitfullscreenchange', onFullScreenChange)
+      document.removeEventListener('keydown', handleKeyDown)
+      // removeFullScreenStyle();
+    })
     return () => {
       const defaultSlot = renderSlot(useSlots(), 'default')
       // if (defaultSlot.children.length === 0) throw new Error('未发现全屏元素')
diff --git a/packages/devui-vue/docs/components/fullscreen/index.md b/packages/devui-vue/docs/components/fullscreen/index.md
index 7132dcd5..ccaf8d91 100644
--- a/packages/devui-vue/docs/components/fullscreen/index.md
+++ b/packages/devui-vue/docs/components/fullscreen/index.md
@@ -50,9 +50,9 @@ export default {
 
 ```vue
 <template>
-  <d-fullscreen :mode='"normal"' @fullscreenLaunch='fullscreenLaunch'>
+  <d-fullscreen :zIndex='100' mode="normal" @fullscreenLaunch='fullscreenLaunch'>
     <div fullscreen-target>
-      <d-button bsStyle="common" fullscreen-launch>{{btnContent}}</d-button>
+      <d-button fullscreen-launch>{{btnContent}}</d-button>
     </div>
   </d-fullscreen>
 </template>
-- 
Gitee