From 4be1f58b940da6c5239e2fcf78f6b1180f66f555 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 14 九月 2024 13:54:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/common/GlobalWindow.vue | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/admin/src/components/common/GlobalWindow.vue b/admin/src/components/common/GlobalWindow.vue
index 64bcabe..4ae9ce1 100644
--- a/admin/src/components/common/GlobalWindow.vue
+++ b/admin/src/components/common/GlobalWindow.vue
@@ -20,7 +20,7 @@
</div>
<div v-if="withFooter" class="window__footer">
<slot name="footer">
- <el-button @click="confirm" :loading="confirmWorking" type="primary">{{text}}</el-button>
+ <el-button v-if="showConfirm" @click="confirm" :loading="confirmWorking" type="primary">{{text}}</el-button>
<slot name="btns" />
<el-button @click="close">{{ backText }}</el-button>
</slot>
@@ -55,6 +55,10 @@
type: Boolean,
default: false
},
+ showConfirm: {
+ type: Boolean,
+ default: true
+ },
// 鏍囬
title: {
type: String,
--
Gitblit v1.9.3