fmui-base 2.1.57 → 2.1.59

package/README.md

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

package/lib/form/table.js

@@ -863,20 +863,23 @@ var PageHome = function (_React$Component) {
 			var tableName = thisItem.tableName;
 			var thisSubTblNo = thisItem.subTblNo;
 			var mustFields = [];
+			var hideFields = [];
 			console.log("dealwithRelaField===");
 			if (formRelaFieldMapsObj && formRelaFieldMapsObj.length > 0) {
 				//解决同一字段 关联字段 编辑方式相同时冲突
 				var hideFlag = false;
 				var mustFlag = false;
 				var editFlag = false;
-				formRelaFieldMapsObj.map(function (formRelaFieldMapsObjItem) {
+				for (var formIndex = 0; formIndex < formRelaFieldMapsObj.length; formIndex++) {
+					var formRelaFieldMapsObjItem = formRelaFieldMapsObj[formIndex];
 					mustFlag = false;
 					var triggerFieldVal = formRelaFieldMapsObjItem.triggerFieldVal;
 					var relaFieldTblName = formRelaFieldMapsObjItem.relaFieldTblName;
 					var editType = formRelaFieldMapsObjItem.editType;
 					if (relaFieldTblName) {
 						if (relaFieldTblName) var relaFieldTblNameArray = relaFieldTblName.split(",");
-						relaFieldTblNameArray.map(function (relaFieldTblNameArrayItem, index) {
+						for (var index = 0; index < relaFieldTblNameArray.length; index++) {
+							var relaFieldTblNameArrayItem = relaFieldTblNameArray[index];
 							var nowValue = "";
 							var mainTblData = data.mainTblData;
 							var subTbl = data.subTbl;
@@ -915,10 +918,11 @@ var PageHome = function (_React$Component) {
 								if (triggerFieldVal == nowValue) {
 									relaFieldMap["value"] = true;
 									hideFlag = true;
-								} else if (!hideFlag) {
+									hideFields.push(relaFieldTblNameArrayItem);
+								} else if (!hideFlag && hideFields.indexOf(relaFieldTblNameArrayItem) == -1) {
 									relaFieldMap["value"] = false;
 								} else {
-									relaFieldMap["value"] = true;
+									relaFieldMap["value"] = false;
 								}
 							} else if (editType == 'must') {
 								relaFieldMap["key"] = "required";
@@ -936,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 {
@@ -955,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"];
 												}
 											}
 										}
@@ -1013,9 +1018,9 @@ var PageHome = function (_React$Component) {
 							if (isSubField) {} else {
 								t.refs[relaFieldTblNameArrayItem].reloadItemParam([relaFieldMap]);
 							}
-						});
+						}
 					}
-				});
+				}
 			}
 		}
 	}, {

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.57",
+  "version": "2.1.59",
   "title": "fmui-base",
   "description": "fmui移动端组件",
   "main": "lib/index.js",