1.完善表单，表格悬浮增加英文-中文提示

Min
1 parent 6c93d086
Showing 2 changed files with 4 additions and 2 deletions
src/components/Common/CommonTable/index.js
src/components/Common/commonFunc.js
@@ -4481,7 +4481,7 @@ class CommonTableRc extends React.Component {
             ))
         ) {
           res = (
-            <div className="th-div" style={styleObj} title={`${column.chineseTitle}`}>
+            <div className="th-div" style={styleObj} title={`${column.tipTitle}`}>
               {checkBoxAll}
               {expandedAllIcon}
               {!column.dataIndex?.startsWith("b") ? (
@@ -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,