diff --git a/src/components/Common/CommonComponent/index.js b/src/components/Common/CommonComponent/index.js index 5c26d03..c6eb05f 100644 --- a/src/components/Common/CommonComponent/index.js +++ b/src/components/Common/CommonComponent/index.js @@ -709,7 +709,7 @@ export default class CommonComponent extends Component { this.handleSelectOptionEvent(''); }} > - 清空 + Clear ) } {this.props.showConfig.bNewRecord && ( @@ -754,7 +754,7 @@ export default class CommonComponent extends Component { const { userinfo } = app; let { sTableTitleSql } = showConfig; /* 根据用户配置语言 设置表格标题 */ - console.log('2122', showConfig); + if (commonUtils.isJSON(sTableTitleSql) && sTableTitleSql.includes('Chinese')) { sTableTitleSql = this.getLocalizedString(sTableTitleSql, userinfo.sLanguage); } diff --git a/src/components/Common/CommonTable/index.js b/src/components/Common/CommonTable/index.js index 056a569..b0b7eaa 100644 --- a/src/components/Common/CommonTable/index.js +++ b/src/components/Common/CommonTable/index.js @@ -11896,10 +11896,10 @@ const useCommonTableEvent = props => { const handleMoveLine = ({ index, direction }) => { if (direction === "up" && index === 0) { - message.error("当前已是首行,无法上移!"); + message.error("Top row reached. Cannot move up!"); return; } else if (direction === "down" && index === data.length - 1) { - message.error("当前已是末行,无法下移!"); + message.error("Bottom row reached. Cannot move down!"); return; } diff --git a/src/mes/common/commonModelComponent/index.js b/src/mes/common/commonModelComponent/index.js index af6e487..0748f19 100644 --- a/src/mes/common/commonModelComponent/index.js +++ b/src/mes/common/commonModelComponent/index.js @@ -1395,7 +1395,7 @@ const CommonModelComponent = props => { const sTabTip = sEnglishTabName !== sTabName ? sEnglishTabName + '-' + sTabName : sTabNewName; /* 悬浮提示 英文-中文 */ - console.log('sTabNewName', sTabNewName); + if (sTabName === "拼接列表" && sName === "slaveWypj3") { // 特殊处理:拼接详情可保存时,拼接列表tab不可点击