From 6c93d08684a56f610c718ecad89bfcb94e900158 Mon Sep 17 00:00:00 2001
From: pengm <674192343@qq.com>
Date: Fri, 12 Sep 2025 21:50:18 +0800
Subject: [PATCH] 1.表单，表格悬浮增加英文-中文提示

---
 src/components/Common/CommonComponent/index.js | 12 ++++++++++--
 src/components/Common/CommonTable/index.js     |  3 ++-
 src/components/Common/commonFunc.js            |  1 +
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/components/Common/CommonComponent/index.js b/src/components/Common/CommonComponent/index.js
index b735fb9..70f0d9d 100644
--- a/src/components/Common/CommonComponent/index.js
+++ b/src/components/Common/CommonComponent/index.js
@@ -1933,6 +1933,7 @@ export default class CommonComponent extends Component {
 
   /*   获取formitemprops对象(主)   */
   getOutFormItemPropsMaster = () => {
+    const bEnglish =  this.props.app?.userinfo?.sLanguage === 'sEnglish';
     /*   返回值声明   */
     let obj = {};
     if (this.firstDataIndex === 'i'
@@ -1946,7 +1947,13 @@ export default class CommonComponent extends Component {
      文本输入框(文本s),
      地址联动框(联动下拉类型c)   */
       obj = {
-        label: this.props.showConfig.showName, /*   标签   */
+        label: (
+          <span
+            title={bEnglish ? `${this.props.showConfig?.showName}-${this.props.showConfig?.sChinese}` : this.props.showConfig?.showName}
+          >
+            {this.props.showConfig?.showName}
+          </span>
+        ),
         className: styles.formItemMargin, /*   样式名称   */
         ...this.formItemLayout, /*   主要是rowspan和colspan   */
       };
@@ -1973,6 +1980,7 @@ export default class CommonComponent extends Component {
   /*   获取formitemprops对象(单条从表数据)   */
   getOutFormItemPropsViewSlave = () => {
     /*   返回值声明   */
+    const bEnglish =  this.props.app?.userinfo?.sLanguage === 'sEnglish';
     let obj = {};
     let titleStyle = {};
     const showNameNew = this.props.showConfig.showName?.replace(/[\/\)\()]/g, '');
@@ -2005,7 +2013,7 @@ export default class CommonComponent extends Component {
      文本输入框(文本s),
      地址联动框(联动下拉类型c)   */
       obj = {
-        label: <span style={titleStyle}>{this.props.showConfig.showName}</span>, /*   标签   */
+        label: <span  title={bEnglish ? `${this.props.showConfig?.showName}-${this.props.showConfig?.sChinese}` : this.props.showConfig?.showName} style={titleStyle}>{this.props.showConfig.showName}</span>, /*   标签   */
         className: `${styles.formItemMargin} ${extraClassName}`, /*   样式名称   */
         ...this.formItemLayout, /*   主要是rowspan和colspan   */
       };
diff --git a/src/components/Common/CommonTable/index.js b/src/components/Common/CommonTable/index.js
index 43e140e..39f11a3 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}>
+            <div className="th-div" style={styleObj} title={`${column.chineseTitle}`}>
               {checkBoxAll}
               {expandedAllIcon}
               {!column.dataIndex?.startsWith("b") ? (
@@ -4575,6 +4575,7 @@ class CommonTableRc extends React.Component {
               className={`th-div ${
                 column.bXunjianCheck ? styles.thXunjian : ""
               }`}
+              title={`${column.chineseTitle}`}
               style={styleObj}
             >
               {checkBoxAll}
diff --git a/src/components/Common/commonFunc.js b/src/components/Common/commonFunc.js
index 236609c..5f81300 100644
--- a/src/components/Common/commonFunc.js
+++ b/src/components/Common/commonFunc.js
@@ -94,6 +94,7 @@ export function getHeaderConfig(config) {
     if (child.sName !== '' && child.bVisible && child.showName !== '') {
       column.push({
         title: child.showName,
+        chineseTitle: child.sChinese,
         dataIndex: child.sName.trim(),
         width: child.iFitWidth,
         bFind: child.bFind,
--
libgit2 0.22.2