fmui-base 2.2.87 → 2.2.88

package/README.md

@@ -3,6 +3,7 @@
 ---npm publish
 
 ## 更新日志 
+- 2.2.88：表单关联字段重构
 - 2.2.87：选人组件添加隐藏页签,增加业务建模表单组件
 - 2.2.86: 流程表单按钮超过三个按钮显示更多，修改更多按钮样式，待办保存按钮强制放到更多里面
 - 2.2.85: 北京ca开启电子签章获取ca签名，不受表单加签控制

package/lib/form/form.js

@@ -1757,157 +1757,132 @@ var PageHome = function (_React$Component) {
       return '' + (num < 10 ? '0' : '') + num;
     }
 
-    //处理关联字段初始化
+    // 规范化触发字段取值（与 table.jsx 保持一致）
 
   }, {
-    key: 'dealwithRelaField',
-    value: function dealwithRelaField(itemParam, allForm) {
-      console.log("dealwithRelaField===");
-      var formRelaFieldMaps = this.props.formRelaFieldMaps;
-      var defaultmustFields = [];
-      var defaulthideFields = [];
-      var fieldControll = this.props.fieldControll;
-      var hiddenFields = fieldControll.hiddenFields;
-      var mustFieldsStr = fieldControll.mustFields;
-      if (hiddenFields && hiddenFields != '') {
-        for (var i = 0; i < hiddenFields.split(',').length; i++) {
-          if (hiddenFields.split(',')[i] && hiddenFields.split(',')[i] != '') {
-            defaulthideFields.push(hiddenFields.split(',')[i]);
+    key: 'normalizeRelaTriggerValue',
+    value: function normalizeRelaTriggerValue(nowValue) {
+      if (nowValue == null || typeof nowValue == 'undefined') {
+        return "";
+      }
+      if (nowValue && nowValue.indexOf("[") >= 0 && nowValue.indexOf("]") >= 0) {
+        try {
+          var nowValueArray = JSON.parse(nowValue);
+          if (nowValueArray.length == 1) {
+            return nowValueArray[0];
           }
+          return nowValueArray.join(",");
+        } catch (e) {
+          return nowValue;
         }
       }
-      if (mustFieldsStr && mustFieldsStr != '') {
-        for (var i = 0; i < mustFieldsStr.split(',').length; i++) {
-          if (mustFieldsStr.split(',')[i] && mustFieldsStr.split(',')[i] != '') {
-            defaultmustFields.push(mustFieldsStr.split(',')[i]);
+      if (nowValue != '' && (nowValue.indexOf("$#$#") >= 0 || nowValue.indexOf("#$#$") >= 0)) {
+        if (nowValue.indexOf("#$#$") >= 0) {
+          var nowValueList = nowValue.split("#$#$");
+          if (nowValueList.length == 1) {
+            return nowValueList[0].replace("$#$#", "");
           }
+          return nowValueList.map(function (item) {
+            return item.replace("$#$#", "");
+          }).join(",");
         }
+        return nowValue.replace("$#$#", "");
       }
+      return nowValue;
+    }
 
-      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 = allForm;
-          var formRelaFieldMapsArray = formRelaFieldMaps[itemParam.uniqueName];
-          formRelaFieldMapsArray.map(function (item) {
-            if (item.triggerTblName == mainTblName) {
-              mainTblData.map(function (mainTblDataItem) {
-                if (item.triggerFieldName == mainTblDataItem.key) {
-                  var nowValue = mainTblDataItem.value ? mainTblDataItem.value : "";
-                  if (nowValue && nowValue.indexOf("[") >= 0 && nowValue.indexOf("]") >= 0) {
-                    var nowValueArray = JSON.parse(nowValue);
-                    if (nowValueArray.length == 1) {
-                      nowValue = nowValueArray[0];
-                    } else {
-                      nowValue = nowValueArray.join(",");
-                    }
-                  }
-                  // if(item.triggerFieldVal == mainTblDataItem.value){
-                  var editType = item.editType;
-                  if (editType == 'hide' || editType == 'rowhide') {
-                    // relaFieldMap["key"]="isHidden";
-                    if (item.triggerFieldVal == nowValue || nowValue.split(',').indexOf(item.triggerFieldVal) != -1) {
-                      itemParam.isHidden = true;
-                      defaulthideFields.push(itemParam.uniqueName);
-                      console.log("true====" + itemParam.uniqueName);
-                    } else if (defaulthideFields.indexOf(itemParam.uniqueName) != -1) {
-                      itemParam.isHidden = true;
-                    } else {
-                      console.log("false====" + itemParam.uniqueName);
-                      itemParam.isHidden = false;
-                    }
-                  } else if (editType == 'must') {
-                    // relaFieldMap["key"]="required";
-                    var triggerFieldValBoolean = false;
-                    if (item.triggerFieldVal == nowValue || nowValue.split(',').indexOf(item.triggerFieldVal) != -1) {
-                      itemParam.required = true;
-                      triggerFieldValBoolean = true;
-                    } else {
-                      itemParam.required = false;
-                      triggerFieldValBoolean = false;
-                    }
-                    // var relaFieldNameArray = formRelaFieldMapsObjItem.relaFieldName.split(",");
-                    // mainTblData.map(function(item){
-                    //   if(item.key==relaFieldNameArray[index]){
-                    //     item.required = triggerFieldValBoolean;
-                    //   }
-                    // });
-                    if (item.relaFieldName == mainTblDataItem.key) {
-                      mainTblDataItem.required = triggerFieldValBoolean;
-                    }
-                  } else if (editType == 'edit') {
-                    if (item.triggerFieldVal == nowValue || nowValue.split(',').indexOf(item.triggerFieldVal) != -1) {
-                      itemParam.readOnly = false;
-                    } else {
-                      itemParam.readOnly = true;
-                    }
-                  }
-                  // }
-                }
-              });
-            } else {
-              var subTbls = subTbl.item;
-              subTbls.map(function (subTblItem) {
-                if (subTbl.tblName == item.triggerTblName) {
-                  var subTblData = subTblItem;
-                  subTblData.map(function (mainTblDataItem) {
-                    if (item.triggerFieldName == mainTblDataItem.itemCode) {
-                      // if(item.triggerFieldVal == mainTblDataItem.value){
-                      var nowValue = mainTblDataItem.value ? mainTblDataItem.value : "";
-                      if (nowValue && nowValue.indexOf("[") >= 0 && nowValue.indexOf("]") >= 0) {
-                        var nowValueArray = JSON.parse(nowValue);
-                        if (nowValueArray.length == 1) {
-                          nowValue = nowValueArray[0];
-                        } else {
-                          nowValue = nowValueArray.join(",");
-                        }
-                      }
+    // 读取触发字段当前值
 
-                      var editType = item.editType;
-                      if (editType == 'hide' || editType == 'rowhide') {
-                        // relaFieldMap["key"]="isHidden";
-                        if (item.triggerFieldVal == nowValue || nowValue.split(',').indexOf(item.triggerFieldVal) != -1) {
-                          itemParam.isHidden = true;
-                        } else {
-                          itemParam.isHidden = false;
-                        }
-                      } else if (editType == 'must') {
-                        // relaFieldMap["key"]="required";
-                        var triggerFieldValBoolean = false;
-                        if (item.triggerFieldVal == nowValue || nowValue.split(',').indexOf(item.triggerFieldVal) != -1) {
-                          itemParam.required = true;
-                          triggerFieldValBoolean = true;
-                        } else {
-                          itemParam.required = false;
-                          triggerFieldValBoolean = false;
-                        }
-                        // var relaFieldNameArray = formRelaFieldMapsObjItem.relaFieldName.split(",");
-                        // mainTblData.map(function(item){
-                        //   if(item.key==relaFieldNameArray[index]){
-                        //     item.required = triggerFieldValBoolean;
-                        //   }
-                        // });
-                        if (item.relaFieldName == mainTblDataItem.itemCode) {
-                          mainTblDataItem.required = triggerFieldValBoolean;
-                        }
-                      } else if (editType == 'edit') {
-                        if (item.triggerFieldVal == nowValue || nowValue.split(',').indexOf(item.triggerFieldVal) != -1) {
-                          itemParam.readOnly = false;
-                        } else {
-                          itemParam.readOnly = true;
-                        }
-                      }
-                      // }
-                    }
-                  });
-                }
-              });
-            }
-          });
+  }, {
+    key: 'getRelaTriggerFieldValue',
+    value: function getRelaTriggerFieldValue(rule, data, allForm) {
+      var nowValue = "";
+      var mainTblData = data.mainTblData || [];
+      var mainTblName = data.mainTblName;
+      if (rule.triggerTblName == mainTblName) {
+        for (var i = 0; i < mainTblData.length; i++) {
+          if (mainTblData[i].key == rule.triggerFieldName) {
+            nowValue = mainTblData[i].value ? mainTblData[i].value : "";
+            break;
+          }
+        }
+      } else if (allForm && allForm.item) {
+        allForm.item.map(function (subTblItem) {
+          if (allForm.tblName == rule.triggerTblName && subTblItem) {
+            subTblItem.map(function (subField) {
+              if (subField.itemCode == rule.triggerFieldName) {
+                nowValue = subField.value ? subField.value : "";
+              }
+            });
+          }
+        });
+      }
+      return this.normalizeRelaTriggerValue(nowValue);
+    }
+  }, {
+    key: 'isRelaRuleMatched',
+    value: function isRelaRuleMatched(rule, nowValue) {
+      var triggerFieldVal = rule.triggerFieldVal;
+      if (triggerFieldVal == " ") {
+        triggerFieldVal = "";
+      }
+      if (triggerFieldVal === '') {
+        return true;
+      }
+      return triggerFieldVal == nowValue || nowValue.split(',').indexOf(triggerFieldVal) != -1;
+    }
+
+    //处理关联字段初始化（按 relaFieldsMap 全局顺序，后写入覆盖先写入，与配置页优先级一致）
+
+  }, {
+    key: 'dealwithRelaField',
+    value: function dealwithRelaField(itemParam, allForm) {
+      var formRelaFieldMaps = this.props.formRelaFieldMaps;
+      if (!formRelaFieldMaps || !formRelaFieldMaps[itemParam.uniqueName]) {
+        return itemParam;
+      }
+      var data = this.props.data;
+      var formRelaFieldMapsArray = formRelaFieldMaps[itemParam.uniqueName];
+      var fieldControll = this.props.fieldControll || {};
+      var defaulthideFields = [];
+      if (fieldControll.hiddenFields) {
+        fieldControll.hiddenFields.split(',').forEach(function (f) {
+          if (f) {
+            defaulthideFields.push(f);
+          }
+        });
+      }
+      if (defaulthideFields.indexOf(itemParam.uniqueName) != -1) {
+        itemParam.isHidden = true;
+      }
+
+      formRelaFieldMapsArray.forEach(function (rule) {
+        var nowValue = this.getRelaTriggerFieldValue(rule, data, allForm);
+        var matched = this.isRelaRuleMatched(rule, nowValue);
+        var editType = rule.editType;
+        if (editType == 'hide' || editType == 'rowhide') {
+          if (matched) {
+            itemParam.isHidden = true;
+          } else if (defaulthideFields.indexOf(itemParam.uniqueName) == -1) {
+            itemParam.isHidden = false;
+          }
+        } else if (editType == 'must') {
+          if (matched) {
+            itemParam.required = true;
+          } else {
+            itemParam.required = false;
+          }
+        } else if (editType == 'edit') {
+          if (matched) {
+            itemParam.readOnly = false;
+          } else if (nowValue != '') {
+            itemParam.readOnly = true;
+          }
         }
+      }.bind(this));
+
+      if (itemParam.isHidden) {
+        itemParam.required = false;
       }
       return itemParam;
     }
@@ -1936,12 +1911,13 @@ var PageHome = function (_React$Component) {
       this.loadComponet();
     }
 
-    //重新加载组件
+    //重新加载组件；options.silent=true 时不向上触发 onChange（用于字段关联批量刷新，避免死循环）
 
   }, {
     key: 'reloadItemParam',
-    value: function reloadItemParam(itemNew) {
+    value: function reloadItemParam(itemNew, options) {
       var dataType = this.state.dataType;
+      var silent = options && options.silent === true;
 
       if (itemNew != null && itemNew != undefined && Array.isArray(itemNew)) {
         var itemParam = this.state.itemParam;
@@ -2009,7 +1985,14 @@ var PageHome = function (_React$Component) {
           if (itemParam.itemType == 'popuser') {
             this.refs['selectMember_' + itemParam.key].initSelectData();
           }
-          this.props.onChange(this.props.data, itemParam);
+          // 静默刷新时仍需同步 mainTblData.required，否则提交校验不生效
+          if (silent && this.props.data) {
+            var formData = this.props.data;
+            this.dealwithData(itemParam, formData.mainTblData || [], formData.relatedTbl || []);
+          }
+          if (!silent && this.props.onChange) {
+            this.props.onChange(this.props.data, itemParam);
+          }
         });
       }
     }

package/lib/form/table.js

@@ -86,6 +86,85 @@ var savePhraseList = [{
 }];
 var formRelaFieldMaps = void 0;
 
+/**
+ * 将按触发字段分组的数据转为按关联字段分组，并保持配置页自上而下优先级
+ */
+function buildFormRelaFieldMapsByRelaField(triggerFieldsMap) {
+	var relaFieldsMap = {};
+	if (!triggerFieldsMap) {
+		return relaFieldsMap;
+	}
+	var allRules = [];
+	var _iteratorNormalCompletion = true;
+	var _didIteratorError = false;
+	var _iteratorError = undefined;
+
+	try {
+		for (var _iterator = Object.keys(triggerFieldsMap)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+			var triggerKey = _step.value;
+
+			var ruleList = triggerFieldsMap[triggerKey] || [];
+			for (var i = 0; i < ruleList.length; i++) {
+				allRules.push(ruleList[i]);
+			}
+		}
+	} catch (err) {
+		_didIteratorError = true;
+		_iteratorError = err;
+	} finally {
+		try {
+			if (!_iteratorNormalCompletion && _iterator.return) {
+				_iterator.return();
+			}
+		} finally {
+			if (_didIteratorError) {
+				throw _iteratorError;
+			}
+		}
+	}
+
+	allRules.sort(function (a, b) {
+		var sortA = parseInt(a.sortNo, 10);
+		var sortB = parseInt(b.sortNo, 10);
+		if (isNaN(sortA)) {
+			sortA = 0;
+		}
+		if (isNaN(sortB)) {
+			sortB = 0;
+		}
+		return sortA - sortB;
+	});
+	allRules.reverse();
+	allRules.forEach(function (item) {
+		var relaFieldTblName = item.relaFieldTblName;
+		var relaFieldName = item.relaFieldName;
+		if (!relaFieldTblName) {
+			return;
+		}
+		var relaFieldTblNameArray = relaFieldTblName.split(",");
+		var relaFieldNameArray = relaFieldName ? relaFieldName.split(",") : [];
+		var relaTblNameArray = item.relaTblName ? item.relaTblName.split(",") : [];
+		relaFieldTblNameArray.forEach(function (relaFieldTblNameItem, index) {
+			var relaFieldItem = {
+				relaFieldTblName: relaFieldTblNameItem,
+				triggerFieldName: item.triggerFieldName,
+				triggerFieldVal: item.triggerFieldVal,
+				triggerTblName: item.triggerTblName,
+				editType: item.editType,
+				relaFieldName: relaFieldNameArray[index] || relaFieldNameArray[0],
+				relaTblName: relaTblNameArray[index] || relaTblNameArray[0],
+				sortNo: item.sortNo
+			};
+			if (relaFieldsMap[relaFieldTblNameItem]) {
+				relaFieldsMap[relaFieldTblNameItem].push(relaFieldItem);
+			} else {
+				relaFieldsMap[relaFieldTblNameItem] = [relaFieldItem];
+			}
+		});
+	});
+	return relaFieldsMap;
+}
+
 var PageHome = function (_React$Component) {
 	_inherits(PageHome, _React$Component);
 
@@ -118,53 +197,14 @@ var PageHome = function (_React$Component) {
 				async: false,
 				success: function success(data) {
 					if (data.code == "0") {
-						formRelaFieldMaps = data.data;
-						if (formRelaFieldMaps) {
-							var _iteratorNormalCompletion = true;
-							var _didIteratorError = false;
-							var _iteratorError = undefined;
-
-							try {
-								for (var _iterator = Object.keys(formRelaFieldMaps)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-									var k = _step.value;
-
-									formRelaFieldMaps[k].map(function (item) {
-										var relaFieldTblName = item.relaFieldTblName;
-										var relaFieldName = item.relaFieldName;
-										var relaFieldTblNameArray = relaFieldTblName.split(",");
-										var relaFieldNameArray = relaFieldName.split(",");
-										relaFieldTblNameArray.map(function (relaFieldTblNameArrayItem, index) {
-											var relaFieldTblNameNew = {
-												"relaFieldTblName": relaFieldTblNameArrayItem,
-												"triggerFieldName": item.triggerFieldName,
-												"triggerFieldVal": item.triggerFieldVal,
-												"triggerTblName": item.triggerTblName,
-												"editType": item.editType,
-												"relaFieldName": relaFieldNameArray[index],
-												"relaTblName": item.relaTblName
-											};
-											if (formRelaFieldMapsNew[relaFieldTblNameArrayItem]) {
-												formRelaFieldMapsNew[relaFieldTblNameArrayItem].push(relaFieldTblNameNew);
-											} else {
-												formRelaFieldMapsNew[relaFieldTblNameArrayItem] = [relaFieldTblNameNew];
-											}
-										});
-									});
-								}
-							} catch (err) {
-								_didIteratorError = true;
-								_iteratorError = err;
-							} finally {
-								try {
-									if (!_iteratorNormalCompletion && _iterator.return) {
-										_iterator.return();
-									}
-								} finally {
-									if (_didIteratorError) {
-										throw _iteratorError;
-									}
-								}
-							}
+						var responseData = data.data || {};
+						// 移动端新结构：triggerFieldsMap 按触发字段分组；relaFieldsMap 按关联字段分组且保留全局优先级
+						if (responseData.triggerFieldsMap) {
+							formRelaFieldMaps = responseData.triggerFieldsMap;
+							formRelaFieldMapsNew = responseData.relaFieldsMap || {};
+						} else {
+							formRelaFieldMaps = responseData;
+							formRelaFieldMapsNew = buildFormRelaFieldMapsByRelaField(formRelaFieldMaps);
 						}
 					}
 				},
@@ -339,8 +379,11 @@ var PageHome = function (_React$Component) {
 	}, {
 		key: 'change',
 		value: function change(data, itemParam, subTblNo) {
-			console.log("formRelaFieldMaps==" + this.state.formRelaFieldMaps);
 			var t = this;
+			// 字段关联 reloadItemParam 会再次进入 change，此处拦截避免死循环
+			if (t._isRelaFieldRefreshing) {
+				return;
+			}
 			var module = t.props.module;
 			var formKey = t.props.allForm ? t.props.allForm.formcode : "";
 			var formTblId = t.props.allForm ? t.props.allForm.formTblId : "";
@@ -774,11 +817,31 @@ var PageHome = function (_React$Component) {
 						}
 					}
 
-					//关联字段
-					if (formRelaFieldMaps) {
+					//关联字段刷新（silent 模式，不向上触发 onChange）
+					if (t.state.formRelaFieldMaps) {
+						var isSubTrigger = typeof subTblNo != 'undefined' && itemParam.tableName != data.mainTblName;
+						t._isRelaFieldRefreshing = true;
+						try {
+							if (!isSubTrigger) {
+								t.refreshAllRelaFieldsByRelaMap(data);
+							} else if (formRelaFieldMaps) {
+								var formRelaFieldMapsObj = formRelaFieldMaps[itemParam.uniqueName];
+								if (formRelaFieldMapsObj && formRelaFieldMapsObj.length > 0) {
+									t.dealwithRelaField(formRelaFieldMapsObj, data, itemParam);
+								}
+							}
+						} finally {
+							t._isRelaFieldRefreshing = false;
+						}
+					} else if (formRelaFieldMaps) {
 						var formRelaFieldMapsObj = formRelaFieldMaps[itemParam.uniqueName];
 						if (formRelaFieldMapsObj && formRelaFieldMapsObj.length > 0) {
-							t.dealwithRelaField(formRelaFieldMapsObj, data, itemParam);
+							t._isRelaFieldRefreshing = true;
+							try {
+								t.dealwithRelaField(formRelaFieldMapsObj, data, itemParam);
+							} finally {
+								t._isRelaFieldRefreshing = false;
+							}
 						}
 					}
 				}
@@ -845,33 +908,329 @@ var PageHome = function (_React$Component) {
 		value: function reloadFormRelaField() {
 			var t = this;
 			var data = t.props.data;
-			//关联字段
-			if (formRelaFieldMaps) {
-				var _iteratorNormalCompletion2 = true;
-				var _didIteratorError2 = false;
-				var _iteratorError2 = undefined;
+			t._isRelaFieldRefreshing = true;
+			try {
+				if (t.state.formRelaFieldMaps) {
+					t.refreshAllRelaFieldsByRelaMap(data);
+				} else if (formRelaFieldMaps) {
+					var _iteratorNormalCompletion2 = true;
+					var _didIteratorError2 = false;
+					var _iteratorError2 = undefined;
+
+					try {
+						for (var _iterator2 = Object.keys(formRelaFieldMaps)[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
+							var k = _step2.value;
 
+							var triggerRules = formRelaFieldMaps[k];
+							if (triggerRules && triggerRules.length > 0) {
+								t.dealwithRelaField(triggerRules, data, { uniqueName: k, key: k.split('_').pop(), tableName: k.split('_')[0] });
+							}
+						}
+					} catch (err) {
+						_didIteratorError2 = true;
+						_iteratorError2 = err;
+					} finally {
+						try {
+							if (!_iteratorNormalCompletion2 && _iterator2.return) {
+								_iterator2.return();
+							}
+						} finally {
+							if (_didIteratorError2) {
+								throw _iteratorError2;
+							}
+						}
+					}
+				}
+			} finally {
+				t._isRelaFieldRefreshing = false;
+			}
+		}
+	}, {
+		key: 'normalizeRelaTriggerValue',
+		value: function normalizeRelaTriggerValue(nowValue) {
+			if (nowValue == null || typeof nowValue == 'undefined') {
+				return "";
+			}
+			if (nowValue && nowValue.indexOf("[") >= 0 && nowValue.indexOf("]") >= 0) {
 				try {
-					for (var _iterator2 = Object.keys(formRelaFieldMaps)[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
-						var k = _step2.value;
+					var nowValueArray = JSON.parse(nowValue);
+					if (nowValueArray.length == 1) {
+						return nowValueArray[0];
+					}
+					return nowValueArray.join(",");
+				} catch (e) {
+					return nowValue;
+				}
+			}
+			if (nowValue != '' && (nowValue.indexOf("$#$#") >= 0 || nowValue.indexOf("#$#$") >= 0)) {
+				if (nowValue.indexOf("#$#$") >= 0) {
+					var nowValueList = nowValue.split("#$#$");
+					if (nowValueList.length == 1) {
+						return nowValueList[0].replace("$#$#", "");
+					}
+					return nowValueList.map(function (item) {
+						return item.replace("$#$#", "");
+					}).join(",");
+				}
+				return nowValue.replace("$#$#", "");
+			}
+			return nowValue;
+		}
+	}, {
+		key: 'clearFieldDataValue',
+		value: function clearFieldDataValue(data, uniqueName) {
+			if (!data || !uniqueName) {
+				return;
+			}
+			var mainTblName = data.mainTblName;
+			var mainTblData = data.mainTblData || [];
+			for (var i = 0; i < mainTblData.length; i++) {
+				if (mainTblName + '_' + mainTblData[i].key == uniqueName) {
+					mainTblData[i].value = '';
+				}
+			}
+			if (data.subTbl && data.subTbl.length > 0) {
+				for (var j = 0; j < data.subTbl.length; j++) {
+					var subRows = data.subTbl[j].subTblData || [];
+					for (var r = 0; r < subRows.length; r++) {
+						var row = subRows[r] || [];
+						for (var c = 0; c < row.length; c++) {
+							if (row[c].uniqueName == uniqueName) {
+								row[c].value = '';
+							}
+						}
+					}
+				}
+			}
+		}
+
+		// 同步关联字段的必填等元数据到提交数据（checkSubmit 读取 mainTblData.required，非组件 state）
 
-						t.dealwithRelaField(formRelaFieldMaps[k], data, k);
+	}, {
+		key: 'syncRelaFieldMetaToData',
+		value: function syncRelaFieldMetaToData(data, uniqueName, meta) {
+			if (!data || !uniqueName || !meta) {
+				return;
+			}
+			var mainTblName = data.mainTblName;
+			var mainTblData = data.mainTblData || [];
+			if (typeof meta.required !== 'undefined') {
+				for (var i = 0; i < mainTblData.length; i++) {
+					if (mainTblName + '_' + mainTblData[i].key == uniqueName) {
+						mainTblData[i].required = meta.required;
 					}
-				} catch (err) {
-					_didIteratorError2 = true;
-					_iteratorError2 = err;
-				} finally {
-					try {
-						if (!_iteratorNormalCompletion2 && _iterator2.return) {
-							_iterator2.return();
+				}
+			}
+			if (data.subTbl && data.subTbl.length > 0 && typeof meta.required !== 'undefined') {
+				for (var j = 0; j < data.subTbl.length; j++) {
+					var subRows = data.subTbl[j].subTblData || [];
+					for (var r = 0; r < subRows.length; r++) {
+						var row = subRows[r] || [];
+						for (var c = 0; c < row.length; c++) {
+							if (row[c].uniqueName == uniqueName) {
+								row[c].required = meta.required;
+							}
 						}
-					} finally {
-						if (_didIteratorError2) {
-							throw _iteratorError2;
+					}
+				}
+			}
+			if (data.relatedTbl && data.relatedTbl.length > 0 && typeof meta.required !== 'undefined') {
+				for (var ri = 0; ri < data.relatedTbl.length; ri++) {
+					var relatedMainTblData = data.relatedTbl[ri].relatedMainTblData;
+					if (!relatedMainTblData) {
+						continue;
+					}
+					var relatedTblName = data.relatedTbl[ri].relatedMainTblName;
+					for (var rk = 0; rk < relatedMainTblData.length; rk++) {
+						if (relatedTblName + '_' + relatedMainTblData[rk].key == uniqueName) {
+							relatedMainTblData[rk].required = meta.required;
+						}
+					}
+				}
+			}
+		}
+	}, {
+		key: 'getRelaTriggerFieldValue',
+		value: function getRelaTriggerFieldValue(rule, data) {
+			var nowValue = "";
+			var mainTblName = data.mainTblName;
+			var triggerUnique = rule.triggerTblName + '_' + rule.triggerFieldName;
+			if (this.refs[triggerUnique] && this.refs[triggerUnique].state && this.refs[triggerUnique].state.itemParam.isHidden) {
+				return '';
+			}
+			var mainTblData = data.mainTblData || [];
+			if (rule.triggerTblName == mainTblName) {
+				for (var i = 0; i < mainTblData.length; i++) {
+					if (mainTblData[i].key == rule.triggerFieldName) {
+						nowValue = mainTblData[i].value ? mainTblData[i].value : "";
+						break;
+					}
+				}
+			} else if (data.subTbl && data.subTbl.length > 0) {
+				for (var j = 0; j < data.subTbl.length; j++) {
+					if (data.subTbl[j].subTblName == rule.triggerTblName && data.subTbl[j].subTblData && data.subTbl[j].subTblData.length > 0) {
+						var subRow = data.subTbl[j].subTblData[0];
+						for (var k = 0; k < subRow.length; k++) {
+							if (subRow[k].key == rule.triggerFieldName) {
+								nowValue = subRow[k].value ? subRow[k].value : "";
+							}
 						}
 					}
 				}
 			}
+			return this.normalizeRelaTriggerValue(nowValue);
+		}
+	}, {
+		key: 'isRelaRuleMatched',
+		value: function isRelaRuleMatched(rule, nowValue) {
+			var triggerFieldVal = rule.triggerFieldVal;
+			if (triggerFieldVal == " ") {
+				triggerFieldVal = "";
+			}
+			if (triggerFieldVal === '') {
+				return true;
+			}
+			return triggerFieldVal == nowValue || nowValue.split(',').indexOf(triggerFieldVal) != -1;
+		}
+
+		// 静默刷新关联字段 UI，不触发 change 死循环
+
+	}, {
+		key: 'reloadRelaItemParam',
+		value: function reloadRelaItemParam(formRef, paramList) {
+			if (formRef && formRef.reloadItemParam) {
+				formRef.reloadItemParam(paramList, { silent: true });
+			}
+		}
+
+		// 按 relaFieldsMap 全局顺序刷新所有关联字段（props 传入 form.jsx 的同一份数据）
+
+	}, {
+		key: 'refreshAllRelaFieldsByRelaMap',
+		value: function refreshAllRelaFieldsByRelaMap(data) {
+			var t = this;
+			var relaFieldsMap = t.state.formRelaFieldMaps;
+			if (!relaFieldsMap) {
+				return;
+			}
+			var fieldControll = t.props.fieldControll || {};
+			var defaulthideFields = [];
+			var defaultmustFields = [];
+			var defaultshowFields = [];
+			if (fieldControll.hiddenFields) {
+				fieldControll.hiddenFields.split(',').forEach(function (f) {
+					if (f) {
+						defaulthideFields.push(f);
+					}
+				});
+			}
+			if (fieldControll.mustFields) {
+				fieldControll.mustFields.split(',').forEach(function (f) {
+					if (f) {
+						defaultmustFields.push(f);
+					}
+				});
+			}
+			if (fieldControll.showFields) {
+				fieldControll.showFields.split(',').forEach(function (f) {
+					if (f) {
+						defaultshowFields.push(f);
+					}
+				});
+			}
+
+			var _iteratorNormalCompletion3 = true;
+			var _didIteratorError3 = false;
+			var _iteratorError3 = undefined;
+
+			try {
+				for (var _iterator3 = Object.keys(relaFieldsMap)[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {
+					var targetUniqueName = _step3.value;
+
+					var rules = relaFieldsMap[targetUniqueName];
+					if (!rules || !rules.length || !t.refs[targetUniqueName]) {
+						continue;
+					}
+					var hideFlag = defaulthideFields.indexOf(targetUniqueName) != -1;
+					var mustFlag = defaultmustFields.indexOf(targetUniqueName) != -1;
+					var editFlag = false;
+					var isHidden = hideFlag;
+					var required = false;
+					var readOnly = false;
+
+					// sortNo 升序排列后倒序执行，配置页越靠上的规则越晚执行、优先生效
+					var sortedRules = rules.slice().sort(function (a, b) {
+						return (parseInt(a.sortNo, 10) || 0) - (parseInt(b.sortNo, 10) || 0);
+					});
+					for (var ri = sortedRules.length - 1; ri >= 0; ri--) {
+						var rule = sortedRules[ri];
+						var nowValue = t.getRelaTriggerFieldValue(rule, data);
+						if (nowValue === '' && rule.triggerTblName) {
+							var triggerUnique = rule.triggerTblName + '_' + rule.triggerFieldName;
+							if (t.refs[triggerUnique] && t.refs[triggerUnique].state && t.refs[triggerUnique].state.itemParam.isHidden) {
+								continue;
+							}
+						}
+						var matched = t.isRelaRuleMatched(rule, nowValue);
+						var editType = rule.editType;
+						if (editType == 'hide' || editType == 'rowhide') {
+							if (matched) {
+								isHidden = true;
+								hideFlag = true;
+								required = false;
+							} else if (!hideFlag && defaulthideFields.indexOf(targetUniqueName) == -1) {
+								isHidden = false;
+							}
+						} else if (editType == 'must') {
+							if (matched && !hideFlag) {
+								required = true;
+								mustFlag = true;
+								isHidden = false;
+							} else if (!mustFlag) {
+								required = false;
+							}
+						} else if (editType == 'edit') {
+							if (matched && defaultshowFields.indexOf(targetUniqueName) != -1) {
+								readOnly = false;
+								editFlag = true;
+							} else if (!editFlag && defaultshowFields.indexOf(targetUniqueName) != -1 && nowValue != '') {
+								readOnly = true;
+							}
+						}
+					}
+					if (isHidden) {
+						t.clearFieldDataValue(data, targetUniqueName);
+					}
+					var finalRequired = isHidden ? false : required;
+					t.syncRelaFieldMetaToData(data, targetUniqueName, { required: finalRequired });
+					var paramList = [];
+					if (isHidden) {
+						paramList.push({ key: "value", value: "" });
+						paramList.push({ key: "required", value: false });
+					} else if (required) {
+						paramList.push({ key: "isHidden", value: false });
+					}
+					paramList.push({ key: "isHidden", value: isHidden });
+					paramList.push({ key: "required", value: finalRequired });
+					if (defaultshowFields.indexOf(targetUniqueName) != -1) {
+						paramList.push({ key: "readOnly", value: readOnly });
+					}
+					t.reloadRelaItemParam(t.refs[targetUniqueName], paramList);
+				}
+			} catch (err) {
+				_didIteratorError3 = true;
+				_iteratorError3 = err;
+			} finally {
+				try {
+					if (!_iteratorNormalCompletion3 && _iterator3.return) {
+						_iterator3.return();
+					}
+				} finally {
+					if (_didIteratorError3) {
+						throw _iteratorError3;
+					}
+				}
+			}
 		}
 	}, {
 		key: 'dealwithRelaField',
@@ -1121,7 +1480,7 @@ var PageHome = function (_React$Component) {
 															isSubField = true;
 															var subTblNameItem = "sub_" + subTblName;
 															var subItem = relaFieldTblNameArrayItem + '_' + thisSubTblNo;
-															t.refs[subTblNameItem].refs[subItem].reloadItemParam([relaFieldMap]);
+															t.reloadRelaItemParam(t.refs[subTblNameItem].refs[subItem], [relaFieldMap]);
 														}
 													}
 												}
@@ -1134,7 +1493,7 @@ var PageHome = function (_React$Component) {
 																isSubField = true;
 																var subTblNameItem = "sub_" + subTblName;
 																var subItem = relaFieldTblNameArrayItem + '_' + b;
-																t.refs[subTblNameItem].refs[subItem].reloadItemParam([relaFieldMap]);
+																t.reloadRelaItemParam(t.refs[subTblNameItem].refs[subItem], [relaFieldMap]);
 															}
 														}
 													}
@@ -1146,10 +1505,10 @@ var PageHome = function (_React$Component) {
 							}
 							if (isSubField) {} else if (t.refs[relaFieldTblNameArrayItem]) {
 								if (relaFieldMap.key == "required" && relaFieldMap.value) {
-									console.log('[{"key":"isHidden","value":true}]');
-									t.refs[relaFieldTblNameArrayItem].reloadItemParam([{ "key": "isHidden", "value": false }]);
+									t.reloadRelaItemParam(t.refs[relaFieldTblNameArrayItem], [{ "key": "isHidden", "value": false }, relaFieldMap]);
+								} else {
+									t.reloadRelaItemParam(t.refs[relaFieldTblNameArrayItem], [relaFieldMap]);
 								}
-								t.refs[relaFieldTblNameArrayItem].reloadItemParam([relaFieldMap]);
 							}
 						}
 					}

package/package.json

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