From c2580fb8de3bdaabb4179b0ce0fcd2fbac802441 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 01 三月 2023 00:49:14 +0800
Subject: [PATCH] 2023-03-01
---
src/tabviews/zshare/actionList/popupbutton/index.jsx | 137 +++++++++++++++++++++++++++------------------
1 files changed, 81 insertions(+), 56 deletions(-)
diff --git a/src/tabviews/zshare/actionList/popupbutton/index.jsx b/src/tabviews/zshare/actionList/popupbutton/index.jsx
index 9be39f6..43b9afa 100644
--- a/src/tabviews/zshare/actionList/popupbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/popupbutton/index.jsx
@@ -12,17 +12,17 @@
const SubTabTable = asyncSpinComponent(() => import('@/tabviews/subtabtable'))
const CustomPage = asyncSpinComponent(() => import('@/tabviews/custom'))
+const PopView = asyncSpinComponent(() => import('@/tabviews/custom/popview'))
class PopupButton extends Component {
static propTpyes = {
- show: PropTypes.any, // 鎸夐挳鏄剧ず鏍峰紡鎺у埗
BID: PropTypes.string, // 涓昏〃ID
BData: PropTypes.any, // 涓昏〃鏁版嵁
selectedData: PropTypes.any, // 瀛愯〃涓�夋嫨鏁版嵁
- Tab: PropTypes.any, // 濡傛灉褰撳墠鍏冪礌涓烘爣绛炬椂锛宼ab涓烘爣绛句俊鎭�
MenuID: PropTypes.string, // 鑿滃崟ID
btn: PropTypes.object, // 鎸夐挳
setting: PropTypes.any, // 椤甸潰閫氱敤璁剧疆
+ disabled: PropTypes.any, // 琛屾寜閽鐢�
}
state = {
@@ -36,17 +36,32 @@
}
UNSAFE_componentWillMount () {
- const { btn, selectedData } = this.props
+ const { btn, selectedData, BData } = this.props
let disabled = false
- if (btn.controlField && selectedData && selectedData.length > 0) { // 琛ㄦ牸涓寜閽殣钘忔帶鍒�
+ if (btn.control !== 'parent' && 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'})
+ } else if (btn.control === 'parent') {
+ if (!BData || !BData.hasOwnProperty(btn.controlField)) {
+ this.setState({hidden: true})
+ } else {
+ let s = BData[btn.controlField] + ''
+ if (s === btn.controlVal || (btn.controlVal && btn.controlVal.split(',').includes(s))) {
+ this.setState({hidden: true})
+ } else {
+ this.setState({hidden: false})
+ }
+ }
+ }
+
+ if (this.props.disabled || disabled) {
+ this.setState({disabled: true})
}
}
@@ -62,20 +77,36 @@
}
UNSAFE_componentWillReceiveProps (nextProps) {
- const { btn, selectedData } = this.props
+ const { btn, selectedData, BData } = this.props
- if (btn.controlField && !is(fromJS(nextProps.selectedData || []), fromJS(selectedData || []))) {
- let disabled = false
-
+ let disabled = false
+ if (btn.control !== 'parent' && 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
}
})
}
- this.setState({disabled, hidden: disabled && btn.control === 'hidden'})
+ this.setState({hidden: disabled && btn.control === 'hidden'})
+ } else if (btn.control === 'parent' && !is(fromJS(nextProps.BData || {}), fromJS(BData || {}))) {
+ if (!nextProps.BData || !nextProps.BData.hasOwnProperty(btn.controlField)) {
+ this.setState({hidden: true})
+ } else {
+ let s = nextProps.BData[btn.controlField] + ''
+ if (s === btn.controlVal || (btn.controlVal && btn.controlVal.split(',').includes(s))) {
+ this.setState({hidden: true})
+ } else {
+ this.setState({hidden: false})
+ }
+ }
+ }
+
+ if (nextProps.disabled || disabled) {
+ this.setState({disabled: true})
+ } else {
+ this.setState({disabled: false})
}
}
@@ -121,22 +152,21 @@
* @description 瑙﹀彂鎸夐挳鎿嶄綔
*/
actionTrigger = (triggerId, record, type) => {
- const { setting, Tab, BID, btn, selectedData } = this.props
+ const { setting, BID, btn, selectedData } = this.props
const { loading, disabled } = this.state
- if ((triggerId && btn.uuid !== triggerId) || loading || disabled) return
+ if (loading || disabled) return
+ if (triggerId && btn.uuid !== triggerId) return
- if (((Tab && Tab.supMenu) || setting.supModule) && !BID) {
+ if (setting.supModule && !BID) {
notification.warning({
top: 92,
message: '闇�瑕佷笂绾т富閿�硷紒',
duration: 5
})
return
- } else if (type === 'linkbtn' && selectedData && selectedData.length === 1) {
- if (record[0].$Index !== selectedData[0].$Index) {
- return
- }
+ } else if (type === 'linkbtn' && !btn.$toolbtn && !is(fromJS(selectedData || []), fromJS(record))) {
+ return
}
let data = record || selectedData || []
@@ -145,7 +175,7 @@
// 闇�瑕侀�夋嫨鍗曡鏃讹紝鏍￠獙鏁版嵁
notification.warning({
top: 92,
- message: this.state.dict['main.action.confirm.selectSingleLine'],
+ message: data.length === 0 ? '璇烽�夋嫨琛岋紒' : '璇烽�夋嫨鍗曡鏁版嵁锛�',
duration: 5
})
return
@@ -198,6 +228,8 @@
if (btn.popClose !== 'never') {
MKEmitter.emit('refreshByButtonResult', btn.$menuId, btn.popClose, btn)
}
+
+ btn.syncComponentId && MKEmitter.emit('reloadData', btn.syncComponentId)
}
getPop = () => {
@@ -213,7 +245,7 @@
ratio = ratio + 'vw'
}
return <Modal
- className={'popview-modal ' + (btn.$view === 'CustomPage' ? 'custom-popview' : '')}
+ wrapClassName={'popview-modal ' + (!btn.$view ? '' : 'custom-popview')}
title={btn.label}
width={ratio}
maskClosable={btn.clickouter === 'close'}
@@ -224,14 +256,9 @@
]}
destroyOnClose
>
- {btn.$view !== 'CustomPage' ? <SubTabTable
- Tab={btn}
- MenuID={btn.linkTab}
- SupMenuID={this.props.MenuID}
- BID={popData ? primaryId : this.props.BID}
- BData={popData || this.props.BData}
- /> : null}
- {btn.$view === 'CustomPage' ? <CustomPage Tab={btn} MenuID={btn.uuid} param={{$BID: (popData ? primaryId : this.props.BID), ...(popData || this.props.BData || {})}} /> : null}
+ {!btn.$view ? <SubTabTable Tab={btn} MenuID={btn.linkTab} SupMenuID={this.props.MenuID} BID={popData ? primaryId : this.props.BID} BData={popData || this.props.BData}/> : null}
+ {btn.$view === 'CustomPage' ? <CustomPage Tab={btn} MenuID={btn.uuid} MenuName={btn.label} param={{$BID: (popData ? primaryId : this.props.BID), ...(popData || this.props.BData || {})}} /> : null}
+ {btn.$view === 'popview' ? <PopView Tab={btn} param={{$BID: (popData ? primaryId : this.props.BID), ...(popData || this.props.BData || {})}} /> : null}
</Modal>
} else {
let height = '100vh'
@@ -257,7 +284,7 @@
return (
<Drawer
title={btn.label}
- className={btn.$view === 'CustomPage' ? 'custom-drawer-popview' : ''}
+ className={!btn.$view ? 'table-drawer-popview' : 'custom-drawer-popview' }
width={width}
height={height}
maskClosable={btn.clickouter === 'close'}
@@ -266,14 +293,9 @@
placement={btn.placement || 'right'}
destroyOnClose
>
- {btn.$view !== 'CustomPage' ? <SubTabTable
- Tab={btn}
- MenuID={btn.linkTab}
- SupMenuID={this.props.MenuID}
- BID={popData ? primaryId : this.props.BID}
- BData={popData || this.props.BData}
- /> : null}
+ {!btn.$view ? <SubTabTable Tab={btn} MenuID={btn.linkTab} SupMenuID={this.props.MenuID} BID={popData ? primaryId : this.props.BID} BData={popData || this.props.BData}/> : null}
{btn.$view === 'CustomPage' ? <CustomPage Tab={btn} MenuName={btn.label} MenuID={btn.uuid} param={{$BID: (popData ? primaryId : this.props.BID), ...(popData || this.props.BData || {})}} /> : null}
+ {btn.$view === 'popview' ? <PopView Tab={btn} param={{$BID: (popData ? primaryId : this.props.BID), ...(popData || this.props.BData || {})}} /> : null}
<div className="close-drawer">
<Button onClick={this.popclose}>
鍏抽棴
@@ -285,46 +307,49 @@
}
render() {
- const { btn, show } = this.props
+ const { btn } = this.props
const { loading, disabled, hidden } = this.state
if (hidden) return null
let label = ''
let icon = ''
+ let type = 'link'
+ let className = ''
- if (show === 'button') {
+ if (btn.show === 'button') {
label = btn.label
icon = btn.icon || ''
- } else if (show === 'link') {
+ } else if (btn.show === 'link') {
label = <span>{btn.label}{btn.icon ? <MkIcon style={{marginLeft: '8px'}} type={btn.icon}/> : ''}</span>
icon = ''
- } else if (show === 'icon') {
+ } else if (btn.show === 'icon') {
icon = btn.icon || ''
- } else {
+ } else if (!btn.$toolbtn) {
+ icon = btn.icon || ''
label = btn.label
+ className = 'mk-btn mk-' + btn.class
+ } else {
+ type = ''
+ icon = btn.icon || ''
+ label = btn.label
+ className = 'mk-btn mk-' + btn.class
}
return (
- <div style={{display: 'inline-block'}} onClick={(e) => e.stopPropagation()}>
- {show === 'actionList' ? <Button
- className={'mk-btn mk-' + btn.class}
- icon={btn.icon}
- disabled={disabled}
- onClick={() => {this.actionTrigger()}}
- loading={loading}
- >{btn.label}</Button> : null}
- {show !== 'actionList' ? <Button
- type="link"
- title={show === 'icon' ? btn.label : ''}
+ <>
+ <Button
+ type={type}
+ title={disabled ? (btn.reason || '') : (btn.show === 'icon' ? btn.label : '')}
loading={loading}
disabled={disabled}
style={btn.style}
icon={icon}
- onClick={() => {this.actionTrigger()}}
- >{label}</Button> : null}
- {this.getPop()}
- </div>
+ className={className}
+ onClick={(e) => {e.stopPropagation(); this.actionTrigger()}}
+ >{label}</Button>
+ <span onClick={(e) => {e.stopPropagation()}} onDoubleClick={(e) => {e.stopPropagation()}}>{this.getPop()}</span>
+ </>
)
}
}
--
Gitblit v1.8.0