From 2bac8d8fae5324c6c03ada081e8e5ead64332d4b Mon Sep 17 00:00:00 2001
From: zer0Black <lxtalx@gmail.com>
Date: Wed, 16 Aug 2023 22:17:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DJModal=E5=BC=B9=E6=A1=86?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/jero/JModal/JModal.vue | 13 ++++---------
 jero-web/src/components/jero/JModal/index.vue  |  2 +-
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/jero-web/src/components/jero/JModal/JModal.vue b/jero-web/src/components/jero/JModal/JModal.vue
index 55bc58bb..bfe4f49b 100644
--- a/jero-web/src/components/jero/JModal/JModal.vue
+++ b/jero-web/src/components/jero/JModal/JModal.vue
@@ -16,7 +16,7 @@
     <template v-if="!isNoTitle" slot="title">
       <a-row class="j-modal-title-row" type="flex">
         <a-col class="left">
-          <slot name="title">{{ title + 'jjjj' }}</slot>
+          <slot name="title">{{ title }}</slot>
         </a-col>
         <a-col v-if="switchFullscreen" class="right" @click="toggleFullscreen">
           <a-button class="ant-modal-close ant-modal-close-x" ghost type="link" :icon="fullscreenButtonIcon"/>
@@ -189,8 +189,7 @@ export default {
 
         & .ant-modal-body {
           /* title 和 footer 各占 55px */
-          height: 500px !important;
-          background-color: pink;
+          height: calc(100% - 55px - 55px);
           overflow: auto;
         }
       }
@@ -206,9 +205,7 @@ export default {
         }
       }
     }
-    .ant-modal-body{
-      height:500px !important;
-    }
+
     .j-modal-title-row {
       .left {
         width: calc(100% - 56px - 56px);
@@ -234,9 +231,7 @@ export default {
         border-bottom: 0 !important;
       }
     }
-    .ant-modal-body{
-      height:500px !important;
-    }
+
   }
 
   @media (max-width: 767px) {
diff --git a/jero-web/src/components/jero/JModal/index.vue b/jero-web/src/components/jero/JModal/index.vue
index f5536a63..45cf2be2 100644
--- a/jero-web/src/components/jero/JModal/index.vue
+++ b/jero-web/src/components/jero/JModal/index.vue
@@ -188,7 +188,7 @@ export default {
 
         & .ant-modal-body {
           /* title 和 footer 各占 55px */
-          height: calc(80% - 55px - 55px);
+          height: calc(100% - 55px - 55px);
           overflow: auto;
         }
       }