From bfadd84fbc2b23c59695e5a94778ab7ac40fea03 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期六, 26 六月 2021 22:54:17 +0800 Subject: [PATCH] 2021-06-26 --- src/tabviews/zshare/actionList/normalbutton/index.jsx | 113 +++++++++++++++++++++++++++++++++++++------------------- 1 files changed, 74 insertions(+), 39 deletions(-) diff --git a/src/tabviews/zshare/actionList/normalbutton/index.jsx b/src/tabviews/zshare/actionList/normalbutton/index.jsx index 2fc84a8..b4811e5 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 } from 'antd' import Api from '@/api' import Utils, { getSysDefaultSql } from '@/utils/utils.js' @@ -1691,46 +1691,81 @@ 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 }} + > + <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', 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() { -- Gitblit v1.8.0