From b6cbfb08b51e87e6eac995be8e7751815715e6a1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 29 三月 2022 15:36:21 +0800
Subject: [PATCH] 2022-03-29
---
src/tabviews/zshare/actionList/excelInbutton/index.jsx | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/src/tabviews/zshare/actionList/excelInbutton/index.jsx b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
index c146924..15dbb8b 100644
--- a/src/tabviews/zshare/actionList/excelInbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/excelInbutton/index.jsx
@@ -24,6 +24,8 @@
Tab: PropTypes.any, // 濡傛灉褰撳墠鍏冪礌涓烘爣绛炬椂锛宼ab涓烘爣绛句俊鎭�
btn: PropTypes.object, // 鎸夐挳
setting: PropTypes.any, // 椤甸潰閫氱敤璁剧疆
+ disabled: PropTypes.any, // 琛屾寜閽鐢�
+ lineId: PropTypes.any, // 琛岀储寮�+涓婚敭鍊硷紝鐢ㄤ簬琛屾寜閽弻鍑�
}
state = {
@@ -41,12 +43,12 @@
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
}
})
- this.setState({disabled, hidden: disabled && btn.control === 'hidden'})
+ this.setState({hidden: disabled && btn.control === 'hidden'})
} else if (btn.control === 'parent') {
if (!BData || !BData.hasOwnProperty(btn.controlField)) {
this.setState({hidden: true})
@@ -58,6 +60,10 @@
this.setState({hidden: false})
}
}
+ }
+
+ if (this.props.disabled || disabled) {
+ this.setState({disabled: true})
}
}
@@ -72,12 +78,11 @@
UNSAFE_componentWillReceiveProps (nextProps) {
const { btn, selectedData, BData } = this.props
+ let disabled = false
if (btn.controlField && !is(fromJS(nextProps.selectedData || []), fromJS(selectedData || []))) {
- let disabled = false
-
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
}
@@ -96,6 +101,12 @@
}
}
}
+
+ if (nextProps.disabled || disabled) {
+ this.setState({disabled: true})
+ } else {
+ this.setState({disabled: false})
+ }
}
componentWillUnmount () {
@@ -112,7 +123,13 @@
const { setting, Tab, BID, btn, selectedData } = this.props
const { loading, disabled } = this.state
- if ((triggerId && btn.uuid !== triggerId) || loading || disabled) return
+ if (loading || disabled) return
+ if (triggerId) {
+ if (btn.uuid !== triggerId) return
+ if (this.props.lineId && record && record[0] && this.props.lineId !== record[0].$$key) {
+ return
+ }
+ }
if (((Tab && Tab.supMenu) || setting.supModule) && !BID) {
notification.warning({
@@ -174,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'],
@@ -476,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>
@@ -501,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