From bf9d1b77ad46b96b1242698fe7776b76a84eb182 Mon Sep 17 00:00:00 2001
From: pengm <674192343@qq.com>
Date: Fri, 12 Sep 2025 22:09:07 +0800
Subject: [PATCH] 1.完善表单，表格悬浮增加英文-中文提示

---
 src/components/Common/CommonTable/index.js | 2 +-
 src/components/Common/commonFunc.js        | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

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 = (
-            <div className="th-div" style={styleObj} title={`${column.chineseTitle}`}>
+            <div className="th-div" style={styleObj} title={`${column.tipTitle}`}>
               {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,
--
libgit2 0.22.2