From bde2916433c7830e2879e6524e32b9f6c8bd0bab Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 02 一月 2022 16:31:32 +0800
Subject: [PATCH] 2022-01-02
---
src/tabviews/zshare/actionList/popupbutton/index.jsx | 71 ++++++++++++++++++++++++++++-------
1 files changed, 56 insertions(+), 15 deletions(-)
diff --git a/src/tabviews/zshare/actionList/popupbutton/index.jsx b/src/tabviews/zshare/actionList/popupbutton/index.jsx
index 0705de6..19e2982 100644
--- a/src/tabviews/zshare/actionList/popupbutton/index.jsx
+++ b/src/tabviews/zshare/actionList/popupbutton/index.jsx
@@ -1,12 +1,13 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Button, Modal, notification, Icon, Drawer } from 'antd'
+import { Button, Modal, notification, Drawer } from 'antd'
import asyncSpinComponent from '@/utils/asyncSpinComponent'
import zhCN from '@/locales/zh-CN/main.js'
import enUS from '@/locales/en-US/main.js'
import MKEmitter from '@/utils/events.js'
+import MkIcon from '@/components/mk-icon'
import './index.scss'
const SubTabTable = asyncSpinComponent(() => import('@/tabviews/subtabtable'))
@@ -15,7 +16,6 @@
class PopupButton extends Component {
static propTpyes = {
show: PropTypes.any, // 鎸夐挳鏄剧ず鏍峰紡鎺у埗
- position: PropTypes.any, // 鎸夐挳浣嶇疆锛屽伐鍏锋爮涓簍oolbar
BID: PropTypes.string, // 涓昏〃ID
BData: PropTypes.any, // 涓昏〃鏁版嵁
selectedData: PropTypes.any, // 瀛愯〃涓�夋嫨鏁版嵁
@@ -23,6 +23,7 @@
MenuID: PropTypes.string, // 鑿滃崟ID
btn: PropTypes.object, // 鎸夐挳
setting: PropTypes.any, // 椤甸潰閫氱敤璁剧疆
+ disabled: PropTypes.any, // 琛屾寜閽鐢�
}
state = {
@@ -31,11 +32,12 @@
popData: null,
primaryId: '',
disabled: false,
+ hidden: false,
loading: false,
}
UNSAFE_componentWillMount () {
- const { btn, selectedData } = this.props
+ const { btn, selectedData, BData } = this.props
let disabled = false
if (btn.controlField && selectedData && selectedData.length > 0) { // 琛ㄦ牸涓寜閽殣钘忔帶鍒�
@@ -45,7 +47,22 @@
disabled = true
}
})
- this.setState({disabled})
+ 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})
}
}
@@ -54,18 +71,17 @@
}
componentDidMount () {
- MKEmitter.addListener('popclose', this.popclose)
+ MKEmitter.addListener('popclose', this.syspopclose)
MKEmitter.addListener('triggerBtnId', this.actionTrigger)
MKEmitter.addListener('openNewTab', this.openNewTab)
MKEmitter.addListener('refreshPopButton', this.refreshPopButton)
}
UNSAFE_componentWillReceiveProps (nextProps) {
- const { btn, selectedData } = this.props
+ 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] + ''
@@ -74,7 +90,24 @@
}
})
}
- this.setState({disabled})
+ 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})
}
}
@@ -82,7 +115,7 @@
this.setState = () => {
return
}
- MKEmitter.removeListener('popclose', this.popclose)
+ MKEmitter.removeListener('popclose', this.syspopclose)
MKEmitter.removeListener('openNewTab', this.openNewTab)
MKEmitter.removeListener('triggerBtnId', this.actionTrigger)
MKEmitter.removeListener('refreshPopButton', this.refreshPopButton)
@@ -177,6 +210,12 @@
}
}
+ syspopclose = () => {
+ if (!this.state.visible) return
+
+ this.popclose()
+ }
+
/**
* @description 寮圭獥鍏抽棴
*/
@@ -209,7 +248,7 @@
className={'popview-modal ' + (btn.$view === 'CustomPage' ? 'custom-popview' : '')}
title={btn.label}
width={ratio}
- maskClosable={false}
+ maskClosable={btn.clickouter === 'close'}
visible={visible}
onCancel={this.popclose}
footer={[
@@ -250,10 +289,10 @@
return (
<Drawer
title={btn.label}
- className={btn.$view === 'CustomPage' ? 'custom-drawer-popview' : ''}
+ className={btn.$view === 'CustomPage' ? 'custom-drawer-popview' : 'table-drawer-popview'}
width={width}
height={height}
- maskClosable={false}
+ maskClosable={btn.clickouter === 'close'}
onClose={this.popclose}
visible={visible}
placement={btn.placement || 'right'}
@@ -279,7 +318,9 @@
render() {
const { btn, show } = this.props
- const { loading, disabled } = this.state
+ const { loading, disabled, hidden } = this.state
+
+ if (hidden) return null
let label = ''
let icon = ''
@@ -288,7 +329,7 @@
label = btn.label
icon = btn.icon || ''
} else if (show === 'link') {
- label = <span>{btn.label}{btn.icon ? <Icon style={{marginLeft: '8px'}} type={btn.icon}/> : ''}</span>
+ label = <span>{btn.label}{btn.icon ? <MkIcon style={{marginLeft: '8px'}} type={btn.icon}/> : ''}</span>
icon = ''
} else if (show === 'icon') {
icon = btn.icon || ''
--
Gitblit v1.8.0