fmui-base 2.1.55 → 2.1.57

package/README.md

@@ -2,7 +2,9 @@
 
 ---npm publish
 
-## 更新日志
+## 更新日志 
+- 2.1.57：计算值时保留的小数位数根据当前字段的位数
+- 2.1.56：子表字段关联多个字段关联一个字段冲突问题处理
 - 2.1.55：主子表支持时间differHalfDay函数
 - 2.1.54：子表必填项校验定位位置不对
 - 2.1.53：上传组件根据文件大小显示单位不同

package/lib/form/table.js

@@ -862,6 +862,7 @@ var PageHome = function (_React$Component) {
 			var itemKey = thisItem.key;
 			var tableName = thisItem.tableName;
 			var thisSubTblNo = thisItem.subTblNo;
+			var mustFields = [];
 			console.log("dealwithRelaField===");
 			if (formRelaFieldMapsObj && formRelaFieldMapsObj.length > 0) {
 				//解决同一字段 关联字段 编辑方式相同时冲突
@@ -927,7 +928,8 @@ var PageHome = function (_React$Component) {
 									triggerFieldValBoolean = true;
 									mustFlag = true;
 									editFlag = true;
-								} else if (!mustFlag) {
+									mustFields.push(relaFieldTblNameArrayItem);
+								} else if (!mustFlag && mustFields.indexOf(relaFieldTblNameArrayItem) == -1) {
 									relaFieldMap["value"] = false;
 									triggerFieldValBoolean = false;
 								} else {
@@ -1133,9 +1135,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;
 										}
@@ -1175,6 +1177,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) {
@@ -1284,20 +1287,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.55",
+  "version": "2.1.57",
   "title": "fmui-base",
   "description": "fmui移动端组件",
   "main": "lib/index.js",