From 42e1000c111c118dc42468196f5cfb870adcd571 Mon Sep 17 00:00:00 2001
From: Xu Zhimeng <xuzhimeng@qq.com>
Date: Thu, 6 Jul 2023 11:19:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E5=BC=B9=E7=AA=97=E6=8E=A7=E5=88=B6footer=E6=97=B6?=
 =?UTF-8?q?=E7=9A=84=E9=80=BB=E8=BE=91=E9=94=99=E8=AF=AF=EF=BC=8C=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E9=BB=98=E8=AE=A4=E6=98=BE=E7=A4=BA=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E5=92=8C=E5=8F=96=E6=B6=88=EF=BC=8C=E5=A2=9E=E5=8A=A0custom-fo?=
 =?UTF-8?q?oter=E6=8F=92=E6=A7=BD=E6=9D=A5=E8=87=AA=E5=AE=9A=E4=B9=89foote?=
 =?UTF-8?q?r=EF=BC=8C=E4=BB=A5=E4=BD=BF=E5=85=B6=E6=9B=B4=E5=8A=A0?=
 =?UTF-8?q?=E7=81=B5=E6=B4=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CustomModal/index.vue | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/components/CustomModal/index.vue b/src/components/CustomModal/index.vue
index 92d13a6..9e7ac54 100644
--- a/src/components/CustomModal/index.vue
+++ b/src/components/CustomModal/index.vue
@@ -1,10 +1,5 @@
 <template>
-  <a-modal
-    :class="'custom-modal' + (innerFullscreen ? ' fullscreen' : '')"
-    v-bind="_attrs"
-    v-model="visible"
-    :footer="null"
-  >
+  <a-modal :class="'custom-modal' + (innerFullscreen ? ' fullscreen' : '')" v-bind="_attrs" v-model="visible">
     <img slot="closeIcon" src="@/assets/images/global/close.png" />
     <div slot="title">
       <div class="custom-modal-title">
@@ -16,10 +11,13 @@
       </div>
     </div>
     <slot></slot>
-    <a-space v-if="showFooter" class="operators" :size="20">
-      <a-button type="success" @click="onSave" :loading="confirmLoading">Save</a-button>
-      <a-button type="warn" @click="onCancel">Cancel</a-button>
-    </a-space>
+    <template slot="footer">
+      <slot name="custom-footer"></slot>
+      <a-space v-if="!hasCustomFooter" class="operators" :size="20">
+        <a-button type="success" @click="onSave" :loading="confirmLoading">Save</a-button>
+        <a-button type="warn" @click="onCancel">Cancel</a-button>
+      </a-space>
+    </template>
   </a-modal>
 </template>
 <script>
@@ -34,10 +32,6 @@ export default {
     title: {
       type: String
     },
-    showFooter: {
-      type: Boolean,
-      default: true
-    },
     enableFullScreen: {
       type: Boolean,
       default: false
@@ -92,6 +86,11 @@ export default {
         attrs['width'] = '100%'
       }
       return attrs
+    },
+
+    // 是否有自定义的footer
+    hasCustomFooter() {
+      return !!this.$slots['custom-footer']
     }
   }
 }