Commit b8bf3e01560771a9d20fc631194b29eddb2c3983
1 parent
cd678ec4
优化英文版样式；
Showing
1 changed file
with
2 additions
and
2 deletions
src/components/Common/CommonTable/index.js
| @@ -1984,7 +1984,7 @@ class CommonTableRc extends React.Component { | @@ -1984,7 +1984,7 @@ class CommonTableRc extends React.Component { | ||
| 1984 | 1984 | ||
| 1985 | if (sLabelColor) { | 1985 | if (sLabelColor) { |
| 1986 | sLabelColor.render = (value = "白", record) => { | 1986 | sLabelColor.render = (value = "白", record) => { |
| 1987 | - const colorList = "白粉青蓝橙绿黄红".split(""); | 1987 | + const colorList = commonFunc.showLocalMessage(this.props, 'eightColors', '白,粉,青,蓝,橙,绿,黄,红').split(","); |
| 1988 | let colorIndex = colorList.findIndex(item => item === value); | 1988 | let colorIndex = colorList.findIndex(item => item === value); |
| 1989 | colorIndex = colorIndex === -1 ? 0 : colorIndex; | 1989 | colorIndex = colorIndex === -1 ? 0 : colorIndex; |
| 1990 | return ( | 1990 | return ( |
| @@ -4537,7 +4537,7 @@ class CommonTableRc extends React.Component { | @@ -4537,7 +4537,7 @@ class CommonTableRc extends React.Component { | ||
| 4537 | }); | 4537 | }); |
| 4538 | 4538 | ||
| 4539 | let extraStyle = {}; | 4539 | let extraStyle = {}; |
| 4540 | - if (this.props.app?.userinfo?.sLanguage !=='sEnglish' && columnLength > 10 || bIncludeSpecial) { | 4540 | + if (this.props.app?.userinfo?.sLanguage !=='sEnglish' && (columnLength > 10 || bIncludeSpecial)) { |
| 4541 | extraStyle = { | 4541 | extraStyle = { |
| 4542 | display: "inline-block", | 4542 | display: "inline-block", |
| 4543 | width: "100%", | 4543 | width: "100%", |