fmui-base 2.1.56 → 2.1.58

package/README.md

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

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";
@@ -1013,9 +1017,9 @@ var PageHome = function (_React$Component) {
 							if (isSubField) {} else {
 								t.refs[relaFieldTblNameArrayItem].reloadItemParam([relaFieldMap]);
 							}
-						});
+						}
 					}
-				});
+				}
 			}
 		}
 	}, {
@@ -1135,9 +1139,9 @@ var PageHome = function (_React$Component) {
 								} else {
 									var fieldType = itemParam.inputFormat;
 									var decimalPlace = itemParam.decimalPlace;
-									var mainTblData = data.mainTblData;
-									mainTblData.map(function (item, index) {
-										if (item.key == resultKey) {
+									var formItem = data.formItem;
+									formItem.map(function (item, index) {
+										if (item.itemCode == resultKey) {
 											fieldType = item.inputFormat;
 											decimalPlace = item.decimalPlace;
 										}
@@ -1177,6 +1181,7 @@ var PageHome = function (_React$Component) {
 		value: function forSubCalculateExpList(data, itemParam, uniqueName, subTblNo) {
 			var that = this;
 			var calculateExpList = data.subCalculateExpList;
+			var formItem = data.formItem;
 			if (calculateExpList) {
 				var calculateExpValue = calculateExpList[uniqueName];
 				if (calculateExpValue) {
@@ -1286,20 +1291,22 @@ var PageHome = function (_React$Component) {
 								} else {
 									var fieldType = itemParam.inputFormat;
 									var decimalPlace = itemParam.decimalPlace;
-									// var subTbl = data.subTbl;
-									// subTbl.map(function (item, index) {
-									// 	if (item.subTblName == itemParam.tableName) {
-									// 		var subTblData = item.subTblData;
-									// 		var subTblDatas = subTblData[data.subTblNo];
-									// 		for (var k = 0; k < subTblDatas.length; k++) {
-									// 			if (subTblDatas[k].key == resultKey) {
-									// 				fieldType = subTblDatas[k].inputFormat;
-									// 				decimalPlace = subTblDatas[k].decimalPlace;
-									// 			}
-									// 		}
-
-									// 	}
-									// });
+									var subTbl = data.subTbl;
+									if (formItem) {
+										for (var c = 0; c < formItem.length; c++) {
+											var item = formItem[c];
+											if (item.itemType == 'detail' && item.itemCode == itemParam.tableName) {
+												var children = item.children;
+												for (var k = 0; k < children.length; k++) {
+													if (children[k].itemCode == resultKey) {
+														fieldType = children[k].inputFormat;
+														decimalPlace = children[k].decimalPlace;
+													}
+												}
+											}
+										}
+									}
+
 									// fieldType = data.subTbl[h].subTblData[l].inputFormat;
 									// decimalPlace = data.subTbl[h].subTblData[l].decimalPlace;
 

package/package.json

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