From 6c66c9c2a6d0f7e7ccc65d4d9e478f1acb74d87e Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期五, 20 八月 2021 12:12:48 +0800 Subject: [PATCH] 2021-08-20 --- src/tabviews/zshare/actionList/normalbutton/index.jsx | 197 ++++++++++++++++++++++++++++++++++++------------- 1 files changed, 145 insertions(+), 52 deletions(-) diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx index 03857a3..8aac0c2 100644 --- a/src/tabviews/zshare/actionList/normalbutton/index.jsx +++ b/src/tabviews/zshare/actionList/normalbutton/index.jsx @@ -3,7 +3,7 @@ import moment from 'moment' import {connect} from 'react-redux' import { is, fromJS } from 'immutable' -import { Button, Modal, notification, message } from 'antd' +import { Button, Modal, notification, message, Drawer, Icon } from 'antd' import Api from '@/api' import Utils, { getSysDefaultSql } from '@/utils/utils.js' @@ -42,10 +42,26 @@ btnconfig: null, loading: false, loadingNumber: '', + disabled: false, checkParam: null } moduleParams = null + + UNSAFE_componentWillMount () { + const { btn, selectedData } = this.props + let disabled = false + + if (btn.controlField && selectedData && selectedData.length > 0) { // 琛ㄦ牸涓寜閽殣钘忔帶鍒� + selectedData.forEach(item => { + let s = item[btn.controlField] + '' + if (s === btn.controlVal || (btn.controlVal && btn.controlVal.split(',').includes(s))) { + disabled = true + } + }) + this.setState({disabled}) + } + } shouldComponentUpdate (nextProps, nextState) { return !is(fromJS(this.props), fromJS(nextProps)) || !is(fromJS(this.state), fromJS(nextState)) @@ -54,12 +70,29 @@ componentDidMount () { const { position } = this.props - if (position === 'toolbar') { - MKEmitter.addListener('triggerBtnId', this.actionTrigger) - } else if (position === 'form') { + MKEmitter.addListener('triggerBtnId', this.actionTrigger) + if (position === 'form') { MKEmitter.addListener('triggerFormSubmit', this.actionSubmit) } MKEmitter.addListener('returnModuleParam', this.resetModuleParam) + } + + UNSAFE_componentWillReceiveProps (nextProps) { + const { btn, selectedData } = this.props + + 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] + '' + if (s === btn.controlVal || (btn.controlVal && btn.controlVal.split(',').includes(s))) { + disabled = true + } + }) + } + this.setState({disabled}) + } } componentWillUnmount () { @@ -832,7 +865,7 @@ }) Api.directRequest(url, btn.method, param, btn.cross).then(res => { - if (typeof(res) !== 'object' || Array.isArray(res)) { + if (typeof(res) !== 'object') { let error = '鏈煡鐨勮繑鍥炵粨鏋滐紒' if (typeof(res) === 'string') { @@ -847,6 +880,9 @@ this.customCallbackRequest(params, result, record, _resolve) } else { + if (Array.isArray(res)) { + res = { data: res } + } res.mk_api_key = mkey this.customCallbackRequest(params, res, record, _resolve) } @@ -1287,6 +1323,7 @@ let _param = { templatecode: verify.noteCode, // 妯℃澘缂栫爜 TypeCharOne: verify.noteTemp, // N涓嶅悓鍐呭锛孻鐩稿悓鍐呭 + ID: verify.noteId || '' // 妯℃澘Id锛屾殏鏃舵湭浣跨敤 } _param.submitdate = res.submitdate @@ -1351,10 +1388,12 @@ _param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss') _param.secretkey = Utils.encrypt(_param.LText, _param.timestamp) - _param.rduri = 'http://sso.mk9h.cn/webapi/dostar' - _param.appkey = window.GLOB.appkey || '' + _param.rduri = 'http://sso.mk9h.cn/webapi/dostars' - Api.dostarInterface(_param).then(result => { + _param.userid = 'bh0bapabtd45epsgra79segbch6c1ibk' + _param.LoginUID = 'bh0bapabtd45epsgra79segbch6c1ibk' + + Api.getLocalConfig(_param).then(result => { if (!result.status) { notification.warning({ top: 92, @@ -1654,51 +1693,87 @@ let title = btnconfig.setting.title let width = btnconfig.setting.width + 'vw' - let clickouter = false - let container = document.body + let clickouter = btnconfig.setting.clickouter === 'close' - if ( - (setting.tabType === 'main' && btnconfig.setting.container === 'tab' && this.props.ContainerId) || - (btnconfig.setting.container === 'tab' && btn.ContainerId) - ) { - width = btnconfig.setting.width + '%' - container = () => document.getElementById(this.props.ContainerId || btn.ContainerId) + if (btnconfig.setting.display === 'drawer') { + let height = '100vh' + if (btnconfig.setting.placement === 'top' || btnconfig.setting.placement === 'bottom') { + width = '100vw' + height = btnconfig.setting.width + 'vh' + } + return ( + <Drawer + title={title} + width={width} + height={height} + maskClosable={clickouter} + onClose={this.handleCancel} + visible={visible} + placement={btnconfig.setting.placement || 'right'} + bodyStyle={{ paddingBottom: 80 }} + destroyOnClose + > + <MutilForm + BID={BID} + dict={this.state.dict} + menuType={this.props.menuType} + action={btnconfig} + inputSubmit={this.handleOk} + data={this.state.tabledata[0]} + BData={this.props.BData} + wrappedComponentRef={(inst) => this.formRef = inst} + /> + <div style={{ position: 'absolute', zIndex: 1, right: 0, bottom: 0, width: '100%', borderTop: '1px solid #e9e9e9', padding: '10px 16px', background: '#fff', textAlign: 'right'}}> + <Button onClick={this.handleCancel} style={{ marginRight: 8 }}> + 鍙栨秷 + </Button> + <Button onClick={this.handleOk} loading={this.state.confirmLoading} type="primary"> + 纭畾 + </Button> + </div> + </Drawer> + ) + } else { + let container = document.body + + if ( + (setting.tabType === 'main' && btnconfig.setting.container === 'tab' && this.props.ContainerId) || + (btnconfig.setting.container === 'tab' && btn.ContainerId) + ) { + width = btnconfig.setting.width + '%' + container = () => document.getElementById(this.props.ContainerId || btn.ContainerId) + } + return ( + <Modal + title={title} + maskClosable={clickouter} + getContainer={container} + wrapClassName='action-modal' + visible={visible} + width={width} + onOk={this.handleOk} + confirmLoading={this.state.confirmLoading} + onCancel={this.handleCancel} + destroyOnClose + > + <MutilForm + BID={BID} + dict={this.state.dict} + menuType={this.props.menuType} + action={btnconfig} + inputSubmit={this.handleOk} + data={this.state.tabledata[0]} + BData={this.props.BData} + wrappedComponentRef={(inst) => this.formRef = inst} + /> + </Modal> + ) } - - if (btnconfig.setting.clickouter === 'close') { - clickouter = true - } - - return ( - <Modal - title={title} - maskClosable={clickouter} - getContainer={container} - wrapClassName='action-modal' - visible={visible} - width={width} - onOk={this.handleOk} - confirmLoading={this.state.confirmLoading} - onCancel={this.handleCancel} - destroyOnClose - > - <MutilForm - BID={BID} - dict={this.state.dict} - menuType={this.props.menuType} - action={btnconfig} - inputSubmit={this.handleOk} - data={this.state.tabledata[0]} - BData={this.props.BData} - wrappedComponentRef={(inst) => this.formRef = inst} - /> - </Modal> - ) } render() { const { btn, show, style } = this.props - const { loadingNumber, loading, visible } = this.state + const { loadingNumber, loading, disabled } = this.state if (show === 'actionList') { return <div style={{display: 'inline-block'}} onClick={(e) => e.stopPropagation()}> @@ -1706,10 +1781,11 @@ style={style} icon={btn.icon} loading={loading} + disabled={disabled} className={'mk-btn mk-' + btn.class} onClick={() => {this.actionTrigger()}} >{(loadingNumber ? `(${loadingNumber})` : '') + btn.label}</Button> - {visible ? this.getModels() : null} + {this.getModels()} </div> } else if (show && show.indexOf('plus') > -1) { return <div className="mk-btn-wrap"> @@ -1720,19 +1796,36 @@ style={{fontSize: show.substring(4) + 'px'}} onClick={() => {this.actionTrigger()}} ></Button> - {visible ? this.getModels() : null} + {this.getModels()} </div> } else { // icon銆乼ext銆� all 鍗$墖 + let label = '' + let icon = '' + + if (show === 'button') { + label = btn.label + icon = btn.icon || '' + } else if (show === 'link') { + label = <span>{btn.label}{btn.icon ? <Icon style={{marginLeft: '8px'}} type={btn.icon}/> : ''}</span> + icon = '' + } else if (show === 'icon') { + icon = btn.icon || '' + // } else if (show === 'text') { + } else { + label = btn.label + } + return <div style={{display: 'inline-block'}} onClick={(e) => e.stopPropagation()}> <Button type="link" title={show === 'icon' ? btn.label : ''} loading={loading} + disabled={disabled} style={btn.style || style} - icon={show === 'text' ? '' : (btn.icon || '')} + icon={icon} onClick={() => {this.actionTrigger()}} - >{show === 'icon' && btn.icon ? '' : btn.label}</Button> - {visible ? this.getModels() : null} + >{label}</Button> + {this.getModels()} </div> } } -- Gitblit v1.8.0