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

陈鑫涛
2 parents 7290ea02 771c8078
Showing 3 changed files with 31 additions and 11 deletions
src/components/Common/CommonElementEvent.js
src/components/Common/commonBusiness.js
src/components/CommonElementEvent/SisformulaInfo.js
@@ -394,7 +394,7 @@ export default (ChildComponent) =&gt; {
         /* 自定义参数 */
         let selfParamConfig = commonUtils.isNotEmptyArr(formData.filter(item => item.bGrd && item.sTbName === 'sisformulacustomizevariable')) ?
-          formData.filter(item => item.bGrd && item.sTbName === 'sisformulacustomizeparam')[0] : {};
+          formData.filter(item => item.bGrd && item.sTbName === 'sisformulacustomizevariable')[0] : {};
         let selfParamColumn = [];
         if(commonUtils.isNotEmptyArr(selfParamConfig)) {
           selfParamColumn = commonFunc.getHeaderConfig(selfParamConfig);
@@ -1834,17 +1834,18 @@ export function validatePramsNotEmpty(props) {
   const errorMessage = commonFunc.showLocalMessage(props, 'errorMessage', '错误提示');
+  const line = commonFunc.showLocalMessage(props, 'line', '的【第${iOrder}行】的');
   const allTableConfig = commonFunc.getAllTableConfig(props);
   const bParamsMustConfigList = [];
   Object.keys(allTableConfig).forEach(tableName => {
     const tableConfig = allTableConfig[tableName] || {};
-    const { gdsconfigformslave = [], sChinese } = tableConfig;
+    const { gdsconfigformslave = [], sChinese, showName } = tableConfig;
     const bMustConfig = gdsconfigformslave.find(item => item.sControlName === 'paramsNotEmpty');
     if (bMustConfig) {
       const { sDefault } = bMustConfig;
       if (sDefault) {
-        bParamsMustConfigList.push([tableName, sChinese, sDefault.split(',')]);
+        bParamsMustConfigList.push([tableName, sChinese, sDefault.split(','), showName]);
       }
     }
   })
@@ -1861,7 +1862,7 @@ export function validatePramsNotEmpty(props) {
   try {
     for (let i = 0; i < bParamsMustConfigList.length; i++) {
-      const [tableName, sChinese, sParamsNamesList] = bParamsMustConfigList[i];
+      const [tableName, sChinese, sParamsNamesList, showName] = bParamsMustConfigList[i];
       const tableData = props[`${tableName}Data`] || [];
       let sProductName = '';
       let sMainPre = '';
@@ -1930,7 +1931,10 @@ export function validatePramsNotEmpty(props) {
               iIndex = iIndex + 1;
             }
-            const sChineseTableName = sChinese.charAt(sChinese.length - 1) === '表' ? sChinese : `${sChinese}表`;
+            let sChineseTableName = sChinese.charAt(sChinese.length - 1) === '表' ? sChinese : `${sChinese}表`;
+            if(props?.app?.userinfo?.sLanguage === 'sEnglish') {
+              sChineseTableName = showName;
+            }
             if (commonUtils.isNotEmptyStr(rowData.sControlId) ) {
               const { slaveData, slave0Child1Data, controlData: controlDataOld } = props;
               const controlData = slave0Child1Data ? slave0Child1Data : controlDataOld;
@@ -1948,9 +1952,17 @@ export function validatePramsNotEmpty(props) {
             }
             if (!commonUtils.isEmpty(sTip)) {
               if (commonUtils.isNotEmptyStr(sProductName) && iLocationIndex > -1) {
-                sTipAll = `${sTipAll}${sMainPre}【${sProductName}的 ${sChineseTableName}】的【第${iLocationIndex + 1}行】的 ${sTip}xpm`;
+                let sLine = `的【第${iLocationIndex + 1}行】的`;
+                if(props?.app?.userinfo?.sLanguage === 'sEnglish') {
+                  sLine = line + iLocationIndex + 1;
+                }
+                sTipAll = `${sTipAll}${sMainPre}【${sProductName}的 ${sChineseTableName}】${sLine} ${sTip}xpm`;
               } else {
-                sTipAll = `${sTipAll}【${sChineseTableName}】的【第${iOrder}行】的 ${sTip}xpm`
+                let sLine = `的【第${iOrder}行】的`;
+                if(props?.app?.userinfo?.sLanguage === 'sEnglish') {
+                  sLine = line + iOrder;
+                }
+                sTipAll = `${sTipAll}【${sChineseTableName}】${sLine}${sTip}xpm`
               }
             }
           }
@@ -65,10 +65,18 @@ class SisformulaInfoComponent extends Component {
         let sParam = '';
         /* 找到该字段所在行 */
         const iIndex = tableData.findIndex(item => item.sId === record.sId);
-        if (iIndex > -1) {
-          sParam = `${firstChar}${iIndex}_${showConfig.sName}`;
-        } else {
-          sParam = showConfig.sName;
+        if(showConfig.sName=== 'sName') {
+          if (iIndex > -1) {
+            sParam = record[showConfig.sName];
+          } else {
+            sParam = showConfig.sName;
+          }
+        }else {
+          if (iIndex > -1) {
+            sParam = `${firstChar}${iIndex}_${showConfig.sName}`;
+          } else {
+            sParam = showConfig.sName;
+          }
         }
         const value = `@${sParam}`;
         const masterData = { ...masterDataOld };