From 79e4981aa6cc9354276fc54cdf6d14eb08ab7fee Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期四, 22 六月 2023 15:59:04 +0800 Subject: [PATCH] Merge branch 'develop' of ssh://121.36.20.145:29418/~jinfei/pc-plat into develop --- src/tabviews/custom/components/table/edit-table/normalTable/index.jsx | 134 ++++++++++++++++++++++++++------------------ 1 files changed, 79 insertions(+), 55 deletions(-) diff --git a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx index 2b09bfb..a38bb09 100644 --- a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx +++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx @@ -2,21 +2,19 @@ import PropTypes from 'prop-types' import { is, fromJS } from 'immutable' import { Table, Typography, Modal, Input, InputNumber, Button, notification, message, Select } from 'antd' -import { EditOutlined } from '@ant-design/icons' +import { EditOutlined, QuestionCircleOutlined } from '@ant-design/icons' import moment from 'moment' import Api from '@/api' import asyncComponent from '@/utils/asyncComponent' import Utils, { getEditTableSql, getMark } from '@/utils/utils.js' -import MkIcon from '@/components/mk-icon' import MKEmitter from '@/utils/events.js' -import zhCN from '@/locales/zh-CN/main.js' -import enUS from '@/locales/en-US/main.js' import CusSwitch from './cusSwitch' import Encrypts from '@/components/encrypts' import './index.scss' const { Paragraph } = Typography +const MkIcon = asyncComponent(() => import('@/components/mk-icon')) const CardCellComponent = asyncComponent(() => import('@/tabviews/custom/components/card/cardcellList')) class BodyRow extends React.Component { @@ -121,7 +119,7 @@ this.setState({editing: false}) setTimeout(() => { - if (col.enter === '$next') { + if (/\$next/.test(col.enter)) { MKEmitter.emit('nextLine', col, record.$$uuid) } else if (col.enter === '$sub') { MKEmitter.emit('subLine', col, record) @@ -210,7 +208,7 @@ this.setState({editing: false}) setTimeout(() => { - if (col.enter === '$next') { + if (/\$next/.test(col.enter)) { MKEmitter.emit('nextLine', col, record.$$uuid) } else if (col.enter === '$sub') { MKEmitter.emit('subLine', col, record) @@ -242,7 +240,7 @@ this.setState({editing: false}) setTimeout(() => { - if (col.enter === '$next') { + if (/\$next/.test(col.enter)) { MKEmitter.emit('nextLine', col, record.$$uuid) } else if (col.enter === '$sub') { MKEmitter.emit('subLine', col, record) @@ -544,7 +542,7 @@ this.onBlur() setTimeout(() => { - if (col.enter === '$next') { + if (/\$next/.test(col.enter)) { MKEmitter.emit('nextLine', col, record.$$uuid) } else if (col.enter === '$sub') { MKEmitter.emit('subLine', col, record) @@ -604,7 +602,7 @@ const { col, record } = this.props setTimeout(() => { - if (col.enter === '$next') { + if (/\$next/.test(col.enter)) { MKEmitter.emit('nextLine', col, record.$$uuid) } else if (col.enter === '$sub') { MKEmitter.emit('subLine', col, record) @@ -640,7 +638,7 @@ } setTimeout(() => { - if (col.enter === '$next') { + if (/\$next/.test(col.enter)) { MKEmitter.emit('nextLine', col, record.$$uuid) } else if (col.enter === '$sub') { MKEmitter.emit('subLine', col, record) @@ -910,7 +908,6 @@ } state = { - dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS, edData: [], selectedRowKeys: [], // 琛ㄦ牸涓�変腑琛� tableId: '', // 琛ㄦ牸ID @@ -921,7 +918,9 @@ orderfields: {}, // 鎺掑簭id涓巉ield杞崲 loading: false, pageOptions: [], - deForms: null + deForms: null, + visible: false, + midData: null } UNSAFE_componentWillMount () { @@ -1077,23 +1076,18 @@ } transferData = (menuid, data, type) => { - const { MenuID, setting } = this.props + const { MenuID } = this.props + const { edData } = this.state if (menuid !== MenuID) return if (type !== 'line') { - if (setting.editType === 'multi' && data.length > 0) { - this.setState({edData: []}, () => { - this.setState({edData: data}) - }) - } else { - this.setState({edData: data}) - } + let index = edData.findIndex(item => !item.$origin && !item.$forbid) - if (setting.addable && data.length === 0) { - setTimeout(() => { - this.plusLine(true) - }, 10) + if (index > -1) { + this.setState({visible: true, midData: data}) + } else { + this.updateMutil(data) } } else if (type === 'line') { let _edData = this.state.edData.map(item => { @@ -1105,6 +1099,24 @@ }) this.setState({edData: _edData}) + } + } + + updateMutil = (data) => { + const { setting } = this.props + + if (setting.editType === 'multi' && data.length > 0) { + this.setState({edData: []}, () => { + this.setState({edData: data, visible: false, midData: null}) + }) + } else { + this.setState({edData: data, visible: false, midData: null}) + } + + if (setting.addable && data.length === 0) { + setTimeout(() => { + this.plusLine(true) + }, 10) } } @@ -1300,7 +1312,12 @@ let next = edData[index + 1] || null if (next) { - let node = document.getElementById(setting.initId + next.$$uuid) + let nextId = setting.initId + next.$$uuid + if (/^\$next_/.test(col.enter)) { + nextId = col.enter.split('_')[1] + next.$$uuid + } + + let node = document.getElementById(nextId) if (node) { if (setting.editType === 'multi') { if (setting.triType === 'click') { @@ -1595,6 +1612,8 @@ const { submit, BID, setting } = this.props const { forms } = this.state + this.setState({visible: false, midData: null}) + if (setting.supModule && !BID) { notification.warning({ top: 92, @@ -1670,44 +1689,36 @@ } } - updataLine = (item) => { - if (item.$type === 'del') { - let _data = this.state.edData.filter(m => m.$$uuid !== item.$$uuid) - - this.setState({edData: _data}) - } else { - let _data = this.state.edData.map(m => { - if (m.$$uuid === item.$$uuid) { - item.$origin = true - return item - } - return m - }) - - this.setState({edData: _data}) - } - MKEmitter.emit('reloadData', this.props.MenuID, item.$$uuid, item) - } - execSuccess = (res) => { const { submit } = this.props + const { edData } = this.state if (res && res.ErrCode === 'S') { // 鎵ц鎴愬姛 notification.success({ top: 92, - message: res.ErrMesg || this.state.dict['main.action.confirm.success'], + message: res.ErrMesg || '鎵ц鎴愬姛', duration: submit.stime ? submit.stime : 2 }) } else if (res && res.ErrCode === 'Y') { // 鎵ц鎴愬姛 Modal.success({ - title: res.ErrMesg || this.state.dict['main.action.confirm.success'] + title: res.ErrMesg || '鎵ц鎴愬姛' }) } else if (res && res.ErrCode === '-1') { // 瀹屾垚鍚庝笉鎻愮ず } + let _edData = fromJS(edData).toJS() + + _edData = _edData.map(item => { + if (!item.$forbid) { + item.$origin = true + } + return item + }) + this.setState({ - loading: false + loading: false, + edData: _edData }) if (submit.closetab === 'true') { @@ -1717,6 +1728,8 @@ if (submit.execSuccess !== 'never') { MKEmitter.emit('refreshByButtonResult', submit.$menuId, submit.execSuccess, submit) } + + submit.syncComponentId && MKEmitter.emit('reloadData', submit.syncComponentId) } execError = (res) => { @@ -1854,7 +1867,7 @@ render() { const { setting, lineMarks, submit } = this.props - const { tableId, edData, columns, loading, pageOptions, selectedRowKeys } = this.state + const { tableId, edData, columns, loading, pageOptions, selectedRowKeys, visible, midData } = this.state const components = { body: { @@ -1863,7 +1876,6 @@ } } - // 鏁版嵁鏀惰捣鏃讹紝杩囨护宸查�夋暟鎹� let _data = edData.filter(item => !item.$deleted) // 璁剧疆琛ㄦ牸閫夋嫨灞炴�э細鍗曢�夈�佸閫夈�佷笉鍙�� @@ -1888,8 +1900,6 @@ } } - let _footer = '' - let height = setting.height || false if (height && height <= 100) { height = height + 'vh' @@ -1897,9 +1907,9 @@ return ( <> - <div className="edit-custom-table-btn-wrap" style={submit.wrapStyle}> + {setting.hasSubmit ? <div className="edit-custom-table-btn-wrap" style={submit.wrapStyle}> <Button style={submit.style} onClick={() => setTimeout(() => {this.submit()}, 10)} loading={loading} className="submit-table" type="link">鎻愪氦</Button> - </div> + </div> : null} <div className={`edit-custom-table ${setting.tableHeader || ''} ${height ? 'fixed-height' : ''} ${setting.mode || ''} table-vertical-${setting.vertical || ''} mk-edit-${setting.editType || 'simple'}`} id={tableId}> <Table rowKey="$$uuid" @@ -1922,9 +1932,23 @@ onChange={this.changeTable} pagination={_pagination} /> - {_footer ? <div className={'normal-table-footer ' + (_pagination ? 'pagination' : '')}>{_footer}</div> : null} - {_data.length > 10 ? <Button style={submit.style} onClick={() => setTimeout(() => {this.submit()}, 10)} loading={loading} className="submit-footer-table" type="link">鎻愪氦</Button> : null} + {setting.hasSubmit && _data.length > 10 ? <Button style={submit.style} onClick={() => setTimeout(() => {this.submit()}, 10)} loading={loading} className="submit-footer-table" type="link">鎻愪氦</Button> : null} </div> + <Modal + className="mk-user-confirm" + visible={visible} + width={450} + maskClosable={false} + closable={false} + footer={[ + <Button key="cancel" onClick={() => { this.setState({ visible: false, midData: null }) }}>鍙栨秷</Button>, + <Button key="refresh" className="table-refresh" onClick={() => { midData && this.updateMutil(midData) }}>鍒锋柊琛ㄦ牸</Button>, + <Button key="confirm" type="primary" onClick={() => setTimeout(() => {this.submit()}, 10)}>鎻愪氦鏁版嵁</Button> + ]} + destroyOnClose + > + <div><QuestionCircleOutlined />琛ㄦ牸涓湁鏁版嵁灏氭湭鎻愪氦</div> + </Modal> </> ) } -- Gitblit v1.8.0