From 356844e67f515c702214c7f84647b98a7ee4c93a Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Fri, 26 May 2023 11:59:01 +0800
Subject: [PATCH] =?UTF-8?q?Modal=E6=8E=A7=E4=BB=B6=E8=AE=BE=E7=BD=AE=20:ti?=
 =?UTF-8?q?tle=20=3D=20null=20=E6=97=A0=E6=95=88=EF=BC=8C=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98=E6=A0=8F=E6=97=A0=E6=B3=95=E9=9A=90=E8=97=8F=20#4856?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Modal/src/BasicModal.vue | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/components/Modal/src/BasicModal.vue b/src/components/Modal/src/BasicModal.vue
index be81523..157ed9f 100644
--- a/src/components/Modal/src/BasicModal.vue
+++ b/src/components/Modal/src/BasicModal.vue
@@ -4,7 +4,7 @@
       <ModalClose :canFullscreen="getProps.canFullscreen" :fullScreen="fullScreenRef" :commentSpan="commentSpan" :enableComment="getProps.enableComment" @comment="handleComment" @cancel="handleCancel" @fullscreen="handleFullScreen" />
     </template>
 
-    <template #title v-if="!$slots.title">
+    <template #title v-if="!isNoTitle">
       <ModalHeader :helpMessage="getProps.helpMessage" :title="getMergeProps.title" @dblclick="handleTitleDbClick" />
     </template>
 
@@ -70,7 +70,7 @@
     inheritAttrs: false,
     props: basicProps,
     emits: ['visible-change', 'height-change', 'cancel', 'ok', 'register', 'update:visible'],
-    setup(props, { emit, attrs }) {
+    setup(props, { emit, attrs , slots}) {
       const visibleRef = ref(false);
       const propsRef = ref<Partial<ModalProps> | null>(null);
       const modalWrapperRef = ref<any>(null);
@@ -101,6 +101,13 @@
           ...(unref(propsRef) as any),
         };
       });
+        //update-begin-author:liusq date:2023-05-25 for:【issues/4856】Modal控件设置 :title = null 无效
+        //是否未设置标题
+        const isNoTitle = computed(() => {
+            //标题为空并且不含有标题插槽
+            return !unref(getMergeProps).title && !slots.title;
+        });
+        //update-end-author:liusq date:2023-05-25 for:【issues/4856】Modal控件设置 :title = null 无效
 
       const { handleFullScreen, getWrapClassName, fullScreenRef } = useFullScreen({
         modalWrapperRef,
@@ -243,7 +250,8 @@
         handleTitleDbClick,
         getWrapperHeight,
         commentSpan,
-        handleComment
+        handleComment,
+        isNoTitle
       };
     },
   });