From 3e01894db52ec62c7b83243576238026c9eed455 Mon Sep 17 00:00:00 2001
From: JEECG <445654970@qq.com>
Date: Mon, 18 Mar 2024 11:02:23 +0800
Subject: [PATCH] =?UTF-8?q?vue3.4=E4=BB=A5=E4=B8=8A=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E8=A7=92=E8=89=B2=E6=8A=BD=E5=B1=89=E9=9A=90?=
 =?UTF-8?q?=E8=97=8Ffooter=E9=80=BB=E8=BE=91=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Drawer/src/BasicDrawer.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/Drawer/src/BasicDrawer.vue b/src/components/Drawer/src/BasicDrawer.vue
index fdf33ec..cf57a1b 100644
--- a/src/components/Drawer/src/BasicDrawer.vue
+++ b/src/components/Drawer/src/BasicDrawer.vue
@@ -59,7 +59,9 @@
       instance && emit('register', drawerInstance, instance.uid);
 
       const getMergeProps = computed((): DrawerProps => {
-        return deepMerge(toRaw(props), unref(propsRef));
+        // update-begin--author:liaozhiyang---date:20240306---for：【QQYUN-8389】vue3.4以上版本导致角色抽屉隐藏footer逻辑错误
+        return { ...deepMerge(toRaw(props), unref(propsRef)) };
+        // update-end--author:liaozhiyang---date:20240306---for：【QQYUN-8389】vue3.4以上版本导致角色抽屉隐藏footer逻辑错误
       });
 
       const getProps = computed((): DrawerProps => {