Commit 8156d13fdb150ab688827435daeac49dd0f8888e

Authored by 陈鑫涛
2 parents 09c210af b6a35c39

Merge branch 'main' of http://git.xlyprint.cn/zhangz/xlyUmi into main

src/components/Common/CommonListEvent.js
@@ -1565,12 +1565,19 @@ export default (ChildComponent) => { @@ -1565,12 +1565,19 @@ export default (ChildComponent) => {
1565 slaveConfig, slaveSelectedData, token, app, sModelsId, formRoute, slaveInfoConfig, slaveInfoSelectedData, slaveFilterCondition, 1565 slaveConfig, slaveSelectedData, token, app, sModelsId, formRoute, slaveInfoConfig, slaveInfoSelectedData, slaveFilterCondition,
1566 slavePagination, slaveOrderBy, treeFilterCondition, dispatch, 1566 slavePagination, slaveOrderBy, treeFilterCondition, dispatch,
1567 } = this.props; 1567 } = this.props;
1568 - 1568 + const { userinfo } =app;
  1569 + const language = userinfo?.sLanguage || 'sChinese'; // 默认简体中文
1569 // 从表有sCopyToCondition则不能复制,并提示 1570 // 从表有sCopyToCondition则不能复制,并提示
1570 if (commonUtils.isNotEmptyArr(slaveSelectedData) && name.includes('.')) { 1571 if (commonUtils.isNotEmptyArr(slaveSelectedData) && name.includes('.')) {
1571 const sCopyToConditionIndex = slaveSelectedData.findIndex(item => item.sCopyToCondition); 1572 const sCopyToConditionIndex = slaveSelectedData.findIndex(item => item.sCopyToCondition);
1572 if (sCopyToConditionIndex !== -1) { 1573 if (sCopyToConditionIndex !== -1) {
1573 - message.warning(slaveSelectedData[sCopyToConditionIndex].sCopyToCondition); 1574 + if(language === 'sBig5') {
  1575 + message.warning(slaveSelectedData[sCopyToConditionIndex].sCopyToConditionBig5Name);
  1576 + } else if(language === 'sEnglish') {
  1577 + message.warning(slaveSelectedData[sCopyToConditionIndex].sCopyToConditionEnglishName);
  1578 + } else {
  1579 + message.warning(slaveSelectedData[sCopyToConditionIndex].sCopyToCondition);
  1580 + }
1574 return; 1581 return;
1575 } 1582 }
1576 } 1583 }