From 3b103caa6bfc9ed410e67156c3ca1785bf1cecc9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 19 八月 2022 01:15:31 +0800
Subject: [PATCH] 2022-08-19
---
src/tabviews/custom/components/table/edit-table/normalTable/index.jsx | 846 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 752 insertions(+), 94 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 987b60d..f2461f4 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
@@ -138,7 +138,9 @@
setTimeout(() => {
if (col.enter === '$next') {
MKEmitter.emit('nextLine', col, record.$$uuid)
- } else {
+ } else if (col.enter === '$sub') {
+ MKEmitter.emit('subLine', col, record)
+ } else if (col.enter !== '$noAct') {
MKEmitter.emit('tdFocus', col.enter + record.$$uuid)
}
}, 50)
@@ -213,7 +215,7 @@
this.setState({value: val, err})
}
- onSwitchChange = (val) => {
+ onSwitchChange = (val, label) => {
const { col, record } = this.props
this.setState({editing: false})
@@ -221,12 +223,22 @@
setTimeout(() => {
if (col.enter === '$next') {
MKEmitter.emit('nextLine', col, record.$$uuid)
- } else {
+ } else if (col.enter === '$sub') {
+ MKEmitter.emit('subLine', col, record)
+ } else if (col.enter !== '$noAct') {
MKEmitter.emit('tdFocus', col.enter + record.$$uuid)
}
}, 50)
- MKEmitter.emit('changeRecord', col.tableId, {...record, [col.field]: val})
+ let values = {}
+ if (col.editField) {
+ values[col.field] = label
+ values[col.editField] = val
+ } else {
+ values[col.field] = val
+ }
+
+ MKEmitter.emit('changeRecord', col.tableId, {...record, ...values})
}
onSelectChange = (val, option) => {
@@ -255,7 +267,9 @@
setTimeout(() => {
if (col.enter === '$next') {
MKEmitter.emit('nextLine', col, record.$$uuid)
- } else {
+ } else if (col.enter === '$sub') {
+ MKEmitter.emit('subLine', col, record)
+ } else if (col.enter !== '$noAct') {
MKEmitter.emit('tdFocus', col.enter + record.$$uuid)
}
}, 50)
@@ -270,8 +284,10 @@
}
render() {
- let { col, config, record, style, className } = this.props
+ let { col, config, record, style, className, ...resProps } = this.props
const { editing, value, err } = this.state
+
+ if (!col) return (<td {...resProps} className={className} style={style}/>)
let children = null
if (col.type === 'text') {
@@ -297,10 +313,12 @@
if (mark.icon) {
if (mark.position === 'front') {
- content = <span><MkIcon style={{color: mark.color}} type={mark.icon} /> {content}</span>
+ content = <span><MkIcon style={mark.innerStyle} type={mark.icon} /> {content}</span>
} else {
- content = <span>{content} <MkIcon style={{color: mark.color}} type={mark.icon} /></span>
+ content = <span>{content} <MkIcon style={mark.innerStyle} type={mark.icon} /></span>
}
+ } else if (mark.innerStyle) {
+ content = <span style={mark.innerStyle}>{content}</span>
}
}
@@ -312,16 +330,28 @@
{err ? <Tooltip title={err}><ExclamationCircleOutlined /></Tooltip> : null}
</td>)
} else if (col.editType === 'switch') {
- let _value = record[col.field] !== undefined ? record[col.field] : ''
+ let _value = ''
+ if (col.editField) {
+ _value = record[col.editField] !== undefined ? record[col.editField] : ''
+ } else {
+ _value = record[col.field] !== undefined ? record[col.field] : ''
+ }
return (<td className="editing_table_cell">
- <CusSwitch config={col} defaultValue={_value} onChange={this.onSwitchChange} onBlur={this.switchBlur}/>
+ <CusSwitch config={col} defaultValue={_value} autoFocus={true} onChange={this.onSwitchChange} onBlur={this.switchBlur}/>
</td>)
} else {
- let _value = record[col.field] !== undefined ? record[col.field] : ''
+ let _value = ''
+ if (col.editField) {
+ _value = record[col.editField] !== undefined ? record[col.editField] : ''
+ } else {
+ _value = record[col.field] !== undefined ? record[col.field] : ''
+ }
return (<td className="editing_table_cell">
<Select
showSearch
defaultValue={_value}
+ dropdownClassName="edit-table-dropdown"
+ dropdownMatchSelectWidth={col.dropdown === 'fixed'}
id={col.uuid + record.$$uuid}
onBlur={() => this.setState({editing: false})}
filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
@@ -332,7 +362,11 @@
</td>)
}
} else {
- return (<td className={className + ' pointer'} style={style}><div className="mk-mask" onClick={this.focus}></div>{content}</td>)
+ return (<td className={className + ' pointer'} style={style}>
+ {col.addable ? <PlusCircleOutlined onClick={() => MKEmitter.emit('addRecord', col.tableId, {...record})} className="mk-editable mk-plus"/> : null}
+ <div className="mk-mask" onClick={this.focus}></div>{content}
+ {col.delable ? <DeleteOutlined onClick={() => MKEmitter.emit('delRecord', col.tableId, {...record})} className="mk-editable mk-del"/> : null}
+ </td>)
}
} else {
children = content
@@ -363,7 +397,7 @@
content = content.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
}
- content = col.prefix + content + col.postfix
+ content = (col.prefix || '') + content + (col.postfix || '')
}
if (col.marks) {
@@ -373,10 +407,12 @@
if (mark.icon) {
if (mark.position === 'front') {
- content = <span><MkIcon style={{color: mark.color}} type={mark.icon} /> {content}</span>
+ content = <span><MkIcon style={mark.innerStyle} type={mark.icon} /> {content}</span>
} else {
- content = <span>{content} <MkIcon style={{color: mark.color}} type={mark.icon} /></span>
+ content = <span>{content} <MkIcon style={mark.innerStyle} type={mark.icon} /></span>
}
+ } else if (mark.innerStyle) {
+ content = <span style={mark.innerStyle}>{content}</span>
}
}
@@ -387,7 +423,11 @@
{err ? <Tooltip title={err}><ExclamationCircleOutlined /></Tooltip> : null}
</td>)
} else {
- return (<td className={className + ' pointer'} style={style}><div className="mk-mask" onClick={this.focus}></div>{content}</td>)
+ return (<td className={className + ' pointer'} style={style}>
+ {col.addable ? <PlusCircleOutlined onClick={() => MKEmitter.emit('addRecord', col.tableId, {...record})} className="mk-editable mk-plus"/> : null}
+ <div className="mk-mask" onClick={this.focus}></div>{content}
+ {col.delable ? <DeleteOutlined onClick={() => MKEmitter.emit('delRecord', col.tableId, {...record})} className="mk-editable mk-del"/> : null}
+ </td>)
}
} else {
children = content
@@ -399,7 +439,7 @@
}
if (content) {
- content = col.prefix + content + col.postfix
+ content = (col.prefix || '') + content + (col.postfix || '')
}
children = (
@@ -441,10 +481,12 @@
if (mark.icon) {
if (mark.position === 'front') {
- content = <span><MkIcon style={{color: mark.color}} type={mark.icon} /> {content}</span>
+ content = <span><MkIcon style={mark.innerStyle} type={mark.icon} /> {content}</span>
} else {
- content = <span>{content} <MkIcon style={{color: mark.color}} type={mark.icon} /></span>
+ content = <span>{content} <MkIcon style={mark.innerStyle} type={mark.icon} /></span>
}
+ } else if (mark.innerStyle) {
+ content = <span style={mark.innerStyle}>{content}</span>
}
}
@@ -475,6 +517,365 @@
}
}
+class BodyAllCell extends React.Component {
+ state = {
+ err: null
+ }
+
+ shouldComponentUpdate (nextProps, nextState) {
+ return !is(fromJS(this.props.record), fromJS(nextProps.record)) ||
+ nextState.err !== this.state.err
+ }
+
+ componentDidMount () {
+ MKEmitter.addListener('tdFocus', this.tdFocus)
+ }
+
+ /**
+ * @description 缁勪欢閿�姣侊紝娓呴櫎state鏇存柊锛屾竻闄ゅ揩鎹烽敭璁剧疆
+ */
+ componentWillUnmount () {
+ this.setState = () => {
+ return
+ }
+ MKEmitter.removeListener('tdFocus', this.tdFocus)
+ }
+
+ tdFocus = (id) => {
+ const { col, record } = this.props
+
+ if (id !== col.uuid + record.$$uuid) return
+ this.focus()
+ }
+
+ enterPress = () => {
+ const { col, record } = this.props
+
+ setTimeout(() => {
+ if (col.enter === '$next') {
+ MKEmitter.emit('nextLine', col, record.$$uuid)
+ } else if (col.enter === '$sub') {
+ MKEmitter.emit('subLine', col, record)
+ } else if (col.enter !== '$noAct') {
+ MKEmitter.emit('tdFocus', col.enter + record.$$uuid)
+ }
+ }, 50)
+ }
+
+ focus = () => {
+ const { col, record } = this.props
+
+ if (col.editType === 'switch' || col.editType === 'select') {
+ let node = document.getElementById(col.uuid + record.$$uuid)
+ node && node.click()
+ } else {
+ let err = null
+ let val = record[col.field] !== undefined ? record[col.field] : ''
+
+ if (col.type === 'number') {
+ val = +val
+ if (isNaN(val)) {
+ val = 0
+ }
+ if (typeof(col.max) === 'number' && val > col.max) {
+ err = col.label + '鏈�澶т负' + col.max
+ } else if (typeof(col.min) === 'number' && val < col.min) {
+ err = col.label + '鏈�灏忎负' + col.min
+ }
+ } else if (col.required === 'true' && !val) {
+ err = '璇峰～鍐�' + col.label
+ }
+
+ this.setState({err}, () => {
+ let node = document.getElementById(col.uuid + record.$$uuid)
+ node && node.select()
+ })
+ }
+ }
+
+ onChange = (val) => {
+ const { col, record } = this.props
+
+ let err = null
+
+ if (col.type === 'number') {
+ val = +val
+ if (isNaN(val)) {
+ val = 0
+ }
+ if (typeof(col.max) === 'number' && val > col.max) {
+ err = col.label + '鏈�澶т负' + col.max
+ } else if (typeof(col.min) === 'number' && val < col.min) {
+ err = col.label + '鏈�灏忎负' + col.min
+ }
+ } else if (col.required === 'true' && !val) {
+ err = '璇峰～鍐�' + col.label
+ }
+ this.setState({err})
+ MKEmitter.emit('changeRecord', col.tableId, {...record, [col.field]: val})
+ }
+
+ onSwitchChange = (val, label) => {
+ const { col, record } = this.props
+
+ setTimeout(() => {
+ if (col.enter === '$next') {
+ MKEmitter.emit('nextLine', col, record.$$uuid)
+ } else if (col.enter === '$sub') {
+ MKEmitter.emit('subLine', col, record)
+ } else if (col.enter !== '$noAct') {
+ MKEmitter.emit('tdFocus', col.enter + record.$$uuid)
+ }
+ }, 50)
+
+ let values = {}
+ if (col.editField) {
+ values[col.field] = label
+ values[col.editField] = val
+ } else {
+ values[col.field] = val
+ }
+
+ MKEmitter.emit('changeRecord', col.tableId, {...record, ...values})
+ }
+
+ onSelectChange = (val, option) => {
+ const { col, record } = this.props
+
+ let values = {}
+ let _option = col.options.filter(m => m.key === option.key)[0]
+
+ if (_option) {
+ if (col.linkSubField) {
+ col.linkSubField.forEach(m => {
+ values[m] = _option[m] !== undefined ? _option[m] : ''
+ })
+ }
+
+ if (col.editField) {
+ values[col.field] = _option.label
+ values[col.editField] = val
+ } else {
+ values[col.field] = val
+ }
+ }
+
+ setTimeout(() => {
+ if (col.enter === '$next') {
+ MKEmitter.emit('nextLine', col, record.$$uuid)
+ } else if (col.enter === '$sub') {
+ MKEmitter.emit('subLine', col, record)
+ } else if (col.enter !== '$noAct') {
+ MKEmitter.emit('tdFocus', col.enter + record.$$uuid)
+ }
+ }, 50)
+
+ MKEmitter.emit('changeRecord', col.tableId, {...record, ...values})
+ }
+
+ render() {
+ let { col, config, record, style, className } = this.props
+ const { err } = this.state
+
+ let children = null
+ if (col.type === 'text') {
+ if (col.editable === 'true') {
+ let _value = ''
+ if (col.editField) {
+ _value = record[col.editField] !== undefined ? record[col.editField] : ''
+ } else {
+ _value = record[col.field] !== undefined ? record[col.field] : ''
+ }
+
+ if (!col.editType || col.editType === 'text') {
+ children = (<>
+ <Input id={col.uuid + record.$$uuid} defaultValue={_value} onChange={(e) => this.onChange(e.target.value)} onPressEnter={this.enterPress} onBlur={this.onBlur}/>
+ {err ? <Tooltip title={err}><ExclamationCircleOutlined /></Tooltip> : null}
+ </>)
+ } else if (col.editType === 'switch') {
+ children = (
+ <CusSwitch config={col} autoFocus={false} defaultValue={_value} onChange={this.onSwitchChange} onBlur={() => {}}/>
+ )
+ } else {
+ children = (<>
+ <Select
+ showSearch
+ dropdownClassName="edit-table-dropdown"
+ dropdownMatchSelectWidth={col.dropdown === 'fixed'}
+ defaultValue={_value}
+ id={col.uuid + record.$$uuid}
+ filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
+ onSelect={this.onSelectChange}
+ >
+ {col.options.map((item, i) => (<Select.Option key={item.key} disabled={item.$disabled} value={item.value}>{item.label}</Select.Option>))}
+ </Select>
+ </>)
+ }
+ } else {
+ let content = ''
+ if (record[col.field] !== undefined) {
+ content = `${record[col.field]}`
+ }
+
+ if (content !== '') {
+ if (col.textFormat === 'YYYY-MM-DD' && /^[1-9]\d{3}(-|\/)(0[1-9]|1[0-2])(-|\/)(0[1-9]|[1-2][0-9]|3[0-1])/.test(content)) {
+ content = `${content.substr(0, 4)}-${content.substr(5, 2)}-${content.substr(8, 2)}`
+ } else if (col.textFormat === 'YYYY-MM-DD HH:mm:ss' && /^[1-9]\d{3}(-|\/)(0[1-9]|1[0-2])(-|\/)(0[1-9]|[1-2][0-9]|3[0-1]).([0-1][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]/.test(content)) {
+ content = `${content.substr(0, 4)}-${content.substr(5, 2)}-${content.substr(8, 2)} ${content.substr(11, 2)}:${content.substr(14, 2)}:${content.substr(17, 2)}`
+ }
+
+ content = (col.prefix || '') + content + (col.postfix || '')
+ }
+
+ if (col.marks) {
+ let mark = getMark(col.marks, record, style)
+
+ style = mark.style
+
+ if (mark.icon) {
+ if (mark.position === 'front') {
+ content = <span><MkIcon style={mark.innerStyle} type={mark.icon} /> {content}</span>
+ } else {
+ content = <span>{content} <MkIcon style={mark.innerStyle} type={mark.icon} /></span>
+ }
+ } else if (mark.innerStyle) {
+ content = <span style={mark.innerStyle}>{content}</span>
+ }
+ }
+ children = content
+ }
+ } else if (col.type === 'number') {
+ if (col.editable === 'true') {
+ let _value = record[col.field] !== undefined ? record[col.field] : ''
+ children = (<>
+ <InputNumber id={col.uuid + record.$$uuid} defaultValue={_value} onChange={(val) => this.onChange(val)} onPressEnter={this.enterPress}/>
+ {err ? <Tooltip title={err}><ExclamationCircleOutlined /></Tooltip> : null}
+ </>)
+ } else {
+ let content = ''
+ try {
+ content = parseFloat(record[col.field])
+ if (isNaN(content)) {
+ content = ''
+ }
+ } catch (e) {
+ content = ''
+ }
+
+ if (content !== '') {
+ let decimal = col.decimal || 0
+ if (col.format === 'percent') {
+ content = content * 100
+ decimal = decimal > 2 ? decimal - 2 : 0
+ } else if (col.format === 'abs') {
+ content = Math.abs(content)
+ }
+
+ content = content.toFixed(decimal)
+
+ if (col.format === 'thdSeparator') {
+ content = content.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
+ }
+
+ content = (col.prefix || '') + content + (col.postfix || '')
+ }
+
+ if (col.marks) {
+ let mark = getMark(col.marks, record, style)
+
+ style = mark.style
+
+ if (mark.icon) {
+ if (mark.position === 'front') {
+ content = <span><MkIcon style={mark.innerStyle} type={mark.icon} /> {content}</span>
+ } else {
+ content = <span>{content} <MkIcon style={mark.innerStyle} type={mark.icon} /></span>
+ }
+ } else if (mark.innerStyle) {
+ content = <span style={mark.innerStyle}>{content}</span>
+ }
+ }
+ children = content
+ }
+ } else if (col.type === 'textarea') {
+ let content = ''
+ if (record[col.field] !== undefined) {
+ content = `${record[col.field]}`
+ }
+
+ if (content) {
+ content = (col.prefix || '') + content + (col.postfix || '')
+ }
+
+ children = (
+ <div>
+ {content ? <Paragraph copyable ellipsis={{ rows: 3, expandable: true }}>{content}</Paragraph> : null }
+ </div>
+ )
+ } else if (col.type === 'formula') {
+ let content = col.formula
+ Object.keys(record).forEach(key => {
+ let reg = new RegExp('@' + key + '@', 'ig')
+ content = content.replace(reg, record[key])
+ })
+
+ if (col.eval !== 'false') {
+ try {
+ // eslint-disable-next-line
+ content = eval(content)
+ } catch (e) {
+ content = ''
+ }
+ }
+
+ content = content === undefined ? '' : content
+
+ if (content !== '') {
+ content = `${col.prefix || ''}${content}${col.postfix || ''}`
+
+ if (col.eval === 'false') {
+ content = content.replace(/\n/ig, '<br/>').replace(/\s/ig, ' ')
+ content = <span dangerouslySetInnerHTML={{__html: content}}></span>
+ }
+ }
+
+ if (col.marks) {
+ let mark = getMark(col.marks, record, style)
+
+ style = mark.style
+
+ if (mark.icon) {
+ if (mark.position === 'front') {
+ content = <span><MkIcon style={mark.innerStyle} type={mark.icon} /> {content}</span>
+ } else {
+ content = <span>{content} <MkIcon style={mark.innerStyle} type={mark.icon} /></span>
+ }
+ } else if (mark.innerStyle) {
+ content = <span style={mark.innerStyle}>{content}</span>
+ }
+ }
+
+ children = content
+ } else if (col.type === 'custom') {
+ style.padding = '0px'
+ if (col.style) {
+ style = {...style, ...col.style}
+ }
+
+ children = (
+ <CardCellComponent data={record} cards={config} elements={col.elements}/>
+ )
+ } else if (col.type === 'operation') {
+ style.padding = '0px 5px'
+ children = (
+ <Button type="link" style={{color: 'rgb(255, 77, 79)', backgroundColor: 'transparent'}} onClick={() => MKEmitter.emit('delRecord', col.tableId, {...record})}>鍒犻櫎</Button>
+ )
+ }
+
+ return (<td className={'editing_all_table_cell ' + className} style={style}>{col.addable ? <PlusCircleOutlined onClick={() => MKEmitter.emit('addRecord', col.tableId, {...record})} className="mk-editable mk-plus"/> : null}{children}{col.delable ? <DeleteOutlined onClick={() => MKEmitter.emit('delRecord', col.tableId, {...record})} className="mk-editable mk-del"/> : null}</td>)
+ }
+}
+
class NormalTable extends Component {
static propTpyes = {
statFValue: PropTypes.any, // 鍚堣瀛楁鏁版嵁
@@ -484,10 +885,11 @@
lineMarks: PropTypes.any, // 琛屾爣璁�
fields: PropTypes.array, // 缁勪欢瀛楁闆�
BID: PropTypes.any, // 涓昏〃ID
- data: PropTypes.any, // 琛ㄦ牸鏁版嵁
total: PropTypes.any, // 鎬绘暟
loading: PropTypes.bool, // 琛ㄦ牸鍔犺浇涓�
refreshdata: PropTypes.func, // 琛ㄦ牸涓帓搴忓垪銆侀〉鐮佺殑鍙樺寲鏃跺埛鏂�
+ changeLock: PropTypes.func,
+ chgSelectData: PropTypes.func,
}
state = {
@@ -495,6 +897,7 @@
data: [],
edData: [],
edColumns: [],
+ selectedRowKeys: [], // 琛ㄦ牸涓�変腑琛�
tableId: '', // 琛ㄦ牸ID
pageIndex: 1, // 鍒濆椤甸潰绱㈠紩
pageSize: 10, // 姣忛〉鏁版嵁鏉℃暟
@@ -503,12 +906,12 @@
pickup: false, // 鏀惰捣鏈�夋嫨椤�
orderfields: {}, // 鎺掑簭id涓巉ield杞崲
loading: false,
- editable: 'false',
+ editable: false,
pageOptions: []
}
UNSAFE_componentWillMount () {
- const { setting, fields, columns, data } = this.props
+ const { setting, fields, columns } = this.props
let orderfields = {}
let initEditLine = null
let edColumns = []
@@ -551,7 +954,7 @@
_copy.sorter = false
if (item.editable === 'true') {
- _copy.title = <span>{item.label}<EditOutlined className="system-color" style={{position: 'absolute', bottom: '2px', right: '5px'}}/></span>
+ _copy.title = <span>{item.label}<EditOutlined className="system-color mk-edit-sign"/></span>
}
edColumns.push(_copy)
}
@@ -572,12 +975,12 @@
})
}
- if (setting.borderColor) { // 杈规棰滆壊
- let style = `#${setting.tableId} table, #${setting.tableId} tr, #${setting.tableId} th, #${setting.tableId} td {border-color: ${setting.borderColor}}`
- let ele = document.createElement('style')
- ele.innerHTML = style
- document.getElementsByTagName('head')[0].appendChild(ele)
- }
+ // if (setting.borderColor) { // 杈规棰滆壊
+ // let style = `#${setting.tableId} table, #${setting.tableId} tr, #${setting.tableId} th, #${setting.tableId} td {border-color: ${setting.borderColor}}`
+ // let ele = document.createElement('style')
+ // ele.innerHTML = style
+ // document.getElementsByTagName('head')[0].appendChild(ele)
+ // }
let size = (setting.pageSize || 10) + ''
let pageOptions = ['10', '25', '50', '100', '500', '1000']
@@ -590,17 +993,22 @@
this.setState({
pageSize: setting.pageSize || 10,
pageOptions,
- data,
columns: _columns,
edColumns,
tableId: setting.tableId,
orderfields,
initEditLine,
- editable: setting.editable
+ editable: setting.editable === 'true'
}, () => {
if (deForms.length > 0) {
this.improveActionForm(deForms)
}
+
+ const element = document.getElementById(setting.tableId)
+ element && element.style.setProperty('--mk-table-border-color', setting.borderColor || '#e8e8e8')
+ element && element.style.setProperty('--mk-table-color', setting.color || 'rgba(0, 0, 0, 0.65)')
+ element && element.style.setProperty('--mk-table-font-size', setting.fontSize || '14px')
+ element && element.style.setProperty('--mk-table-font-weight', setting.fontWeight || 'normal')
})
}
@@ -610,22 +1018,17 @@
componentDidMount () {
const { fields, setting } = this.props
- const { data, editable } = this.state
this.setState({
fields: fields.filter(item => item.field !== setting.primaryKey),
})
- if (editable === 'true' && data && data.length > 0) {
- setTimeout(() => {
- this.pickupChange()
- }, 200)
- }
-
+ MKEmitter.addListener('subLine', this.subLine)
MKEmitter.addListener('nextLine', this.nextLine)
MKEmitter.addListener('addRecord', this.addLine)
MKEmitter.addListener('delRecord', this.delRecord)
MKEmitter.addListener('resetTable', this.resetTable)
+ MKEmitter.addListener('transferData', this.transferData)
MKEmitter.addListener('changeRecord', this.changeRecord)
}
@@ -636,22 +1039,45 @@
this.setState = () => {
return
}
+ MKEmitter.removeListener('subLine', this.subLine)
MKEmitter.removeListener('nextLine', this.nextLine)
MKEmitter.removeListener('addRecord', this.addLine)
MKEmitter.removeListener('delRecord', this.delRecord)
MKEmitter.removeListener('resetTable', this.resetTable)
+ MKEmitter.removeListener('transferData', this.transferData)
MKEmitter.removeListener('changeRecord', this.changeRecord)
}
- UNSAFE_componentWillReceiveProps(nextProps) {
- if (!is(fromJS(this.props.data), fromJS(nextProps.data))) {
- this.setState({data: nextProps.data || []})
- if (this.state.editable === 'true' && !this.state.pickup) {
+ transferData = (menuid, data, type) => {
+ if (menuid !== this.props.MenuID) return
+
+ if (type !== 'line') {
+ this.setState({data: data || []})
+
+ if (this.state.editable && !this.state.pickup) {
setTimeout(() => {
this.pickupChange()
}, 200)
}
+ } else if (type === 'line' && data.$$uuid) {
+ let _data = this.state.data.map(item => {
+ if (item.$$uuid === data.$$uuid) {
+ return data
+ } else {
+ return item
+ }
+ })
+ let _edData = this.state.edData.map(item => {
+ if (item.$$uuid === data.$$uuid) {
+ return data
+ } else {
+ return item
+ }
+ })
+
+ this.setState({edData: _edData, data: _data})
}
+ this.setState({editable: false})
}
improveActionForm = (deForms) => {
@@ -773,7 +1199,7 @@
if (!_cell.label && _cell.label !== 0) return
if (_map.has(_cell.value)) return
- _map.set(_cell.value, true)
+ _map.set(_cell.value, 0)
if (item.linkSubField) {
item.linkSubField.forEach(m => {
@@ -805,30 +1231,108 @@
return item
})
- this.setState({edColumns: []}, () => {
+ if (this.state.pickup) {
+ this.setState({
+ pickup: false
+ }, () => {
+ this.setState({pickup: true, edColumns: _edColumns})
+ })
+ } else {
this.setState({edColumns: _edColumns})
- })
+ }
}
- nextLine = (col, index) => {
+ nextLine = (col, uuid) => {
const { setting } = this.props
const { edData, initEditLine, tableId } = this.state
if (col.tableId !== tableId) return
- index = +index
+ let index = edData.findIndex(item => item.$$uuid === uuid)
+ let next = edData[index + 1] || null
- if (index < edData.length && initEditLine) {
- MKEmitter.emit('tdFocus', initEditLine.uuid + (index + 1))
- } else if (col.footEnter === 'add' && setting.addable === 'true') {
+ if (next && initEditLine) {
+ MKEmitter.emit('tdFocus', initEditLine.uuid + next.$$uuid)
+ } else if (setting.addable === 'true') {
setTimeout(() => {
this.plusLine()
}, 10)
- } else if (col.footEnter === 'sub') {
+ } else if (edData[index]) {
setTimeout(() => {
- this.checkData()
+ this.subLine(col, edData[index])
}, 10)
}
+ }
+
+ subLine = (col, record) => {
+ const { tableId, fields, edData } = this.state
+
+ if (col && col.tableId !== tableId) return
+
+ if (edData.filter(item => !item.$origin).length > 1) {
+ setTimeout(() => {
+ this.submit(edData)
+ }, 10)
+ return
+ }
+
+ setTimeout(() => {
+ let item = fromJS(record).toJS()
+ let line = []
+ fields.forEach(col => {
+ if (col.editable !== 'true' || item.$deleted) {
+ if (col.type === 'number') {
+ item[col.field] = +item[col.field]
+ if (isNaN(item[col.field])) {
+ item[col.field] = 0
+ }
+ } else {
+ item[col.field] = item[col.field] !== undefined ? (item[col.field] + '') : ''
+ }
+ return
+ }
+ if (col.type === 'text') {
+ let val = item[col.field] !== undefined ? (item[col.field] + '') : ''
+ if (col.required === 'true' && !val) {
+ line.push(`${col.label}涓嶅彲涓虹┖`)
+ }
+ item[col.field] = val
+ } else if (col.type === 'number') {
+ let val = item[col.field]
+ if (!val && val !== 0) {
+ line.push(`${col.label}涓嶅彲涓虹┖`)
+ return
+ }
+ val = +val
+ if (isNaN(val)) {
+ line.push(`${col.label}鏁版嵁鏍煎紡閿欒`)
+ return
+ }
+
+ val = +val.toFixed(col.decimal || 0)
+
+ if (typeof(col.max) === 'number' && val > col.max) {
+ line.push(`${col.label}涓嶅彲澶т簬${col.max}`)
+ } else if (typeof(col.min) === 'number' && val < col.min) {
+ line.push(`${col.label}涓嶅彲灏忎簬${col.min}`)
+ }
+
+ item[col.field] = val
+ }
+ })
+
+ let err = line.join('锛�')
+
+ if (err) {
+ notification.warning({
+ top: 92,
+ message: err,
+ duration: 5
+ })
+ } else {
+ this.submit([item], 'simple')
+ }
+ }, 10)
}
plusLine = () => {
@@ -861,6 +1365,7 @@
}
delRecord = (id, record) => {
+ const { setting } = this.props
const { tableId, edData } = this.state
if (id !== tableId) return
@@ -880,6 +1385,10 @@
return item
}
})
+
+ if (setting.commit === 'simple' && record.$deleted) {
+ this.subLine(null, record)
+ }
}
this.setState({edData: _data})
@@ -1049,11 +1558,11 @@
}
}
- submit = (data) => {
+ submit = (data, type) => {
const { submit, BID, setting } = this.props
const { fields } = this.state
- if (setting.commit === 'change') {
+ if (type !== 'simple' && (setting.commit === 'change' || setting.commit === 'simple')) {
data = data.filter(item => !item.$origin)
}
@@ -1105,7 +1614,12 @@
Api.genericInterface(param).then((res) => {
if (res.status) {
- this.execSuccess(res)
+ if (type === 'simple') {
+ this.updataLine(data[0])
+ this.execSuccess(res, type)
+ } else {
+ this.execSuccess(res)
+ }
} else {
this.execError(res)
}
@@ -1117,7 +1631,12 @@
Api.genericInterface(param).then((res) => {
if (res.status) {
- this.execSuccess(res)
+ if (type === 'simple') {
+ this.updataLine(data[0])
+ this.execSuccess(res, type)
+ } else {
+ this.execSuccess(res)
+ }
} else {
this.execError(res)
}
@@ -1127,7 +1646,26 @@
}
}
- execSuccess = (res) => {
+ 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, type) => {
const { submit } = this.props
if (res && res.ErrCode === 'S') { // 鎵ц鎴愬姛
@@ -1147,6 +1685,8 @@
this.setState({
loading: false
})
+
+ if (type === 'simple') return
if (submit.closetab === 'true') {
MKEmitter.emit('popclose')
@@ -1192,8 +1732,14 @@
}
repick = () => {
+ const { setting } = this.props
const { data } = this.state
+ if (setting.submittal === 'true') {
+ this.setState({editable: true})
+ }
+
+ this.props.changeLock(false)
this.setState({
data: [],
edData: [],
@@ -1205,12 +1751,82 @@
})
}
+ /**
+ *
+ */
+ onSelectChange = selectedRowKeys => {
+ this.setState({ selectedRowKeys })
+
+ let activeId = ''
+ if (selectedRowKeys.length > 0) {
+ activeId = selectedRowKeys.slice(-1)[0]
+ }
+ this.changedata(activeId)
+ this.selectdata(selectedRowKeys)
+ }
+
+ /**
+ * @description 鐐瑰嚮鏁磋锛岃Е鍙戝垏鎹紝 鍒ゆ柇鏄惁鍙�夛紝鍗曢�夋垨澶氶�夛紝杩涜瀵瑰簲鎿嶄綔
+ */
+ changeRow = (index) => {
+ const { setting } = this.props
+
+ if (!setting.tableType || this.state.pickup) return
+
+ let newkeys = fromJS(this.state.selectedRowKeys).toJS()
+
+ let activeId = ''
+ if (setting.tableType === 'radio') {
+ activeId = index
+ newkeys = [index]
+ this.setState({ selectedRowKeys: newkeys })
+ } else {
+ if (newkeys.includes(index)) {
+ newkeys = newkeys.filter(item => item !== index)
+
+ if (newkeys.length > 0) {
+ activeId = newkeys.slice(-1)[0]
+ }
+ } else {
+ activeId = index
+ newkeys.push(index)
+ }
+
+ this.setState({ selectedRowKeys: newkeys })
+ }
+
+ this.changedata(activeId)
+ this.selectdata(newkeys)
+ }
+
+ changedata = (id) => {
+ const { MenuID } = this.props
+ const { data } = this.state
+
+ let _data = ''
+
+ if (id) {
+ _data = data.filter(item => item.$$uuid === id)[0] || ''
+ }
+
+ MKEmitter.emit('resetSelectLine', MenuID, id, _data)
+ }
+
+ selectdata = (keys) => {
+ const { data } = this.state
+
+ let _data = data.filter(item => keys.includes(item.$$uuid))
+
+ this.props.chgSelectData(_data)
+ }
+
changeTable = (pagination, filters, sorter) => {
const { orderfields } = this.state
this.setState({
pageIndex: pagination.current,
- pageSize: pagination.pageSize
+ pageSize: pagination.pageSize,
+ selectedRowKeys: [],
})
sorter.field = orderfields[sorter.field] || ''
@@ -1223,15 +1839,20 @@
if (id !== MenuID) return
- if (repage !== 'false') {
+ if (repage === 'false') {
this.setState({
- pageIndex: 1
+ selectedRowKeys: [],
+ })
+ } else {
+ this.setState({
+ pageIndex: 1,
+ selectedRowKeys: [],
})
}
}
pickupChange = () => {
- const { submit } = this.props
+ const { submit, MenuID, setting } = this.props
const { data } = this.state
let pickup = !this.state.pickup
@@ -1245,7 +1866,7 @@
return
}
- if (!pickup && !is(fromJS(data), fromJS(this.state.edData))) {
+ if (!pickup && this.state.edData.filter(item => !item.$origin).length > 0) {
const _this = this
confirm({
title: '鏁版嵁宸蹭慨鏀癸紝纭畾鏀惧純淇濆瓨鍚楋紵',
@@ -1264,29 +1885,46 @@
onCancel() {}
})
} else {
+ pickup && MKEmitter.emit('resetSelectLine', MenuID, '', '')
+ pickup && this.props.chgSelectData([])
+ let keys = this.state.selectedRowKeys
this.setState({
data: [],
edData: [],
+ selectedRowKeys: [],
pickup,
loading: false,
- editable: 'false'
+ editable: false
}, () => {
- this.setState({
- data: data,
- edData: pickup ? fromJS(data).toJS() : []
- })
+ if (pickup && setting.tableType === 'checkbox' && keys.length > 0) {
+ this.setState({
+ data: data,
+ edData: fromJS(data).toJS().filter(item => {
+ item.$origin = false
+
+ return keys.includes(item.$$uuid)
+ })
+ })
+ } else {
+ this.setState({
+ data: data,
+ edData: pickup ? fromJS(data).toJS() : []
+ })
+ }
})
+
}
+ this.props.changeLock(pickup)
}
render() {
const { setting, statFValue, lineMarks, submit } = this.props
- const { pickup, tableId, data, edData, columns, edColumns, loading, pageOptions } = this.state
+ const { pickup, tableId, data, edData, columns, edColumns, loading, pageOptions, selectedRowKeys } = this.state
const components = {
body: {
row: BodyRow,
- cell: BodyCell
+ cell: setting.editType !== 'multi' || !pickup ? BodyCell : BodyAllCell
}
}
@@ -1298,6 +1936,16 @@
_data = edData
_data = _data.filter(item => !item.$deleted)
_columns = edColumns
+ }
+
+ // 璁剧疆琛ㄦ牸閫夋嫨灞炴�э細鍗曢�夈�佸閫夈�佷笉鍙��
+ let rowSelection = null
+ if (setting.tableType && !pickup) {
+ rowSelection = {
+ selectedRowKeys,
+ type: (setting.tableType === 'radio') ? 'radio' : 'checkbox',
+ onChange: this.onSelectChange
+ }
}
let _pagination = false
@@ -1321,31 +1969,41 @@
let height = setting.height || false
return (
- <div className={`edit-custom-table ${pickup ? 'editable' : ''} ${setting.tableHeader || ''} ${setting.operType || ''} ${height ? 'fixed-height' : ''} ${setting.mode || ''}`} id={tableId}>
- <Switch title="缂栬緫" className="main-pickup" checkedChildren="寮�" unCheckedChildren="鍏�" disabled={loading || this.props.loading} checked={pickup} onChange={this.pickupChange} />
- {pickup ? <Button style={submit.style} onClick={() => setTimeout(() => {this.checkData()}, 10)} loading={loading} className="submit-table" type="link">鎻愪氦</Button> : null}
- <Table
- rowKey="$$uuid"
- components={components}
- style={setting.style}
- size={setting.size || 'middle'}
- bordered={setting.bordered !== 'false'}
- columns={_columns}
- dataSource={_data}
- loading={this.props.loading}
- scroll={{ x: '100%', y: height }}
- onRow={(record, index) => {
- return {
- lineMarks,
- data: record
- }
- }}
- onChange={this.changeTable}
- pagination={_pagination}
- />
- {_footer ? <div className={'normal-table-footer ' + (_pagination ? 'pagination' : '')}>{_footer}</div> : null}
- {pickup && setting.addable === 'true' ? <Button className="mk-add-line" onClick={() => this.addLine()} disabled={this.props.loading} type="link"><PlusOutlined /></Button> : null}
- </div>
+ <>
+ {submit.hasAction && pickup ? <div className="edit-custom-table-leftbtn-wrap">
+ <Button style={submit.style} onClick={() => setTimeout(() => {this.checkData()}, 10)} loading={loading} className="submit-table" type="link">鎻愪氦</Button>
+ </div> : null}
+ <div className="edit-custom-table-btn-wrap" style={submit.wrapStyle}>
+ {!submit.hasAction && pickup ? <Button style={submit.style} onClick={() => setTimeout(() => {this.checkData()}, 10)} loading={loading} className="submit-table" type="link">鎻愪氦</Button> : null}
+ <Switch title="缂栬緫" className="main-pickup" checkedChildren="寮�" unCheckedChildren="鍏�" disabled={loading || this.props.loading} checked={pickup} onChange={this.pickupChange} />
+ </div>
+ <div className={`edit-custom-table ${pickup ? 'editable' : ''} ${setting.tableHeader || ''} ${setting.operType || ''} ${height ? 'fixed-height' : ''} ${setting.mode || ''}`} id={tableId}>
+ <Table
+ rowKey="$$uuid"
+ components={components}
+ // style={setting.style}
+ size={setting.size || 'middle'}
+ bordered={setting.bordered !== 'false'}
+ rowSelection={rowSelection}
+ columns={_columns}
+ dataSource={_data}
+ loading={this.props.loading}
+ scroll={{ x: '100%', y: height }}
+ onRow={(record, index) => {
+ return {
+ lineMarks,
+ data: record,
+ onClick: () => {this.changeRow(record.$$uuid)},
+ }
+ }}
+ onChange={this.changeTable}
+ pagination={_pagination}
+ />
+ {_footer ? <div className={'normal-table-footer ' + (_pagination ? 'pagination' : '')}>{_footer}</div> : null}
+ {pickup && setting.addable === 'true' ? <Button className="mk-add-line" onClick={() => this.addLine()} disabled={this.props.loading} type="link"><PlusOutlined /></Button> : null}
+ {pickup && _data.length > 10 ? <Button style={submit.style} onClick={() => setTimeout(() => {this.checkData()}, 10)} loading={loading} className="submit-footer-table" type="link">鎻愪氦</Button> : null}
+ </div>
+ </>
)
}
}
--
Gitblit v1.8.0