From 392f7a3134cb7a27a555bb1b3e2f3601c5eadde1 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 27 五月 2024 15:06:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/common/GlobalWindow.vue | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/admin/src/components/common/GlobalWindow.vue b/admin/src/components/common/GlobalWindow.vue
index c1d0c9c..359891b 100644
--- a/admin/src/components/common/GlobalWindow.vue
+++ b/admin/src/components/common/GlobalWindow.vue
@@ -21,6 +21,7 @@
<div v-if="withFooter" class="window__footer">
<slot name="footer">
<el-button @click="confirm" :loading="confirmWorking" type="primary">{{text}}</el-button>
+ <slot name="btns" />
<el-button @click="close">{{ backText }}</el-button>
</slot>
</div>
@@ -70,6 +71,7 @@
this.$emit('confirm')
},
close () {
+ this.$emit('close')
this.$emit('update:visible', false)
}
}
--
Gitblit v1.9.3