From 5046d0d13dc6a8563b8e54e31913bc44cfa1072f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 26 四月 2022 19:23:18 +0800
Subject: [PATCH] 2022-04-26
---
src/tabviews/zshare/actionList/excelInbutton/index.jsx | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/tabviews/zshare/actionList/excelInbutton/index.jsx b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
index dc4e82e..15dbb8b 100644
--- a/src/tabviews/zshare/actionList/excelInbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
@@ -43,7 +43,7 @@
if (btn.controlField && selectedData && selectedData.length > 0) { // 琛ㄦ牸涓寜閽殣钘忔帶鍒�
selectedData.forEach(item => {
- let s = item[btn.controlField] + ''
+ let s = item[btn.controlField] !== undefined ? item[btn.controlField] + '' : ''
if (s === btn.controlVal || (btn.controlVal && btn.controlVal.split(',').includes(s))) {
disabled = true
}
@@ -82,7 +82,7 @@
if (btn.controlField && !is(fromJS(nextProps.selectedData || []), fromJS(selectedData || []))) {
if (nextProps.selectedData && nextProps.selectedData.length > 0) { // 琛ㄦ牸涓寜閽殣钘忔帶鍒�
nextProps.selectedData.forEach(item => {
- let s = item[btn.controlField] + ''
+ let s = item[btn.controlField] !== undefined ? item[btn.controlField] + '' : ''
if (s === btn.controlVal || (btn.controlVal && btn.controlVal.split(',').includes(s))) {
disabled = true
}
@@ -191,7 +191,7 @@
execSuccess = (res) => {
const { btn } = this.props
- if (res && res.ErrCode === 'S') { // 鎵ц鎴愬姛
+ if (res && (res.ErrCode === 'S' || !res.ErrCode)) { // 鎵ц鎴愬姛
notification.success({
top: 92,
message: res.ErrMesg || this.state.dict['main.action.confirm.success'],
@@ -493,6 +493,7 @@
icon={btn.icon}
loading={loading}
disabled={disabled}
+ title={disabled ? (btn.reason || '') : ''}
className={'mk-btn mk-' + btn.class}
onClick={() => {this.actionTrigger()}}
>{btn.label}</Button>
@@ -518,7 +519,7 @@
return <div style={{display: 'inline-block'}} onClick={(e) => e.stopPropagation()}>
<Button
type="link"
- title={show === 'icon' ? btn.label : ''}
+ title={disabled ? (btn.reason || '') : (show === 'icon' ? btn.label : '')}
loading={loading}
disabled={disabled}
style={btn.style}
--
Gitblit v1.8.0