fmui-base 2.0.90 → 2.0.91

package/README.md

@@ -3,6 +3,7 @@
 ---npm publish
 
 ## 更新日志  
+- 2.0.91：表单组件关联字段支持绑定子表字段，子表change事件回调时增加子表的index
 - 2.0.90：表单组件子表处理
 - 2.0.89：表单组件子表处理
 - 2.0.88：表单组件支持关联表子表功能

package/lib/form/form.js

@@ -1293,9 +1293,8 @@ var PageHome = function (_React$Component) {
           t.props.onChange(data, t.state.itemParam);
         }
       }
-
       itemParam = t.dealwithLinkField(itemParam, data, status);
-      itemParam = t.dealwithRelaField(itemParam);
+      itemParam = t.dealwithRelaField(itemParam, allForm);
       if (itemType != 'weboffice') {
         itemParam.value = value;
         //处理特有按钮事件
@@ -1551,14 +1550,15 @@ var PageHome = function (_React$Component) {
 
   }, {
     key: 'dealwithRelaField',
-    value: function dealwithRelaField(itemParam) {
+    value: function dealwithRelaField(itemParam, allForm) {
       var formRelaFieldMaps = this.props.formRelaFieldMaps;
       if (formRelaFieldMaps) {
         if (formRelaFieldMaps[itemParam.uniqueName]) {
           var data = this.props.data;
           var mainTblData = data.mainTblData;
           var mainTblName = data.mainTblName;
-          var subTbl = data.subTbl;
+          // var subTbl = data.subTbl; 
+          var subTbl = allForm;
           var formRelaFieldMapsArray = formRelaFieldMaps[itemParam.uniqueName];
           formRelaFieldMapsArray.map(function (item) {
             if (item.triggerTblName == mainTblName) {
@@ -1603,11 +1603,12 @@ var PageHome = function (_React$Component) {
                 }
               });
             } else {
-              subTbl.map(function (subTblItem) {
-                if (subTblItem.subTblName == item.triggerTblName) {
-                  var subTblData = subTblItem.subTblData;
+              var subTbls = subTbl.item;
+              subTbls.map(function (subTblItem) {
+                if (subTbl.tblName == item.triggerTblName) {
+                  var subTblData = subTblItem;
                   subTblData.map(function (mainTblDataItem) {
-                    if (item.triggerFieldName == mainTblDataItem.key) {
+                    if (item.triggerFieldName == mainTblDataItem.itemCode) {
                       // if(item.triggerFieldVal == mainTblDataItem.value){
                       var editType = item.editType;
                       if (editType == 'hide') {
@@ -1633,7 +1634,7 @@ var PageHome = function (_React$Component) {
                         //     item.required = triggerFieldValBoolean;
                         //   }
                         // });
-                        if (item.relaFieldName == mainTblDataItem.key) {
+                        if (item.relaFieldName == mainTblDataItem.itemCode) {
                           mainTblDataItem.required = triggerFieldValBoolean;
                         }
                       } else if (editType == 'edit') {

package/lib/form/table.js

@@ -306,6 +306,9 @@ var PageHome = function (_React$Component) {
 			var module = t.props.module;
 			var formKey = t.props.allForm ? t.props.allForm.formcode : "";
 			var formTblId = t.props.allForm ? t.props.allForm.formTblId : "";
+			if (typeof subTblNo != 'undefined') {
+				itemParam.subTblNo = subTblNo;
+			}
 			if (itemParam && itemParam.key) {
 				//修改事件的时候
 
@@ -830,6 +833,8 @@ var PageHome = function (_React$Component) {
 		key: 'dealwithRelaField',
 		value: function dealwithRelaField(formRelaFieldMapsObj, data, itemKey) {
 			var t = this;
+			var isSubField = false;
+			var subTblName = '';
 			if (formRelaFieldMapsObj && formRelaFieldMapsObj.length > 0) {
 				//解决同一字段 关联字段 编辑方式相同时冲突
 				var hideFlag = false;
@@ -899,7 +904,33 @@ var PageHome = function (_React$Component) {
 									relaFieldMap["value"] = false;
 								}
 							}
-							t.refs[relaFieldTblNameArrayItem].reloadItemParam([relaFieldMap]);
+							if (relaFieldTblNameArrayItem) {
+								var subTbl = data.subTbl;
+								if (subTbl && subTbl.length > 0) {
+									for (var j = 0; j < subTbl.length; j++) {
+										var subTblData = subTbl[j].subTblData;
+										subTblName = subTbl[j].subTblName;
+										if (subTblData && subTblData.length > 0) {
+											for (var b = 0; b < subTblData.length; b++) {
+												var subTblDataItem = subTblData[b];
+												if (subTblDataItem && subTblDataItem.length > 0) {
+													for (var a = 0; a < subTblDataItem.length; a++) {
+														if (relaFieldTblNameArrayItem == subTblDataItem[a].uniqueName) {
+															isSubField = true;
+															var subTblNameItem = "sub_" + subTblName;
+															var subItem = relaFieldTblNameArrayItem + '_' + a;
+															t.refs[subTblNameItem].refs[subItem].reloadItemParam([relaFieldMap]);
+														}
+													}
+												}
+											}
+										}
+									}
+								}
+							}
+							if (isSubField) {} else {
+								t.refs[relaFieldTblNameArrayItem].reloadItemParam([relaFieldMap]);
+							}
 						});
 					}
 				});

package/package.json

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