fmui-base 2.1.58 → 2.1.59

package/README.md

@@ -3,6 +3,7 @@
 ---npm publish
 
 ## 更新日志 
+- 2.1.59：关联表字段必填校验
 - 2.1.58：字段关联多个隐藏字段冲突问题处理
 - 2.1.57：计算值时保留的小数位数根据当前字段的位数
 - 2.1.56：子表字段关联多个字段关联一个字段冲突问题处理

package/lib/form/table.js

@@ -940,18 +940,19 @@ var PageHome = function (_React$Component) {
 									relaFieldMap["value"] = true;
 								}
 								var relaFieldNameArray = formRelaFieldMapsObjItem.relaFieldTblName.split(",");
-								mainTblData.map(function (item) {
+								for (var i = 0; i < mainTblData.length; i++) {
+									var item = mainTblData[i];
 									if (mainTblName + "_" + item.key == relaFieldNameArray[index]) {
-										item.required = triggerFieldValBoolean;
+										item.required = relaFieldMap["value"];
 									}
-								});
+								}
 								for (var i = 0; i < subTbl.length; i++) {
 									var subTblData = subTbl[i].subTblData;
 									if (isNowSub) {
 										var subTblDataItem = subTblData[thisSubTblNo];
 										for (var b = 0; b < subTblDataItem.length; b++) {
 											if (subTblDataItem[b].uniqueName == relaFieldNameArray[index]) {
-												subTbl[i].subTblData[thisSubTblNo][b].required = triggerFieldValBoolean;
+												subTbl[i].subTblData[thisSubTblNo][b].required = relaFieldMap["value"];
 											}
 										}
 									} else {
@@ -959,7 +960,7 @@ var PageHome = function (_React$Component) {
 											var subTblDataItem = subTblData[a];
 											for (var b = 0; b < subTblDataItem.length; b++) {
 												if (subTblDataItem[b].uniqueName == relaFieldNameArray[index]) {
-													subTbl[i].subTblData[a][b].required = triggerFieldValBoolean;
+													subTbl[i].subTblData[a][b].required = relaFieldMap["value"];
 												}
 											}
 										}

package/lib/process_info/processInfo.js

@@ -1723,6 +1723,24 @@ var PageHome = function (_React$Component) {
                 }
             }
 
+            var relatedTbl = saveTable.relatedTbl;
+            if (relatedTbl && relatedTbl.length > 0) {
+                for (var i = 0; i < relatedTbl.length; i++) {
+                    var relatedMainTblData = relatedTbl[i].relatedMainTblData;
+                    if (relatedMainTblData && relatedMainTblData.length > 0) {
+                        for (var j = 0; j < relatedMainTblData.length; j++) {
+                            var relatedMainTblDataItem = relatedMainTblData[j];
+                            if (relatedMainTblDataItem.required) {
+                                if (!relatedMainTblDataItem.value) {
+                                    this.scrollToAnchor("main_" + relatedMainTblDataItem.key);
+                                    return relatedMainTblDataItem.label;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
             return "";
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fmui-base",
-  "version": "2.1.58",
+  "version": "2.1.59",
   "title": "fmui-base",
   "description": "fmui移动端组件",
   "main": "lib/index.js",