Merge branch 'release/customer/2025/AJT' of http://git.xlyprint.cn/qiangmj/ebc-M…

…es into release/customer/2025/AJT

Merge branch 'release/customer/2025/AJT' of http://git.xlyprint.cn/qiangmj/ebc-M…
…es into release/customer/2025/AJT
Min
2 parents 4b8a88d3 6c9aeea1
Showing 5 changed files with 34 additions and 2 deletions
src/components/Common/CommonTable/index.js
src/index.js
src/lang/en-lang.less
src/lang/index.less
src/mes/indexMes/index.js
@@ -4582,11 +4582,11 @@ class CommonTableRc extends React.Component {
               {expandedAllIcon}
               {editableSpan}
               {props.bXunjian && column.bXunjianSpecial ? (
-                <span style={{ color: "red", ...extraStyle }}>
+                <span style={{ color: "red", ...extraStyle }} title={`${column.title}`}>
                   {column.title}
                 </span>
               ) : props.bXunjian ? (
-                <span style={{ ...extraStyle }}>{column.title}</span>
+                <span style={{ ...extraStyle }} title={`${column.title}`}>{column.title}</span>
               ) : column.title === "." ? (
                 ""
               ) : (
@@ -9,6 +9,7 @@ import &#39;./indexNew.less&#39;;
 import './default.less';
 import './g2';
 import './variable.less'; // 用于覆盖上面定义的变量
+import './lang/index.less'; // 用于不同语言的样式
  
  
 const ERROR_MSG_DURATION = 5;
+:global {
+  html[lang="sEnglish"] {
+    th[width="40"] {
+      .th-div {
+        width: 32px;
+        margin: 0;
+        height: auto;
+        display: -webkit-box;
+        /*! autoprefixer: ignore next */
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 10;
+        /* 只保留 2 行 */
+        overflow: hidden;
+        text-overflow: ellipsis;
+        /* 兜底 */
+        white-space: normal;
+        word-break: break-all;
+        /* 覆盖 antd 默认 nowrap */
+        /* 按需调整，决定何时断行 */
+        line-height: 1.2;
+      }
+    }
+  }
+}
 \ No newline at end of file
+@import "./en-lang.less";
@@ -365,6 +365,12 @@ const useIndexMesEvent = props =&gt; {
     window.deviceTargetInfoModal = false;
   }, []);
  
+  useEffect(() => {
+    const { userinfo } = props.app;
+    const { sLanguage } = userinfo;
+    document.querySelector('html').setAttribute('lang', sLanguage);
+  }, []);
+
   return {
     props,
     hooksProps: state,