From 13b031eef9b8d4e8333c9397ff26e4875bf9816a Mon Sep 17 00:00:00 2001
From: zhang <zwtvip@qq.com>
Date: Wed, 10 Apr 2024 16:10:31 +0800
Subject: [PATCH] =?UTF-8?q?fix(BasicModal):=20=E4=BF=AE=E5=A4=8DBasicModal?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0wrapClassName=E6=A0=B7=E5=BC=8F=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E9=97=AE=E9=A2=98=20(#3726)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(BasicModal): 全屏样式异常

* fix(BasicModal): 修复BasicModal添加wrapClassName样式异常问题

* fix(BasicModal): 修复BasicModal添加wrapClassName样式异常问题
---
 src/components/Modal/src/BasicModal.vue | 7 +++++--
 src/components/Modal/src/index.less     | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/components/Modal/src/BasicModal.vue b/src/components/Modal/src/BasicModal.vue
index b01ef5db3..e4aa4d3e8 100644
--- a/src/components/Modal/src/BasicModal.vue
+++ b/src/components/Modal/src/BasicModal.vue
@@ -151,8 +151,11 @@
       ...unref(getMergeProps),
       open: unref(openRef),
     };
-    attr['wrapClassName'] =
-      `${attr?.['wrapClassName'] || ''} ${unref(getWrapClassName)}` + 'vben-basic-modal-wrap';
+    if (attr?.['wrapClassName'] === unref(getWrapClassName)) {
+      attr['wrapClassName'] = `${attr?.['wrapClassName'] || ''} ` + prefixCls;
+    } else {
+      attr['wrapClassName'] = `${unref(getWrapClassName) || ''}` + prefixCls;
+    }
     if (unref(fullScreenRef)) {
       return omit(attr, ['height', 'title']);
     }
diff --git a/src/components/Modal/src/index.less b/src/components/Modal/src/index.less
index 10fc76833..600797c8e 100644
--- a/src/components/Modal/src/index.less
+++ b/src/components/Modal/src/index.less
@@ -1,4 +1,4 @@
-@prefix-cls: ~'@{namespace}-basic-modal-wrap';
+@modal-prefix-cls: ~'@{namespace}-basic-modal';
 
 .fullscreen-modal {
   overflow: hidden;
@@ -20,7 +20,7 @@
   }
 }
 
-.@{prefix-cls} {
+.@{modal-prefix-cls} {
   .ant-modal {
     width: 520px;
     padding-bottom: 0;