From 7c05649d5eba19fc5fdf4d120f106920d80341e3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 11 十月 2024 14:49:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/components/common/GlobalWindow.vue | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/admin/src/components/common/GlobalWindow.vue b/admin/src/components/common/GlobalWindow.vue
index b3c01bd..4ae9ce1 100644
--- a/admin/src/components/common/GlobalWindow.vue
+++ b/admin/src/components/common/GlobalWindow.vue
@@ -8,7 +8,7 @@
:close-on-press-escape="false"
:wrapper-closable="false"
:append-to-body="true"
- :modal="false"
+ :modal="true"
@close="close"
>
<div slot="title" class="window__header">
@@ -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