From a9b02f6862522b54d0824152017bf2acfec2af7b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 21 三月 2024 10:29:50 +0800
Subject: [PATCH] 2024-03-21
---
src/tabviews/custom/components/table/edit-table/normalTable/index.jsx | 75 +++++++++++++++++++++++++++++--------
1 files changed, 59 insertions(+), 16 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 3a725fa..a7571dd 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
@@ -55,7 +55,7 @@
this.node.blur()
- if (config.enter === '$noAct') return
+ if (/\$noAct/.test(config.enter)) return
if (/\$next/.test(config.enter)) {
MKEmitter.emit('nextLine' + config.tableId, lineId, config.enter.replace('$next_', ''))
@@ -191,7 +191,7 @@
this.props.onChange(values)
- if (config.enter === '$noAct') return
+ if (/\$noAct/.test(config.enter)) return
if (/\$next/.test(config.enter)) {
MKEmitter.emit('nextLine' + config.tableId, lineId, config.enter.replace('$next_', ''))
@@ -283,9 +283,11 @@
this.props.onChange(values, val)
+ if (config.enter === '$noActX') return
+
this.node.blur()
- if (config.enter === '$noAct') return
+ if (/\$noAct/.test(config.enter)) return
setTimeout(() => {
if (/\$next/.test(config.enter)) {
@@ -308,7 +310,7 @@
const { config, lineId } = this.props
if (config.$ctrl) {
- MKEmitter.emit('colBlur' + config.tableId, lineId, config.uuid)
+ MKEmitter.emit('colBlur' + config.tableId, lineId, config.uuid, true)
}
setTimeout(() => {
@@ -408,7 +410,7 @@
this.node.blur()
- if (config.enter === '$noAct') return
+ if (/\$noAct/.test(config.enter)) return
if (/\$next/.test(config.enter)) {
MKEmitter.emit('nextLine' + config.tableId, lineId, config.enter.replace('$next_', ''))
@@ -536,7 +538,7 @@
this.node.blur()
- if (config.enter === '$noAct') return
+ if (/\$noAct/.test(config.enter)) return
setTimeout(() => {
if (/\$next/.test(config.enter)) {
@@ -750,6 +752,10 @@
} else if (content === config.closeVal) {
content = config.closeText
}
+ } else if (col.editType === 'popSelect') {
+ if (col.showField) {
+ content = record[col.showField] || content
+ }
}
if (content !== '') {
@@ -759,6 +765,10 @@
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)}`
} else if (col.textFormat === 'encryption') {
content = <span>{col.prefix || ''}<Encrypts value={content} />{col.postfix || ''}</span>
+ }
+
+ if (col.noValue === 'hide' && content < '1949-10-02') {
+ content = ''
}
if (col.textFormat !== 'encryption') {
@@ -807,8 +817,13 @@
<MkDatePicker config={col} lineId={record.$$uuid} defaultValue={_value || null} autoFocus={true} onChange={this.onColChange} onBlur={() => this.setState({editing: false})}/>
</td>)
} else if (col.editType === 'popSelect') {
+ let showValue = ''
+ if (col.showField) {
+ showValue = record[col.showField] || ''
+ }
+
return (<td onClick={(e) => e.stopPropagation()} className="editing_table_cell">
- <MKPopSelect config={col} lineId={record.$$uuid} defaultValue={_value} BID={record.$$BID} autoFocus={true} onChange={this.onColChange} onBlur={() => this.setState({editing: false})}/>
+ <MKPopSelect config={col} lineId={record.$$uuid} defaultValue={_value} showValue={showValue} BID={record.$$BID} autoFocus={true} onChange={this.onColChange} onBlur={() => this.setState({editing: false})}/>
</td>)
} else {
return (<td onClick={(e) => e.stopPropagation()} className="editing_table_cell">
@@ -1054,8 +1069,13 @@
<MkDatePicker config={col} lineId={record.$$uuid} defaultValue={_value || null} autoFocus={false} onChange={this.onColChange}/>
)
} else if (col.editType === 'popSelect') {
+ let showValue = ''
+ if (col.showField) {
+ showValue = record[col.showField] || ''
+ }
+
children = (
- <MKPopSelect config={col} lineId={record.$$uuid} defaultValue={_value} BID={record.$$BID} autoFocus={false} onChange={this.onColChange}/>
+ <MKPopSelect config={col} lineId={record.$$uuid} defaultValue={_value} showValue={showValue} BID={record.$$BID} autoFocus={false} onChange={this.onColChange}/>
)
} else {
children = (
@@ -1076,6 +1096,10 @@
} else if (content === config.closeVal) {
content = config.closeText
}
+ } else if (col.editType === 'popSelect') {
+ if (col.showField) {
+ content = record[col.showField] || content
+ }
}
if (content !== '') {
@@ -1085,6 +1109,10 @@
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)}`
} else if (col.textFormat === 'encryption') {
content = <span>{col.prefix || ''}<Encrypts value={content} />{col.postfix || ''}</span>
+ }
+
+ if (col.noValue === 'hide' && content < '1949-10-02') {
+ content = ''
}
if (col.textFormat !== 'encryption') {
@@ -1554,7 +1582,11 @@
MKEmitter.removeListener('changeRecord' + tableId, this.changeRecord)
}
- colBlur = (lineId) => {
+ colBlur = (lineId, colId, defer) => {
+ if (defer && this.focusId === lineId && this.colId !== colId) {
+ return
+ }
+
this.blurId = lineId
this.focusId = ''
@@ -1676,6 +1708,9 @@
result = originVal === contrastVal
} else if (item.match === '!=') {
result = originVal !== contrastVal
+ } else if (item.match === 'regexp') {
+ let reg = new RegExp(item.contrastValue, 'ig')
+ result = reg.test(originVal)
} else {
originVal = isNaN(originVal) ? originVal : +originVal
contrastVal = isNaN(contrastVal) ? contrastVal : +contrastVal
@@ -1864,9 +1899,13 @@
}
if (param.LText) {
- param.LText = Utils.formatOptions(param.LText)
+ if (window.GLOB.execType === 'x') {
+ param.exec_type = 'x'
+ }
+
+ param.LText = Utils.formatOptions(param.LText, param.exec_type)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt(param.LText, param.timestamp)
+ param.secretkey = Utils.encrypt(window.GLOB.execType === 'x' ? '' : param.LText, param.timestamp)
deffers.push(
new Promise(resolve => {
@@ -1895,9 +1934,13 @@
}
if (mainparam.LText) {
- mainparam.LText = Utils.formatOptions(mainparam.LText)
+ if (window.GLOB.execType === 'x') {
+ mainparam.exec_type = 'x'
+ }
+
+ mainparam.LText = Utils.formatOptions(mainparam.LText, mainparam.exec_type)
mainparam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- mainparam.secretkey = Utils.encrypt(mainparam.LText, mainparam.timestamp)
+ mainparam.secretkey = Utils.encrypt(window.GLOB.execType === 'x' ? '' : mainparam.LText, mainparam.timestamp)
if (window.GLOB.mainSystemApi) {
mainparam.rduri = window.GLOB.mainSystemApi
@@ -2322,8 +2365,8 @@
delete param.excel_in
- param.exec_type = 'y'
- param.LText = Utils.formatOptions(result.sql)
+ param.exec_type = window.GLOB.execType || 'y'
+ param.LText = Utils.formatOptions(result.sql, param.exec_type)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt('', param.timestamp)
@@ -2609,7 +2652,7 @@
{setting.hasSubmit && edData.length > 0 ? <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> : null}
- <div className={`edit-custom-table ${setting.tableHeader || ''} ${height ? 'fixed-height' : ''} ${setting.mode || ''} table-vertical-${setting.vertical || ''} mk-edit-${setting.editType || 'simple'}`} style={style}>
+ <div className={`edit-custom-table ${setting.tableHeader || ''} ${setting.parity === 'true' ? 'mk-parity' : ''} ${height ? 'fixed-height' : ''} ${setting.mode || ''} table-vertical-${setting.vertical || ''} mk-edit-${setting.editType || 'simple'}`} style={style}>
<Table
rowKey="$$uuid"
components={components}
--
Gitblit v1.8.0