diff --git a/src/components/Common/CommonTable/index.js b/src/components/Common/CommonTable/index.js index 0c4850b..b05d834 100644 --- a/src/components/Common/CommonTable/index.js +++ b/src/components/Common/CommonTable/index.js @@ -4582,11 +4582,11 @@ class CommonTableRc extends React.Component { {expandedAllIcon} {editableSpan} {props.bXunjian && column.bXunjianSpecial ? ( - + {column.title} ) : props.bXunjian ? ( - {column.title} + {column.title} ) : column.title === "." ? ( "" ) : ( diff --git a/src/index.js b/src/index.js index 7fbfcba..019c549 100644 --- a/src/index.js +++ b/src/index.js @@ -9,6 +9,7 @@ import './indexNew.less'; import './default.less'; import './g2'; import './variable.less'; // 用于覆盖上面定义的变量 +import './lang/index.less'; // 用于不同语言的样式 const ERROR_MSG_DURATION = 5; diff --git a/src/lang/en-lang.less b/src/lang/en-lang.less new file mode 100644 index 0000000..26e7dac --- /dev/null +++ b/src/lang/en-lang.less @@ -0,0 +1,24 @@ +: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 diff --git a/src/lang/index.less b/src/lang/index.less new file mode 100644 index 0000000..cb75ff4 --- /dev/null +++ b/src/lang/index.less @@ -0,0 +1 @@ +@import "./en-lang.less"; diff --git a/src/mes/indexMes/index.js b/src/mes/indexMes/index.js index 74f30f3..f9cb7d8 100644 --- a/src/mes/indexMes/index.js +++ b/src/mes/indexMes/index.js @@ -365,6 +365,12 @@ const useIndexMesEvent = props => { window.deviceTargetInfoModal = false; }, []); + useEffect(() => { + const { userinfo } = props.app; + const { sLanguage } = userinfo; + document.querySelector('html').setAttribute('lang', sLanguage); + }, []); + return { props, hooksProps: state,