fmui-base 2.3.4 → 2.3.5

package/README.md

@@ -3,6 +3,7 @@
 ---npm publish
 
 ## 更新日志 
+- 2.3.5：联动字段保存后被清空
 - 2.3.4：移动端表单下拉单选和按钮按钮组件样式更换
 - 2.3.3：移动端表单下拉单选和按钮按钮组件样式更换
 - 2.3.2：流程设置支持配置流程转交是否填写批示意见

package/lib/form/table.js

@@ -165,6 +165,72 @@ function buildFormRelaFieldMapsByRelaField(triggerFieldsMap) {
 	return relaFieldsMap;
 }
 
+// 构建联动下拉选项（对齐 PC：从联动结果 + 已保存 multiItemsLinkField 取显示文本）
+function buildLinkageSelectOptions(contentValue, relateItemParam, fieldDataItem) {
+	var selectOptions = [];
+	var lookupSources = [];
+	if (relateItemParam) {
+		if (relateItemParam.selectOptions) {
+			lookupSources.push(relateItemParam.selectOptions);
+		}
+		if (relateItemParam.selectItem) {
+			lookupSources.push(relateItemParam.selectItem);
+		}
+	}
+	if (fieldDataItem && fieldDataItem.multiItemsLinkField) {
+		lookupSources.push(fieldDataItem.multiItemsLinkField);
+	}
+	for (var c = 0; c < contentValue.length; c++) {
+		var val = contentValue[c];
+		var option = { value: val, text: val };
+		for (var s = 0; s < lookupSources.length; s++) {
+			var src = lookupSources[s];
+			if (!src) {
+				continue;
+			}
+			for (var i = 0; i < src.length; i++) {
+				var item = src[i];
+				if (item && item.value == val) {
+					option.text = item.text || item.name || val;
+					break;
+				}
+			}
+		}
+		selectOptions.push(option);
+	}
+	return selectOptions;
+}
+
+// 联动下拉赋值：编辑打开时优先保留已保存值（对齐 PC real-value 逻辑）
+function resolveLinkageSelectValue(containUniqueFlag, savedValue, candidateValue, formItem, fieldKey) {
+	var tva = candidateValue || '';
+	if (containUniqueFlag === true) {
+		return tva;
+	}
+	if (savedValue != null && savedValue !== '') {
+		var available = tva ? String(tva).split(',') : [];
+		var savedArr = String(savedValue).split(',');
+		var matched = savedArr.filter(function (v) {
+			return available.indexOf(v) > -1;
+		});
+		if (matched.length > 0) {
+			return matched.join(',');
+		}
+		if (available.length === 1) {
+			return available[0];
+		}
+		return savedValue;
+	}
+	if (formItem && fieldKey) {
+		for (var f = 0; f < formItem.length; f++) {
+			if (formItem[f].itemCode == fieldKey && formItem[f].value == tva) {
+				return tva;
+			}
+		}
+	}
+	return '';
+}
+
 var PageHome = function (_React$Component) {
 	_inherits(PageHome, _React$Component);
 
@@ -350,6 +416,7 @@ var PageHome = function (_React$Component) {
 		// 		"relaTblName" : "cs_test"
 		// 	  } ]
 		// }
+		_this._isFormInitialLoading = true;
 		return _this;
 	}
 
@@ -357,17 +424,53 @@ var PageHome = function (_React$Component) {
 		key: 'componentDidMount',
 		value: function componentDidMount() {
 			var t = this;
+			// 等子字段 loadComponet 完成后再统一刷新关联/联动，避免打开编辑页时清空已保存值
+			setTimeout(function () {
+				t.initFormLinkageAndRelaFields();
+			}, 500);
+		}
 
-			// let formItem = this.props.form;
-			// let commentList = this.props.commentList;
-			// let formData = this.props.formData;
+		// 编辑/查看打开后：刷新字段关联规则，并按触发条件回填联动字段（保留已保存值）
 
-			// t.setState({
-			// 	formItem:formItem,
-			// 	commentFieldList:commentFieldList,
-			// 	commentDefaultList:commentDefaultList,
-			// 	formData:formData
-			// });
+	}, {
+		key: 'initFormLinkageAndRelaFields',
+		value: function initFormLinkageAndRelaFields() {
+			var t = this;
+			var data = t.props.data;
+			if (!data) {
+				t._isFormInitialLoading = false;
+				return;
+			}
+			t._isRelaFieldRefreshing = true;
+			try {
+				t.reloadFormRelaField({ initFlag: true });
+			} finally {
+				t._isRelaFieldRefreshing = false;
+			}
+			var linkFields = data.linkFields;
+			if (linkFields && linkFields.length > 0) {
+				var processed = {};
+				var formItem = data.formItem || [];
+				for (var i = 0; i < linkFields.length; i++) {
+					var formField = linkFields[i].formField;
+					if (!formField || processed[formField]) {
+						continue;
+					}
+					processed[formField] = true;
+					for (var j = 0; j < formItem.length; j++) {
+						if (formField.indexOf(formItem[j].fieldId) > -1) {
+							t.processLinkFieldsUpdate(data, {
+								fieldId: formItem[j].fieldId,
+								key: formItem[j].itemCode,
+								uniqueName: data.mainTblName + '_' + formItem[j].itemCode,
+								itemType: formItem[j].itemType
+							}, undefined, { initFlag: true });
+							break;
+						}
+					}
+				}
+			}
+			t._isFormInitialLoading = false;
 		}
 	}, {
 		key: 'reloadItemParam',
@@ -529,308 +632,20 @@ var PageHome = function (_React$Component) {
 
 					var fieldId = itemParam.fieldId;
 					var linkFields = data.linkFields;
-					var formItem = data.formItem;
-					if (linkFields && linkFields != null) {
-						for (var i = 0; i < linkFields.length; i++) {
-							var formField = linkFields[i].formField;
-							if (formField != null && formField != '') {
-								var ffid = formField.split(",");
-								var conditionArrayJSON = [];
-								if (formField.indexOf(fieldId) != -1) {
-									for (var j = 0; j < ffid.length; j++) {
-										var linkFormKey = "";
-										var linkFormTableKey = "";
-										var isSub = false;
-										for (var f = 0; f < formItem.length; f++) {
-											if (ffid[j] == formItem[f].fieldId) {
-												linkFormKey = formItem[f].itemCode;
-												linkFormTableKey = mainTblName;
-												continue;
-											} else if (formItem[f].itemType == 'detail') {
-												for (var g = 0; g < formItem[f].children.length; g++) {
-													if (ffid[j] == formItem[f].children[g].fieldId) {
-														linkFormKey = formItem[f].children[g].itemCode;
-														linkFormTableKey = formItem[f].itemCode;
-														isSub = true;
-														continue;
-													}
-												}
-											}
-										}
-										if (linkFormKey) {
-											var selectValue = "";
-											var isSelect = false;
-											if (isSub) {
-												for (var l = 0; l < subTbl.length; l++) {
-													if (subTbl[l].subTblName == linkFormTableKey) {
-														for (var g = 0; g < subTbl[l].subTblData[subTblNo].length; g++) {
-															if (subTbl[l].subTblData[subTblNo][g].key == linkFormKey) {
-																var option = {};
-																option.value = subTbl[l].subTblData[subTblNo][g].value;
-																option.formField = ffid[j];
-																conditionArrayJSON.push(option);
-																continue;
-															}
-														}
-													}
-												}
-											} else {
-												for (var k = 0; k < mainTblData.length; k++) {
-													if (linkFormTableKey + "_" + linkFormKey == mainTblName + "_" + mainTblData[k].key) {
-														var option = {};
-														selectValue = mainTblData[k].value;
-														option.value = mainTblData[k].value;
-														option.formField = ffid[j];
-														conditionArrayJSON.push(option);
-														isSelect = true;
-														continue;
-													}
-												}
-											}
-										}
-									}
-								}
-								if (conditionArrayJSON.length > 0) {
-									_db2.default.FlowModuleAPI.getLinkFieldValueMap({
-										triggerFormFields: formField,
-										formId: data.formId,
-										conditionArrayJSON: JSON.stringify(conditionArrayJSON)
-									}).then(function (content) {
-										if (content) {
-											var containUniqueFlag = content['containUniqueFlag'];
-											var content = content['map'];
-											for (var key in content) {
-												var contentValue = content[key];
-
-												var tolinkFormKey = "";
-												var tolinkFormType = "";
-												var tolinkFormTableKey = "";
-												var toisSub = false;
-												for (var f = 0; f < formItem.length; f++) {
-													if (key == formItem[f].fieldId) {
-														tolinkFormKey = formItem[f].itemCode;
-														tolinkFormType = formItem[f].itemType;
-														tolinkFormTableKey = mainTblName;
-													} else if (formItem[f].itemType == 'detail') {
-														for (var g = 0; g < formItem[f].children.length; g++) {
-															if (key == formItem[f].children[g].fieldId) {
-																tolinkFormKey = formItem[f].children[g].itemCode;
-																tolinkFormType = formItem[f].children[g].itemType;
-																tolinkFormTableKey = formItem[f].itemCode;
-																toisSub = true;
-																continue;
-															}
-														}
-													}
-												}
-												if (tolinkFormKey) {
-													if (!toisSub) {
-														for (var m = 0; m < mainTblData.length; m++) {
-															if (tolinkFormKey == mainTblData[m].key) {
-																var relateItemParam = t.refs[mainTblName + "_" + mainTblData[m].key].getItemParam();
-																if (",text,textarea,datetime,datetimeStep,".indexOf("," + tolinkFormType + ",") != -1) {
-																	var textValue = '';
-																	var valueMap = {};
-																	valueMap.key = 'value';
-																	for (var c = 0; c < contentValue.length; c++) {
-																		textValue = textValue + "," + contentValue[c];
-																	}
-																	valueMap.value = textValue.substring(1);
-
-																	t.refs[mainTblName + "_" + mainTblData[m].key].reloadItemParam([valueMap]);
-																	mainTblData[m].value = textValue.substring(1);
-																} else if (",radio,checkbox,select,".indexOf("," + tolinkFormType + ",") != -1) {
-																	var textValue = '';
-																	var resultMap = {};
-																	resultMap.key = 'selectOptions';
-
-																	var selectOptions = [];
-																	for (var c = 0; c < contentValue.length; c++) {
-																		textValue = textValue + "," + contentValue[c];
-																		var option = {};
-																		relateItemParam.selectItem.map(function (selectItemObj) {
-																			if (selectItemObj.value == contentValue[c]) {
-																				option.value = contentValue[c];
-																				option.text = selectItemObj.text;
-																				selectOptions.push(option);
-																			}
-																		});
-																	}
-																	resultMap.value = selectOptions;
-
-																	var valueMap1 = {};
-																	valueMap1.key = 'value';
-																	valueMap1.value = "";
-																	mainTblData[m].value = "";
-																	var tva = textValue.substring(1);
-																	if (containUniqueFlag == true) {
-																		valueMap1.value = tva;
-																		mainTblData[m].value = tva;
-																	} else {
-																		for (var f = 0; f < formItem.length; f++) {
-																			if (formItem[f].itemCode == mainTblData[m].key && formItem[f].value == tva) {
-																				valueMap1.value = tva;
-																				mainTblData[m].value = tva;
-																				break;
-																			}
-																		}
-																	}
-																	t.refs[mainTblName + "_" + mainTblData[m].key].reloadItemParam([resultMap, valueMap1]);
-																}
-															}
-														}
-													} else {
-														if (isSub) {
-															for (var l = 0; l < subTbl.length; l++) {
-																if (subTbl[l].subTblName == tolinkFormTableKey) {
-																	for (var g = 0; g < subTbl[l].subTblData[subTblNo].length; g++) {
-																		if (subTbl[l].subTblData[subTblNo][g].key == tolinkFormKey) {
-																			var relateItemParam = t.refs["sub_" + tolinkFormTableKey].refs[tolinkFormTableKey + "_" + subTbl[l].subTblData[subTblNo][g].key + "_" + subTblNo].getItemParam();
-																			if (",text,textarea,datetime,datetimeStep,".indexOf("," + tolinkFormType + ",") != -1) {
-																				var textValue = '';
-																				var valueMap = {};
-																				valueMap.key = 'value';
-																				for (var c = 0; c < contentValue.length; c++) {
-																					textValue = textValue + "," + contentValue[c];
-																				}
-																				valueMap.value = textValue.substring(1);
-
-																				t.refs["sub_" + tolinkFormTableKey].refs[tolinkFormTableKey + "_" + subTbl[l].subTblData[subTblNo][g].key + "_" + subTblNo].reloadItemParam([valueMap]);
-																				subTbl[l].subTblData[subTblNo][g].value = textValue.substring(1);
-																			} else if (",radio,checkbox,select,".indexOf("," + tolinkFormType + ",") != -1) {
-																				var textValue = '';
-																				var resultMap = {};
-																				resultMap.key = 'selectOptions';
-
-																				var selectOptions = [];
-																				for (var c = 0; c < contentValue.length; c++) {
-																					textValue = textValue + "," + contentValue[c];
-																					var option = {};
-																					relateItemParam.selectItem.map(function (selectItemObj) {
-																						if (selectItemObj.value == contentValue[c]) {
-																							option.value = contentValue[c];
-																							option.text = selectItemObj.text;
-																							selectOptions.push(option);
-																						}
-																					});
-																				}
-																				resultMap.value = selectOptions;
-
-																				var valueMap1 = {};
-																				valueMap1.key = 'value';
-																				valueMap1.value = "";
-																				subTbl[l].subTblData[subTblNo][g].value = "";
-																				var tva = textValue.substring(1);
-																				if (containUniqueFlag == true) {
-																					valueMap1.value = tva;
-																					subTbl[l].subTblData[subTblNo][g].value = tva;
-																				} else {
-																					for (var f = 0; f < formItem.length; f++) {
-																						if (formItem[f].itemType == 'detail' && formItem[f].itemCode == tolinkFormTableKey) {
-																							for (var h = 0; h < formItem[f].children.length; h++) {
-																								if (formItem[f].children[h].itemCode == subTbl[l].subTblData[subTblNo][g].key && formItem[f].children[h].value == tva) {
-																									valueMap1.value = tva;
-																									subTbl[l].subTblData[subTblNo][g].value = tva;
-																									break;
-																								}
-																							}
-																						}
-																					}
-																				}
-																				t.refs["sub_" + tolinkFormTableKey].refs[tolinkFormTableKey + "_" + subTbl[l].subTblData[subTblNo][g].key + "_" + subTblNo].reloadItemParam([resultMap, valueMap1]);
-																			}
-																		}
-																	}
-																}
-															}
-														} else {
-															for (var l = 0; l < subTbl.length; l++) {
-																if (subTbl[l].subTblName == tolinkFormTableKey) {
-																	for (var o = 0; o < subTbl[l].subTblData.length; o++) {
-																		for (var g = 0; g < subTbl[l].subTblData[o].length; g++) {
-																			if (tolinkFormKey == subTbl[l].subTblData[o][g].key) {
-																				var relateItemParam = t.refs["sub_" + tolinkFormTableKey].refs[tolinkFormTableKey + "_" + subTbl[l].subTblData[o][g].key + "_" + o].getItemParam();
-																				if (",text,textarea,datetime,datetimeStep,".indexOf("," + tolinkFormType + ",") != -1) {
-																					var textValue = '';
-																					var valueMap = {};
-																					valueMap.key = 'value';
-																					for (var c = 0; c < contentValue.length; c++) {
-																						textValue = textValue + "," + contentValue[c];
-																					}
-																					valueMap.value = textValue.substring(1);
-
-																					t.refs["sub_" + tolinkFormTableKey].refs[tolinkFormTableKey + "_" + subTbl[l].subTblData[o][g].key + "_" + o].reloadItemParam([valueMap]);
-																					subTbl[l].subTblData[o][g].value = textValue.substring(1);
-																				} else if (",radio,checkbox,select,".indexOf("," + tolinkFormType + ",") != -1) {
-																					var textValue = '';
-																					var resultMap = {};
-																					resultMap.key = 'selectOptions';
-
-																					var selectOptions = [];
-																					for (var c = 0; c < contentValue.length; c++) {
-																						textValue = textValue + "," + contentValue[c];
-																						var option = {};
-																						relateItemParam.selectItem.map(function (selectItemObj) {
-																							if (selectItemObj.value == contentValue[c]) {
-																								option.value = contentValue[c];
-																								option.text = selectItemObj.text;
-																								selectOptions.push(option);
-																							}
-																						});
-																					}
-																					resultMap.value = selectOptions;
-
-																					var valueMap1 = {};
-																					valueMap1.key = 'value';
-																					valueMap1.value = "";
-																					subTbl[l].subTblData[o][g].value = "";
-																					var tva = textValue.substring(1);
-																					if (containUniqueFlag == true) {
-																						valueMap1.value = tva;
-																						subTbl[l].subTblData[o][g].value = tva;
-																					} else {
-																						for (var f = 0; f < formItem.length; f++) {
-																							if (formItem[f].itemType == 'detail' && formItem[f].itemCode == tolinkFormTableKey) {
-																								for (var h = 0; h < formItem[f].children.length; h++) {
-																									if (formItem[f].children[h].itemCode == subTbl[l].subTblData[o][g].key && formItem[f].children[h].value == tva) {
-																										valueMap1.value = tva;
-																										subTbl[l].subTblData[o][g].value = tva;
-																										break;
-																									}
-																								}
-																							}
-																						}
-																					}
-																					t.refs["sub_" + tolinkFormTableKey].refs[tolinkFormTableKey + "_" + subTbl[l].subTblData[o][g].key + "_" + o].reloadItemParam([resultMap, valueMap1]);
-																				}
-																			}
-																		}
-																	}
-																}
-															}
-														}
-													}
-												}
-											}
-										}
-									}).catch(function (error) {
-										console.error(error);
-									});
-								}
-							}
-						}
+					if (!t._isFormInitialLoading && linkFields && linkFields != null) {
+						t.processLinkFieldsUpdate(data, itemParam, subTblNo, { initFlag: false });
 					}
 
 					//关联字段刷新（silent 模式，不向上触发 onChange）
 					var hasRelaFieldsMap = t.state.formRelaFieldMaps && Object.keys(t.state.formRelaFieldMaps).length > 0;
-					if (hasRelaFieldsMap) {
+					if (!t._isFormInitialLoading && hasRelaFieldsMap) {
 						t._isRelaFieldRefreshing = true;
 						try {
 							t.refreshAllRelaFieldsByRelaMap(data, itemParam.uniqueName, subTblNo);
 						} finally {
 							t._isRelaFieldRefreshing = false;
 						}
-					} else if (formRelaFieldMaps) {
+					} else if (!t._isFormInitialLoading && formRelaFieldMaps) {
 						var formRelaFieldMapsObj = formRelaFieldMaps[itemParam.uniqueName];
 						if (formRelaFieldMapsObj && formRelaFieldMapsObj.length > 0) {
 							t._isRelaFieldRefreshing = true;
@@ -898,17 +713,206 @@ var PageHome = function (_React$Component) {
 			}
 		}
 
+		// 字段联动：触发字段变更或编辑页打开时回填联动目标（initFlag=true 时保留已保存文本/下拉值）
+
+	}, {
+		key: 'processLinkFieldsUpdate',
+		value: function processLinkFieldsUpdate(data, itemParam, subTblNo, options) {
+			var t = this;
+			var initFlag = options && options.initFlag === true;
+			var linkFields = data.linkFields;
+			var formItem = data.formItem;
+			var mainTblData = data.mainTblData;
+			var mainTblName = data.mainTblName;
+			var subTbl = data.subTbl;
+			var fieldId = itemParam.fieldId;
+			if (!linkFields || !fieldId) {
+				return;
+			}
+			for (var i = 0; i < linkFields.length; i++) {
+				var formField = linkFields[i].formField;
+				if (!formField || formField.indexOf(fieldId) == -1) {
+					continue;
+				}
+				var ffid = formField.split(",");
+				var conditionArrayJSON = [];
+				for (var j = 0; j < ffid.length; j++) {
+					var linkFormKey = "";
+					var linkFormTableKey = "";
+					var isSubTrigger = false;
+					for (var f = 0; f < formItem.length; f++) {
+						if (ffid[j] == formItem[f].fieldId) {
+							linkFormKey = formItem[f].itemCode;
+							linkFormTableKey = mainTblName;
+						} else if (formItem[f].itemType == 'detail') {
+							for (var g = 0; g < formItem[f].children.length; g++) {
+								if (ffid[j] == formItem[f].children[g].fieldId) {
+									linkFormKey = formItem[f].children[g].itemCode;
+									linkFormTableKey = formItem[f].itemCode;
+									isSubTrigger = true;
+								}
+							}
+						}
+					}
+					if (!linkFormKey) {
+						continue;
+					}
+					if (isSubTrigger && typeof subTblNo != 'undefined') {
+						for (var l = 0; l < subTbl.length; l++) {
+							if (subTbl[l].subTblName == linkFormTableKey && subTbl[l].subTblData[subTblNo]) {
+								for (var g = 0; g < subTbl[l].subTblData[subTblNo].length; g++) {
+									if (subTbl[l].subTblData[subTblNo][g].key == linkFormKey) {
+										conditionArrayJSON.push({
+											value: subTbl[l].subTblData[subTblNo][g].value,
+											formField: ffid[j]
+										});
+									}
+								}
+							}
+						}
+					} else {
+						for (var k = 0; k < mainTblData.length; k++) {
+							if (linkFormTableKey + "_" + linkFormKey == mainTblName + "_" + mainTblData[k].key) {
+								conditionArrayJSON.push({
+									value: mainTblData[k].value,
+									formField: ffid[j]
+								});
+							}
+						}
+					}
+				}
+				if (conditionArrayJSON.length === 0) {
+					continue;
+				}
+				_db2.default.FlowModuleAPI.getLinkFieldValueMap({
+					triggerFormFields: formField,
+					formId: data.formId,
+					conditionArrayJSON: JSON.stringify(conditionArrayJSON)
+				}).then(function (content) {
+					if (!content) {
+						return;
+					}
+					var containUniqueFlag = content['containUniqueFlag'];
+					var resultMap = content['map'] || {};
+					for (var key in resultMap) {
+						var contentValue = resultMap[key];
+						t.applyLinkageFieldResult(data, key, contentValue, containUniqueFlag, formItem, mainTblData, mainTblName, subTbl, subTblNo, initFlag);
+					}
+				}).catch(function (error) {
+					console.error(error);
+				});
+			}
+		}
+	}, {
+		key: 'applyLinkageFieldResult',
+		value: function applyLinkageFieldResult(data, targetFieldId, contentValue, containUniqueFlag, formItem, mainTblData, mainTblName, subTbl, subTblNo, initFlag) {
+			var t = this;
+			var tolinkFormKey = "";
+			var tolinkFormType = "";
+			var tolinkFormTableKey = "";
+			var toisSub = false;
+			for (var f = 0; f < formItem.length; f++) {
+				if (targetFieldId == formItem[f].fieldId) {
+					tolinkFormKey = formItem[f].itemCode;
+					tolinkFormType = formItem[f].itemType;
+					tolinkFormTableKey = mainTblName;
+				} else if (formItem[f].itemType == 'detail') {
+					for (var g = 0; g < formItem[f].children.length; g++) {
+						if (targetFieldId == formItem[f].children[g].fieldId) {
+							tolinkFormKey = formItem[f].children[g].itemCode;
+							tolinkFormType = formItem[f].children[g].itemType;
+							tolinkFormTableKey = formItem[f].itemCode;
+							toisSub = true;
+						}
+					}
+				}
+			}
+			if (!tolinkFormKey) {
+				return;
+			}
+			var applyToField = function applyToField(fieldDataItem, fieldRef) {
+				if (!fieldRef || !fieldDataItem) {
+					return;
+				}
+				var relateItemParam = fieldRef.getItemParam ? fieldRef.getItemParam() : {};
+				if (",text,textarea,datetime,datetimeStep,".indexOf("," + tolinkFormType + ",") != -1) {
+					if (initFlag && fieldDataItem.value != null && fieldDataItem.value !== '') {
+						return;
+					}
+					var textValue = '';
+					for (var c = 0; c < contentValue.length; c++) {
+						textValue = textValue + "," + contentValue[c];
+					}
+					var valueMap = { key: 'value', value: textValue.substring(1) };
+					fieldRef.reloadItemParam([valueMap]);
+					fieldDataItem.value = valueMap.value;
+				} else if (",radio,checkbox,select,".indexOf("," + tolinkFormType + ",") != -1) {
+					var textValue = '';
+					for (var c2 = 0; c2 < contentValue.length; c2++) {
+						textValue = textValue + "," + contentValue[c2];
+					}
+					var tva = textValue.substring(1);
+					var selectOptions = buildLinkageSelectOptions(contentValue, relateItemParam, fieldDataItem);
+					var resolvedValue = resolveLinkageSelectValue(containUniqueFlag, fieldDataItem.value, tva, formItem, fieldDataItem.key);
+					fieldRef.reloadItemParam([{ key: 'selectOptions', value: selectOptions }, { key: 'value', value: resolvedValue }]);
+					fieldDataItem.value = resolvedValue;
+					if (fieldDataItem.multiItemsLinkField == null && selectOptions.length > 0) {
+						fieldDataItem.multiItemsLinkField = selectOptions.map(function (opt) {
+							return { value: opt.value, name: opt.text };
+						});
+					}
+				}
+			};
+			if (!toisSub) {
+				for (var m = 0; m < mainTblData.length; m++) {
+					if (tolinkFormKey == mainTblData[m].key) {
+						applyToField(mainTblData[m], t.refs[mainTblName + "_" + mainTblData[m].key]);
+					}
+				}
+			} else if (typeof subTblNo != 'undefined') {
+				for (var l = 0; l < subTbl.length; l++) {
+					if (subTbl[l].subTblName == tolinkFormTableKey && subTbl[l].subTblData[subTblNo]) {
+						for (var g = 0; g < subTbl[l].subTblData[subTblNo].length; g++) {
+							if (subTbl[l].subTblData[subTblNo][g].key == tolinkFormKey) {
+								var subRef = t.refs["sub_" + tolinkFormTableKey];
+								if (subRef && subRef.refs) {
+									applyToField(subTbl[l].subTblData[subTblNo][g], subRef.refs[tolinkFormTableKey + "_" + subTbl[l].subTblData[subTblNo][g].key + "_" + subTblNo]);
+								}
+							}
+						}
+					}
+				}
+			} else {
+				for (var l2 = 0; l2 < subTbl.length; l2++) {
+					if (subTbl[l2].subTblName != tolinkFormTableKey) {
+						continue;
+					}
+					for (var o = 0; o < subTbl[l2].subTblData.length; o++) {
+						for (var g2 = 0; g2 < subTbl[l2].subTblData[o].length; g2++) {
+							if (tolinkFormKey == subTbl[l2].subTblData[o][g2].key) {
+								var subRef2 = t.refs["sub_" + tolinkFormTableKey];
+								if (subRef2 && subRef2.refs) {
+									applyToField(subTbl[l2].subTblData[o][g2], subRef2.refs[tolinkFormTableKey + "_" + subTbl[l2].subTblData[o][g2].key + "_" + o]);
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
 		//重新加载关联字段
 
 	}, {
 		key: 'reloadFormRelaField',
-		value: function reloadFormRelaField() {
+		value: function reloadFormRelaField(options) {
 			var t = this;
 			var data = t.props.data;
+			var initFlag = options && options.initFlag === true;
 			t._isRelaFieldRefreshing = true;
 			try {
 				if (t.state.formRelaFieldMaps && Object.keys(t.state.formRelaFieldMaps).length > 0) {
-					t.refreshAllRelaFieldsByRelaMap(data);
+					t.refreshAllRelaFieldsByRelaMap(data, null, undefined, { initFlag: initFlag });
 				} else if (formRelaFieldMaps) {
 					var _iteratorNormalCompletion2 = true;
 					var _didIteratorError2 = false;
@@ -1250,8 +1254,9 @@ var PageHome = function (_React$Component) {
 
 	}, {
 		key: 'applyRelaRulesToTarget',
-		value: function applyRelaRulesToTarget(targetUniqueName, rules, data, contextRowIndex, changedUniqueName, changedSubTblNo, fieldControll, defaulthideFields, defaultmustFields, defaultshowFields) {
+		value: function applyRelaRulesToTarget(targetUniqueName, rules, data, contextRowIndex, changedUniqueName, changedSubTblNo, fieldControll, defaulthideFields, defaultmustFields, defaultshowFields, options) {
 			var t = this;
+			var initFlag = options && options.initFlag === true;
 			if (changedUniqueName && targetUniqueName === changedUniqueName) {
 				if (typeof changedSubTblNo === 'undefined' || changedSubTblNo === contextRowIndex) {
 					return;
@@ -1318,14 +1323,14 @@ var PageHome = function (_React$Component) {
 					}
 				}
 			}
-			if (isHidden) {
+			if (isHidden && !initFlag) {
 				t.clearFieldDataValue(data, targetUniqueName, contextRowIndex);
 			}
 			var finalRequired = isHidden ? false : skipEditMust ? baseline.required : required;
 			var finalReadOnly = skipEditMust ? baseline.readOnly : readOnly;
 			t.syncRelaFieldMetaToData(data, targetUniqueName, { required: finalRequired }, contextRowIndex);
 			var paramList = [];
-			if (isHidden) {
+			if (isHidden && !initFlag) {
 				paramList.push({ key: "value", value: "" });
 				paramList.push({ key: "required", value: false });
 			} else if (required !== baseline.required || !isHidden) {
@@ -1341,7 +1346,7 @@ var PageHome = function (_React$Component) {
 
 	}, {
 		key: 'refreshAllRelaFieldsByRelaMap',
-		value: function refreshAllRelaFieldsByRelaMap(data, changedUniqueName, changedSubTblNo) {
+		value: function refreshAllRelaFieldsByRelaMap(data, changedUniqueName, changedSubTblNo, options) {
 			var t = this;
 			var relaFieldsMap = t.state.formRelaFieldMaps;
 			if (!relaFieldsMap) {
@@ -1390,12 +1395,12 @@ var PageHome = function (_React$Component) {
 						// 子表触发只刷新当前行；主表触发刷新子表所有行
 						var subRowIndexes = t.getSubRelaRefreshRowIndexes(targetSubTblName, data, typeof changedSubTblNo !== 'undefined' ? changedSubTblNo : undefined);
 						for (var sri = 0; sri < subRowIndexes.length; sri++) {
-							t.applyRelaRulesToTarget(targetUniqueName, rules, data, subRowIndexes[sri], changedUniqueName, changedSubTblNo, fieldControll, defaulthideFields, defaultmustFields, defaultshowFields);
+							t.applyRelaRulesToTarget(targetUniqueName, rules, data, subRowIndexes[sri], changedUniqueName, changedSubTblNo, fieldControll, defaulthideFields, defaultmustFields, defaultshowFields, options);
 						}
 					} else {
 						// 主表字段：子表触发时用触发行号读取子表触发值
 						var mainContextRow = typeof changedSubTblNo !== 'undefined' ? changedSubTblNo : undefined;
-						t.applyRelaRulesToTarget(targetUniqueName, rules, data, mainContextRow, changedUniqueName, changedSubTblNo, fieldControll, defaulthideFields, defaultmustFields, defaultshowFields);
+						t.applyRelaRulesToTarget(targetUniqueName, rules, data, mainContextRow, changedUniqueName, changedSubTblNo, fieldControll, defaulthideFields, defaultmustFields, defaultshowFields, options);
 					}
 				}
 			} catch (err) {

package/package.json

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