fmui-base 2.2.69 → 2.2.70

package/README.md

@@ -3,6 +3,7 @@
 ---npm publish
 
 ## 更新日志 
+- 2.2.70: 移动端表单组件change事件itemParam丢失问题
 - 2.2.69: 移动端异常处理
 - 2.2.68: 移动端合同管理移动端跳转
 - 2.2.67: 移动端合同管理移动端跳转

package/lib/form/form.js

@@ -1578,8 +1578,8 @@ var PageHome = function (_React$Component) {
               $("." + itemParam.fieldId).find(".t-datetime-field-placeholder").attr("style", placeholderStyleStr);
             }
           }
+          this.props.onChange(data, itemParam);
         });
-        this.props.onChange(data, itemParam);
       }
 
       //CA验签

package/lib/form/table.js

@@ -1112,9 +1112,31 @@ var PageHome = function (_React$Component) {
 		value: function replaceDollar(a) {
 			return a && a.indexOf("$") != -1 ? a.replace(/\$/g, "\\$") : a;
 		}
+	}, {
+		key: 'isMainField',
+		value: function isMainField(uniqueName, formItem) {
+			for (var i = 0; i < formItem.length; i++) {
+				if (formItem[i].uniqueName == uniqueName) {
+					return true;
+				}
+			}
+			return false;
+		}
+	}, {
+		key: 'getMainItemParam',
+		value: function getMainItemParam(uniqueName, formItem) {
+			for (var i = 0; i < formItem.length; i++) {
+				if (formItem[i].uniqueName == uniqueName) {
+					return formItem[i];
+				}
+			}
+			return null;
+		}
 	}, {
 		key: 'forCalculateExpList',
 		value: function forCalculateExpList(data, itemParam, uniqueName) {
+			console.log("forCalculateExpList===" + uniqueName);
+			var allformItem = data.formItem;
 			var calculateExpList = data.calculateExpList;
 			if (calculateExpList) {
 				var calculateExpValue = calculateExpList[uniqueName];
@@ -1138,9 +1160,9 @@ var PageHome = function (_React$Component) {
 								var fieldArrayItem = fieldArray[j];
 
 								var fieldItem = null;
-								if (this.refs[fieldArrayItem]) {
+								if (this.isMainField(fieldArrayItem, allformItem)) {
 									//当字段是主表时
-									fieldItem = this.refs[fieldArrayItem].getItemParam();
+									fieldItem = this.getMainItemParam(fieldArrayItem, allformItem);
 								} else {
 									var subTableName = this.getSubRef(fieldArrayItem);
 									if (subTableName != "" && this.refs['sub_' + subTableName]) {
@@ -1261,6 +1283,7 @@ var PageHome = function (_React$Component) {
 							resultMap.value = res;
 							data = this.editData(resultKey, res, data);
 							this.refs[resultItem].reloadItemParam([resultMap]);
+							// this.reloadItemParam(resultItem, res);
 						}
 						if (returnResultItem && returnResultItem.length > 0) {
 							for (var r = 0; r < returnResultItem.length; r++) {

package/package.json

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