diff --git a/src/components/Common/CommonTable/index.js b/src/components/Common/CommonTable/index.js index cec0c31..64ca5db 100644 --- a/src/components/Common/CommonTable/index.js +++ b/src/components/Common/CommonTable/index.js @@ -840,7 +840,7 @@ class CommonTableRc extends React.Component { 'div': target.getAttribute('data-name') ? target : target.childNodes[0], 'input': target, }[tagName.toLowerCase()]; - + if (!oDiv) return; if (!oDiv.getAttribute('data-control-name')?.includes('_Sum')) return; // 阻止右键菜单 @@ -4164,7 +4164,7 @@ class CommonTableRc extends React.Component { handleCellClick = (record) => { try { const { target } = event; - + const { tagName } = target; const oDiv = { 'span': target.getAttribute('data-name') ? target : target.parentNode, @@ -4172,9 +4172,9 @@ class CommonTableRc extends React.Component { 'div': target.getAttribute('data-name') ? target : target.childNodes[0], 'input': target, }[tagName.toLowerCase()]; - + if (!oDiv || window.getSelection().toString()) return false; - + const [sName, sControlName] = [oDiv.getAttribute('data-name'), oDiv.getAttribute('data-control-name')]; if (sControlName?.includes('_Sum')) { const { sumGroup = {}, totalData = [{}], totalDataNew: totalDataNew0 = [{}] } = this.state; @@ -4185,7 +4185,7 @@ class CommonTableRc extends React.Component { } else { sumGroup[sName].push(record[this.rowKey]); } - + let totalDataNew = [...totalDataNew0]; if (sumGroup[sName].length) { const sum = sumGroup[sName].reduce((pre, cur) => { @@ -4201,12 +4201,12 @@ class CommonTableRc extends React.Component { } return pre; }, 0); - + totalDataNew = [{ ...totalData[0], ...totalDataNew[0], [sName]: sum }]; } else { totalDataNew[0][sName] = totalData[0][sName]; } - + this.setState({ sumGroup, totalDataNew }); return !this.props.enabled; } @@ -5545,8 +5545,8 @@ class CommonTableRc extends React.Component { onKeyDown={e => this.onKeyDownDiv(e, sName)} onCut={e => e.preventDefault()} onPaste={e => e.preventDefault()} - suppressContentEditableWarning - contentEditable="true" + // suppressContentEditableWarning + // contentEditable="true" onClick={commonUtils.isNotEmptyObject(linkStyle) ? this.handleViewClick.bind(this, isSlaveInfo ? 'slaveInfo' : this.props.name, showConfig.sName, record, index, showConfig) : null} > {sValue}} {bShow}{imgBox} @@ -5574,8 +5574,8 @@ class CommonTableRc extends React.Component { onKeyDown={e => this.onKeyDownDiv(e, sName)} onCut={e => e.preventDefault()} onPaste={e => e.preventDefault()} - suppressContentEditableWarning - contentEditable="true" + // suppressContentEditableWarning + // contentEditable="true" onClick={commonUtils.isNotEmptyObject(linkStyle) ? this.handleViewClick.bind(this, isSlaveInfo ? 'slaveInfo' : this.props.name, showConfig.sName, record, index, showConfig) : null} > {sValue} @@ -5822,7 +5822,7 @@ class CommonTableRc extends React.Component { this.hasSpanBgColor = true; } - res = ( { + Object.keys(sumGroup).forEach(sName => { if (sumGroup[sName].length) { const sum = sumGroup[sName].reduce((pre, cur) => { const curData = this.props.data.find(item => item[this.rowKey] === cur); @@ -6222,7 +6222,7 @@ class CommonTableRc extends React.Component { } return pre; }, 0); - + sumData[sName] = sum; } });