From 3a8223b71d18205d40b894fd0b4c0fa1ca773e86 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 13 十一月 2023 10:44:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdc-test' into mdc-test
---
src/components/jeecg/JVxeTable/components/JVxeToolbar.vue | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/components/jeecg/JVxeTable/components/JVxeToolbar.vue b/src/components/jeecg/JVxeTable/components/JVxeToolbar.vue
index 8d53634..578c981 100644
--- a/src/components/jeecg/JVxeTable/components/JVxeToolbar.vue
+++ b/src/components/jeecg/JVxeTable/components/JVxeToolbar.vue
@@ -10,6 +10,7 @@
<a-popconfirm
v-if="showRemove"
:title="`纭畾瑕佸垹闄よ繖 ${selectedRowIds.length} 椤瑰悧?`"
+ :disabled="disabled"
@confirm="trigger('remove')"
>
<a-button icon="minus" :disabled="disabled">鍒犻櫎</a-button>
@@ -54,7 +55,8 @@
},
btns() {
- let arr = this.toolbarConfig.btn || ['add', 'remove', 'clearSelection']
+ let {btn, btns} = this.toolbarConfig
+ let arr = btn || btns || ['add', 'remove', 'clearSelection']
let exclude = [...this.excludeCode]
// TODO 闇�瑕佸皢remove鏇挎崲batch_delete
// 绯荤粺榛樿鐨勬壒閲忓垹闄ょ紪鐮侀厤缃负 batch_delete 姝ゅ闇�瑕佽浆鍖栦竴涓�
--
Gitblit v1.9.3