From 7442a435d058bd17d6fc679e1b7956bf3a5d32ae Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 17 八月 2023 22:36:11 +0800
Subject: [PATCH] 设备管理代码提交

---
 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