From 5330eb812cdcc02cace0648b008092b24c6e2236 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 06 十二月 2023 17:44:50 +0800
Subject: [PATCH] 1、利用率走势分析和利用率分段分析页面优化表格数据加载方式，实现滚动条触底加载，解决数据量较大时网页请求速度慢问题 2、报警分析页面调整图表样式，更换表格组件为ant-design表格 3、登录页面登录后若用户密码为初始密码或密码已过期则出现修改密码弹窗
---
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