diff --git a/src/components/Common/CommonTable/index.js b/src/components/Common/CommonTable/index.js index 39f11a3..0c4850b 100644 --- a/src/components/Common/CommonTable/index.js +++ b/src/components/Common/CommonTable/index.js @@ -4481,7 +4481,7 @@ class CommonTableRc extends React.Component { )) ) { res = ( -
+
{checkBoxAll} {expandedAllIcon} {!column.dataIndex?.startsWith("b") ? ( diff --git a/src/components/Common/commonFunc.js b/src/components/Common/commonFunc.js index 5f81300..104638a 100644 --- a/src/components/Common/commonFunc.js +++ b/src/components/Common/commonFunc.js @@ -91,10 +91,12 @@ export function getHeaderConfig(config) { const tableConfig = config.gdsconfigformslave; const column = []; for (const child of tableConfig) { + const tipTitle = commonUtils.isNotEmptyObject(child.showName) ? child.showName !== child.sChinese ? + `${child.showName}-${child.sChinese}` : child.showName : child.sChinese; if (child.sName !== '' && child.bVisible && child.showName !== '') { column.push({ title: child.showName, - chineseTitle: child.sChinese, + tipTitle, dataIndex: child.sName.trim(), width: child.iFitWidth, bFind: child.bFind,