fmui-base 2.1.50 → 2.1.52

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.1.52：流程提交到最后结束节点保存批示意见
+- 2.1.51：关联字段触发字段支持子表字段
 - 2.1.50：流程普通退回增加回调
 - 2.1.49：流程提交到最后结束节点可以直接结束，跳过确认环节
 - 2.1.48：表单子表数据丢失处理，子表与关联表子表冲突

package/lib/form/table.js

@@ -323,7 +323,7 @@ var PageHome = function (_React$Component) {
 	}, {
 		key: 'change',
 		value: function change(data, itemParam, subTblNo) {
-
+			console.log("formRelaFieldMaps==" + this.state.formRelaFieldMaps);
 			var t = this;
 			var module = t.props.module;
 			var formKey = t.props.allForm ? t.props.allForm.formcode : "";
@@ -757,7 +757,7 @@ var PageHome = function (_React$Component) {
 					//关联字段
 					if (formRelaFieldMaps) {
 						var formRelaFieldMapsObj = formRelaFieldMaps[itemParam.uniqueName];
-						t.dealwithRelaField(formRelaFieldMapsObj, data, itemParam.key);
+						t.dealwithRelaField(formRelaFieldMapsObj, data, itemParam);
 					}
 				}
 
@@ -853,10 +853,15 @@ var PageHome = function (_React$Component) {
 		}
 	}, {
 		key: 'dealwithRelaField',
-		value: function dealwithRelaField(formRelaFieldMapsObj, data, itemKey) {
+		value: function dealwithRelaField(formRelaFieldMapsObj, data, thisItem) {
+			console.log("dealwithRelaField===" + formRelaFieldMapsObj);
 			var t = this;
 			var isSubField = false;
+			var isNowSub = false;
 			var subTblName = '';
+			var itemKey = thisItem.key;
+			var tableName = thisItem.tableName;
+			var thisSubTblNo = thisItem.subTblNo;
 			console.log("dealwithRelaField===");
 			if (formRelaFieldMapsObj && formRelaFieldMapsObj.length > 0) {
 				//解决同一字段 关联字段 编辑方式相同时冲突
@@ -876,12 +881,26 @@ var PageHome = function (_React$Component) {
 							var subTbl = data.subTbl;
 
 							var mainTblName = data.mainTblName;
-
-							mainTblData.map(function (item) {
-								if (item.key == itemKey) {
-									nowValue = item.value;
+							if (tableName == mainTblName) {
+								mainTblData.map(function (item) {
+									if (item.key == itemKey) {
+										nowValue = item.value;
+									}
+								});
+							} else {
+								if (subTbl && subTbl.length > 0) {
+									for (var j = 0; j < subTbl.length; j++) {
+										if (subTbl[j].subTblName == tableName && subTbl[j].subTblData.length > thisSubTblNo) {
+											for (var k = 0; k < subTbl[j].subTblData[thisSubTblNo].length; k++) {
+												if (subTbl[j].subTblData[thisSubTblNo][k].uniqueName == thisItem.uniqueName) {
+													nowValue = subTbl[j].subTblData[thisSubTblNo][k].value;
+													isNowSub = true;
+												}
+											}
+										}
+									}
 								}
-							});
+							}
 
 							if (nowValue && nowValue.indexOf("[") >= 0 && nowValue.indexOf("]") >= 0) {
 								var nowValueArray = JSON.parse(nowValue);
@@ -922,11 +941,20 @@ var PageHome = function (_React$Component) {
 								});
 								for (var i = 0; i < subTbl.length; i++) {
 									var subTblData = subTbl[i].subTblData;
-									for (var a = 0; a < subTblData.length; a++) {
-										var subTblDataItem = subTblData[a];
+									if (isNowSub) {
+										var subTblDataItem = subTblData[thisSubTblNo];
 										for (var b = 0; b < subTblDataItem.length; b++) {
 											if (subTblDataItem[b].uniqueName == relaFieldNameArray[index]) {
-												subTbl[i].subTblData[a][b].required = triggerFieldValBoolean;
+												subTbl[i].subTblData[thisSubTblNo][b].required = triggerFieldValBoolean;
+											}
+										}
+									} else {
+										for (var a = 0; a < subTblData.length; a++) {
+											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;
+												}
 											}
 										}
 									}
@@ -949,18 +977,32 @@ var PageHome = function (_React$Component) {
 										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 (isNowSub) {
+												var subTblDataItem = subTblData[thisSubTblNo];
 												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 + '_' + b;
+															var subItem = relaFieldTblNameArrayItem + '_' + thisSubTblNo;
 															t.refs[subTblNameItem].refs[subItem].reloadItemParam([relaFieldMap]);
 														}
 													}
 												}
+											} else {
+												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 + '_' + b;
+																t.refs[subTblNameItem].refs[subItem].reloadItemParam([relaFieldMap]);
+															}
+														}
+													}
+												}
 											}
 										}
 									}

package/lib/process_info/processInfo.js

@@ -1649,7 +1649,6 @@ var PageHome = function (_React$Component) {
         key: 'change',
         value: function change(data, itemParam) {
             console.log("数据回调" + itemParam.key);
-            debugger;
             //子流程去除id字段
             if (isSub != '' && data) {
                 var mainTblData = data.mainTblData;
@@ -2328,7 +2327,12 @@ var PageHome = function (_React$Component) {
                                 urgentList: [],
                                 isEnd: isEnd
                             }, function () {
+                                console.log("sendFlow直接结束");
                                 param.selectedActivity = '[{"id":"end_node","name":"结束","level":""}]';
+                                param.comment = newComment;
+                                param.hasCommentField = t.state.hasCommentField;
+                                param.attachId = t.state.commentAttachId;
+                                param.commentId = t.state.commentId;
                                 t.sendFlow(param);
                             });
                             return false;

package/package.json

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