From dc22358d8624d3f5a2c27ee6c27e0bdbfe705fe9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 20 五月 2024 11:21:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/common/GlobalWindow.vue | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/admin/src/components/common/GlobalWindow.vue b/admin/src/components/common/GlobalWindow.vue
index 298b468..359891b 100644
--- a/admin/src/components/common/GlobalWindow.vue
+++ b/admin/src/components/common/GlobalWindow.vue
@@ -21,7 +21,8 @@
<div v-if="withFooter" class="window__footer">
<slot name="footer">
<el-button @click="confirm" :loading="confirmWorking" type="primary">{{text}}</el-button>
- <el-button @click="close">杩斿洖</el-button>
+ <slot name="btns" />
+ <el-button @click="close">{{ backText }}</el-button>
</slot>
</div>
</el-drawer>
@@ -45,6 +46,10 @@
type: String,
default: '纭畾'
},
+ backText: {
+ type: String,
+ default: '杩斿洖'
+ },
// 纭鎸夐挳loading鐘舵��
confirmWorking: {
type: Boolean,
@@ -66,6 +71,7 @@
this.$emit('confirm')
},
close () {
+ this.$emit('close')
this.$emit('update:visible', false)
}
}
--
Gitblit v1.9.3