From 4925a060c636417792a64f07c1b800e409cbd0cd Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 11 六月 2024 15:50:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/common/GlobalWindow.vue | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/admin/src/components/common/GlobalWindow.vue b/admin/src/components/common/GlobalWindow.vue
index 298b468..b3c01bd 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)
}
}
@@ -77,7 +83,7 @@
// 杈撳叆妗嗛珮搴�
$input-height: 32px;
.global-window {
- top: 80px !important;
+ top: 56px !important;
left: 250px !important;
// 澶撮儴鏍囬
::v-deep .el-drawer__header {
--
Gitblit v1.9.3