diff --git a/src/components/Common/CommonTable/index.js b/src/components/Common/CommonTable/index.js index e58f1ef..dce9a70 100644 --- a/src/components/Common/CommonTable/index.js +++ b/src/components/Common/CommonTable/index.js @@ -1984,7 +1984,7 @@ class CommonTableRc extends React.Component { if (sLabelColor) { sLabelColor.render = (value = "白", record) => { - const colorList = "白粉青蓝橙绿黄红".split(""); + const colorList = commonFunc.showLocalMessage(this.props, 'eightColors', '白,粉,青,蓝,橙,绿,黄,红').split(","); let colorIndex = colorList.findIndex(item => item === value); colorIndex = colorIndex === -1 ? 0 : colorIndex; return ( @@ -4537,7 +4537,7 @@ class CommonTableRc extends React.Component { }); let extraStyle = {}; - if (this.props.app?.userinfo?.sLanguage !=='sEnglish' && columnLength > 10 || bIncludeSpecial) { + if (this.props.app?.userinfo?.sLanguage !=='sEnglish' && (columnLength > 10 || bIncludeSpecial)) { extraStyle = { display: "inline-block", width: "100%",