fmui-base 2.2.96 → 2.2.98

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.2.98：批示意见态度增加回调方法
+- 2.2.97：表单字段关联选人字段关联子表，没有触发关联时还原原来状态
 - 2.2.96：表单字段关联选人字段关联时可能会出现死循环问题修复
 - 2.2.95：表单字段关联只读字段必填不需要生效
 - 2.2.94：流程办理回调时的type不准确问题修复

package/lib/form/form.js

@@ -1497,6 +1497,12 @@ var PageHome = function (_React$Component) {
         }
       }
       itemParam = t.dealwithLinkField(itemParam, data, status);
+      // 关联联动还原基线：流程权限/表单设计确定后的初始状态
+      itemParam.relaBaseline = {
+        isHidden: !!itemParam.isHidden,
+        required: !!itemParam.required,
+        readOnly: !!itemParam.readOnly
+      };
       itemParam = t.dealwithRelaField(itemParam, allForm);
 
       if (itemType != 'weboffice') {
@@ -1817,6 +1823,29 @@ var PageHome = function (_React$Component) {
             break;
           }
         }
+      } else if (this.props.dataType === 'sub' && this.props.fullFormData) {
+        var fullData = this.props.fullFormData;
+        if (rule.triggerTblName == fullData.mainTblName) {
+          var fullMainTblData = fullData.mainTblData || [];
+          for (var fi = 0; fi < fullMainTblData.length; fi++) {
+            if (fullMainTblData[fi].key == rule.triggerFieldName) {
+              nowValue = fullMainTblData[fi].value ? fullMainTblData[fi].value : "";
+              break;
+            }
+          }
+        } else if (fullData.subTbl && fullData.subTbl.length > 0) {
+          var rowIndex = typeof this.props.keyNo !== 'undefined' ? this.props.keyNo : 0;
+          for (var sj = 0; sj < fullData.subTbl.length; sj++) {
+            if (fullData.subTbl[sj].subTblName == rule.triggerTblName && fullData.subTbl[sj].subTblData && fullData.subTbl[sj].subTblData.length > rowIndex) {
+              var subRow = fullData.subTbl[sj].subTblData[rowIndex];
+              for (var sk = 0; sk < subRow.length; sk++) {
+                if (subRow[sk].key == rule.triggerFieldName) {
+                  nowValue = subRow[sk].value ? subRow[sk].value : "";
+                }
+              }
+            }
+          }
+        }
       } else if (allForm && allForm.item) {
         allForm.item.map(function (subTblItem) {
           if (allForm.tblName == rule.triggerTblName && subTblItem) {
@@ -1879,40 +1908,54 @@ var PageHome = function (_React$Component) {
           }
         });
       }
-      if (defaulthideFields.indexOf(itemParam.uniqueName) != -1) {
-        itemParam.isHidden = true;
-      }
+      var baseline = itemParam.relaBaseline || {
+        isHidden: defaulthideFields.indexOf(itemParam.uniqueName) != -1,
+        required: defaultmustFields.indexOf(itemParam.uniqueName) != -1,
+        readOnly: defaultshowFields.indexOf(itemParam.uniqueName) != -1
+      };
+      itemParam.isHidden = baseline.isHidden;
+      itemParam.required = baseline.required;
+      itemParam.readOnly = baseline.readOnly;
       // 流程只读/必填或表单设计只读时，关联编辑/必填不生效
-      var skipEditMust = defaultshowFields.indexOf(itemParam.uniqueName) != -1 || defaultmustFields.indexOf(itemParam.uniqueName) != -1 || itemParam.readOnly === true || this.props.form && this.props.form.readOnly === true;
+      var skipEditMust = defaultshowFields.indexOf(itemParam.uniqueName) != -1 || defaultmustFields.indexOf(itemParam.uniqueName) != -1 || baseline.readOnly === true || this.props.form && this.props.form.readOnly === true;
+      var hideFlag = baseline.isHidden;
+      var mustFlag = baseline.required;
+      var editFlag = false;
 
-      formRelaFieldMapsArray.forEach(function (rule) {
+      var sortedRules = formRelaFieldMapsArray.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 = 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;
+            hideFlag = true;
+          } else if (!hideFlag) {
+            itemParam.isHidden = baseline.isHidden;
           }
         } else if (editType == 'must') {
-          if (!skipEditMust) {
-            if (matched) {
-              itemParam.required = true;
-            } else {
-              itemParam.required = false;
-            }
+          if (!skipEditMust && matched && !hideFlag) {
+            itemParam.required = true;
+            mustFlag = true;
+            itemParam.isHidden = false;
+          } else if (!mustFlag) {
+            itemParam.required = baseline.required;
           }
         } else if (editType == 'edit') {
-          if (!skipEditMust) {
-            if (matched) {
-              itemParam.readOnly = false;
-            } else if (nowValue != '') {
-              itemParam.readOnly = true;
-            }
+          if (!skipEditMust && matched && defaultshowFields.indexOf(itemParam.uniqueName) != -1) {
+            itemParam.readOnly = false;
+            editFlag = true;
+          } else if (!skipEditMust && !editFlag && defaultshowFields.indexOf(itemParam.uniqueName) != -1 && nowValue != '') {
+            itemParam.readOnly = true;
+          } else if (!editFlag && defaultshowFields.indexOf(itemParam.uniqueName) != -1) {
+            itemParam.readOnly = baseline.readOnly;
           }
         }
-      }.bind(this));
+      }
 
       if (itemParam.isHidden) {
         itemParam.required = false;
@@ -3644,6 +3687,18 @@ var PageHome = function (_React$Component) {
       });
       this.props.newspyj.content = spyj + commonwords;
     }
+
+    // 意见态度点击：先执行默认拼接，再触发 FlowCommon 扩展回调
+
+  }, {
+    key: 'attitudeItemClick',
+    value: function attitudeItemClick(item) {
+      var attitudeValue = item && item.value != null ? item.value : '';
+      this.phraseItemClick(attitudeValue);
+      if (FlowCommon && typeof FlowCommon.dealwithAttitudeClick === 'function') {
+        FlowCommon.dealwithAttitudeClick(item, this);
+      }
+    }
     //切换修改常用语
 
   }, {
@@ -4380,7 +4435,7 @@ var PageHome = function (_React$Component) {
                     this.state.attitudeList.length > 0 ? this.state.attitudeList.map(function (item, i) {
                       return _react2.default.createElement(
                         'div',
-                        { className: 'phrase-item', onClick: this.phraseItemClick.bind(this, item.value) },
+                        { className: 'phrase-item', onClick: this.attitudeItemClick.bind(this, item) },
                         item.value
                       );
                     }.bind(this)) : ''

package/lib/form/subForm.js

@@ -635,6 +635,7 @@ var PageHome = function (_React$Component) {
         allForm: t.props.allForm,
         formStyle: t.props.formStyle,
         data: t.state.itemParam.value[rowIndex],
+        fullFormData: t.props.data,
         fieldControll: t.state.fieldControll,
         caIsPrd: t.props.caIsPrd,
         preCaFields: t.props.preCaFields,

package/lib/form/table.js

@@ -824,17 +824,9 @@ var PageHome = function (_React$Component) {
 					//关联字段刷新（silent 模式，不向上触发 onChange）
 					var hasRelaFieldsMap = t.state.formRelaFieldMaps && Object.keys(t.state.formRelaFieldMaps).length > 0;
 					if (hasRelaFieldsMap) {
-						var isSubTrigger = typeof subTblNo != 'undefined' && itemParam.tableName != data.mainTblName;
 						t._isRelaFieldRefreshing = true;
 						try {
-							if (!isSubTrigger) {
-								t.refreshAllRelaFieldsByRelaMap(data, itemParam.uniqueName);
-							} else if (formRelaFieldMaps) {
-								var formRelaFieldMapsObj = formRelaFieldMaps[itemParam.uniqueName];
-								if (formRelaFieldMapsObj && formRelaFieldMapsObj.length > 0) {
-									t.dealwithRelaField(formRelaFieldMapsObj, data, itemParam);
-								}
-							}
+							t.refreshAllRelaFieldsByRelaMap(data, itemParam.uniqueName, subTblNo);
 						} finally {
 							t._isRelaFieldRefreshing = false;
 						}
@@ -983,7 +975,7 @@ var PageHome = function (_React$Component) {
 		}
 	}, {
 		key: 'clearFieldDataValue',
-		value: function clearFieldDataValue(data, uniqueName) {
+		value: function clearFieldDataValue(data, uniqueName, contextRowIndex) {
 			if (!data || !uniqueName) {
 				return;
 			}
@@ -998,6 +990,9 @@ var PageHome = function (_React$Component) {
 				for (var j = 0; j < data.subTbl.length; j++) {
 					var subRows = data.subTbl[j].subTblData || [];
 					for (var r = 0; r < subRows.length; r++) {
+						if (typeof contextRowIndex !== 'undefined' && r != contextRowIndex) {
+							continue;
+						}
 						var row = subRows[r] || [];
 						for (var c = 0; c < row.length; c++) {
 							if (row[c].uniqueName == uniqueName) {
@@ -1009,11 +1004,76 @@ var PageHome = function (_React$Component) {
 			}
 		}
 
+		// 判断 uniqueName 是否属于子表字段
+
+	}, {
+		key: 'getSubTblNameByUniqueName',
+		value: function getSubTblNameByUniqueName(uniqueName, data) {
+			if (!uniqueName || !data || !data.subTbl) {
+				return null;
+			}
+			for (var i = 0; i < data.subTbl.length; i++) {
+				var subTblName = data.subTbl[i].subTblName;
+				if (uniqueName.indexOf(subTblName + '_') === 0) {
+					return subTblName;
+				}
+			}
+			return null;
+		}
+
+		// 获取关联字段 Form 组件 ref（主表或子表指定行）
+
+	}, {
+		key: 'getRelaFieldFormRef',
+		value: function getRelaFieldFormRef(uniqueName, contextRowIndex, data) {
+			data = data || this.props.data;
+			var subTblName = this.getSubTblNameByUniqueName(uniqueName, data);
+			if (subTblName != null) {
+				if (typeof contextRowIndex === 'undefined') {
+					return null;
+				}
+				var subFormRef = this.refs['sub_' + subTblName];
+				if (subFormRef && subFormRef.refs) {
+					return subFormRef.refs[uniqueName + '_' + contextRowIndex] || null;
+				}
+				return null;
+			}
+			return this.refs[uniqueName] || null;
+		}
+
+		// 子表目标字段需要刷新的行号列表
+
+	}, {
+		key: 'getSubRelaRefreshRowIndexes',
+		value: function getSubRelaRefreshRowIndexes(targetSubTblName, data, changedSubTblNo) {
+			var rowIndexes = [];
+			if (!data || !data.subTbl) {
+				return rowIndexes;
+			}
+			for (var i = 0; i < data.subTbl.length; i++) {
+				if (data.subTbl[i].subTblName != targetSubTblName) {
+					continue;
+				}
+				var subRows = data.subTbl[i].subTblData || [];
+				if (typeof changedSubTblNo !== 'undefined') {
+					if (changedSubTblNo < subRows.length) {
+						rowIndexes.push(changedSubTblNo);
+					}
+				} else {
+					for (var r = 0; r < subRows.length; r++) {
+						rowIndexes.push(r);
+					}
+				}
+				break;
+			}
+			return rowIndexes;
+		}
+
 		// 同步关联字段的必填等元数据到提交数据（checkSubmit 读取 mainTblData.required，非组件 state）
 
 	}, {
 		key: 'syncRelaFieldMetaToData',
-		value: function syncRelaFieldMetaToData(data, uniqueName, meta) {
+		value: function syncRelaFieldMetaToData(data, uniqueName, meta, contextRowIndex) {
 			if (!data || !uniqueName || !meta) {
 				return;
 			}
@@ -1030,6 +1090,9 @@ var PageHome = function (_React$Component) {
 				for (var j = 0; j < data.subTbl.length; j++) {
 					var subRows = data.subTbl[j].subTblData || [];
 					for (var r = 0; r < subRows.length; r++) {
+						if (typeof contextRowIndex !== 'undefined' && r != contextRowIndex) {
+							continue;
+						}
 						var row = subRows[r] || [];
 						for (var c = 0; c < row.length; c++) {
 							if (row[c].uniqueName == uniqueName) {
@@ -1056,11 +1119,15 @@ var PageHome = function (_React$Component) {
 		}
 	}, {
 		key: 'getRelaTriggerFieldValue',
-		value: function getRelaTriggerFieldValue(rule, data) {
+		value: function getRelaTriggerFieldValue(rule, data, contextRowIndex) {
 			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) {
+			var triggerRef = this.getRelaFieldFormRef(triggerUnique, contextRowIndex, data);
+			if (!triggerRef) {
+				triggerRef = this.refs[triggerUnique];
+			}
+			if (triggerRef && triggerRef.state && triggerRef.state.itemParam.isHidden) {
 				return '';
 			}
 			var mainTblData = data.mainTblData || [];
@@ -1072,9 +1139,10 @@ var PageHome = function (_React$Component) {
 					}
 				}
 			} else if (data.subTbl && data.subTbl.length > 0) {
+				var rowIndex = typeof contextRowIndex !== 'undefined' ? contextRowIndex : 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];
+					if (data.subTbl[j].subTblName == rule.triggerTblName && data.subTbl[j].subTblData && data.subTbl[j].subTblData.length > rowIndex) {
+						var subRow = data.subTbl[j].subTblData[rowIndex];
 						for (var k = 0; k < subRow.length; k++) {
 							if (subRow[k].key == rule.triggerFieldName) {
 								nowValue = subRow[k].value ? subRow[k].value : "";
@@ -1098,6 +1166,40 @@ var PageHome = function (_React$Component) {
 			return triggerFieldVal == nowValue || nowValue.split(',').indexOf(triggerFieldVal) != -1;
 		}
 
+		// 获取关联字段还原基线（流程权限/表单设计后的初始状态）
+
+	}, {
+		key: 'getRelaFieldBaseline',
+		value: function getRelaFieldBaseline(targetUniqueName, fieldRef, fieldControll) {
+			fieldControll = fieldControll || {};
+			var baseline = { isHidden: false, required: false, readOnly: false };
+			if (fieldRef && fieldRef.state && fieldRef.state.itemParam && fieldRef.state.itemParam.relaBaseline) {
+				baseline = {
+					isHidden: !!fieldRef.state.itemParam.relaBaseline.isHidden,
+					required: !!fieldRef.state.itemParam.relaBaseline.required,
+					readOnly: !!fieldRef.state.itemParam.relaBaseline.readOnly
+				};
+			} else if (fieldRef && fieldRef.props) {
+				var form = fieldRef.props.form || {};
+				if (form.valid == 'true') {
+					baseline.required = true;
+				}
+				if (form.readOnly === true) {
+					baseline.readOnly = true;
+				}
+			}
+			if (fieldControll.hiddenFields && fieldControll.hiddenFields.split(',').indexOf(targetUniqueName) != -1) {
+				baseline.isHidden = true;
+			}
+			if (fieldControll.mustFields && fieldControll.mustFields.split(',').indexOf(targetUniqueName) != -1) {
+				baseline.required = true;
+			}
+			if (fieldControll.showFields && fieldControll.showFields.split(',').indexOf(targetUniqueName) != -1) {
+				baseline.readOnly = true;
+			}
+			return baseline;
+		}
+
 		// 流程只读/必填或表单设计只读时，关联的编辑/必填不生效（与PC init-readonly-flag / init-notnull-flag 一致）
 
 	}, {
@@ -1144,11 +1246,102 @@ var PageHome = function (_React$Component) {
 			}
 		}
 
-		// 按 relaFieldsMap 全局顺序刷新所有关联字段（props 传入 form.jsx 的同一份数据）
+		// 对单个关联目标字段应用规则（主表或子表指定行）
+
+	}, {
+		key: 'applyRelaRulesToTarget',
+		value: function applyRelaRulesToTarget(targetUniqueName, rules, data, contextRowIndex, changedUniqueName, changedSubTblNo, fieldControll, defaulthideFields, defaultmustFields, defaultshowFields) {
+			var t = this;
+			if (changedUniqueName && targetUniqueName === changedUniqueName) {
+				if (typeof changedSubTblNo === 'undefined' || changedSubTblNo === contextRowIndex) {
+					return;
+				}
+			}
+			var fieldRef = t.getRelaFieldFormRef(targetUniqueName, contextRowIndex, data);
+			if (!fieldRef) {
+				return;
+			}
+			var skipEditMust = t.isRelaFieldSkipEditMust(targetUniqueName, fieldControll, fieldRef);
+			var baseline = t.getRelaFieldBaseline(targetUniqueName, fieldRef, fieldControll);
+			var hideFlag = baseline.isHidden;
+			var mustFlag = baseline.required;
+			var editFlag = false;
+			var isHidden = baseline.isHidden;
+			var required = baseline.required;
+			var readOnly = baseline.readOnly;
+
+			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, contextRowIndex);
+				if (nowValue === '' && rule.triggerTblName) {
+					var triggerUnique = rule.triggerTblName + '_' + rule.triggerFieldName;
+					var triggerRef = t.getRelaFieldFormRef(triggerUnique, contextRowIndex, data);
+					if (!triggerRef) {
+						triggerRef = t.refs[triggerUnique];
+					}
+					if (triggerRef && triggerRef.state && triggerRef.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) {
+						isHidden = baseline.isHidden;
+						if (!baseline.isHidden && !mustFlag) {
+							required = baseline.required;
+						}
+					}
+				} else if (editType == 'must') {
+					if (!skipEditMust && matched && !hideFlag) {
+						required = true;
+						mustFlag = true;
+						isHidden = false;
+					} else if (!mustFlag) {
+						required = baseline.required;
+					}
+				} else if (editType == 'edit') {
+					if (!skipEditMust && matched && defaultshowFields.indexOf(targetUniqueName) != -1) {
+						readOnly = false;
+						editFlag = true;
+					} else if (!skipEditMust && !editFlag && defaultshowFields.indexOf(targetUniqueName) != -1 && nowValue != '') {
+						readOnly = true;
+					} else if (!editFlag && defaultshowFields.indexOf(targetUniqueName) != -1) {
+						readOnly = baseline.readOnly;
+					}
+				}
+			}
+			if (isHidden) {
+				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) {
+				paramList.push({ key: "value", value: "" });
+				paramList.push({ key: "required", value: false });
+			} else if (required !== baseline.required || !isHidden) {
+				paramList.push({ key: "isHidden", value: isHidden });
+			}
+			paramList.push({ key: "isHidden", value: isHidden });
+			paramList.push({ key: "required", value: finalRequired });
+			paramList.push({ key: "readOnly", value: finalReadOnly });
+			t.reloadRelaItemParam(fieldRef, paramList);
+		}
+
+		// 按 relaFieldsMap 全局顺序刷新所有关联字段（主表 + 子表各行）
 
 	}, {
 		key: 'refreshAllRelaFieldsByRelaMap',
-		value: function refreshAllRelaFieldsByRelaMap(data, changedUniqueName) {
+		value: function refreshAllRelaFieldsByRelaMap(data, changedUniqueName, changedSubTblNo) {
 			var t = this;
 			var relaFieldsMap = t.state.formRelaFieldMaps;
 			if (!relaFieldsMap) {
@@ -1189,80 +1382,21 @@ var PageHome = function (_React$Component) {
 					var targetUniqueName = _step3.value;
 
 					var rules = relaFieldsMap[targetUniqueName];
-					if (!rules || !rules.length || !t.refs[targetUniqueName]) {
+					if (!rules || !rules.length) {
 						continue;
 					}
-					// 当前变更字段本身不是触发字段时，跳过自身刷新，避免 popuser 等组件重复 init
-					if (changedUniqueName && targetUniqueName === changedUniqueName) {
-						continue;
-					}
-					var fieldRef = t.refs[targetUniqueName];
-					var skipEditMust = t.isRelaFieldSkipEditMust(targetUniqueName, fieldControll, fieldRef);
-					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 targetSubTblName = t.getSubTblNameByUniqueName(targetUniqueName, data);
+					if (targetSubTblName) {
+						// 子表触发只刷新当前行；主表触发刷新子表所有行
+						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);
 						}
-						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 (!skipEditMust && matched && !hideFlag) {
-								required = true;
-								mustFlag = true;
-								isHidden = false;
-							} else if (!mustFlag) {
-								required = false;
-							}
-						} else if (editType == 'edit') {
-							if (!skipEditMust && matched && defaultshowFields.indexOf(targetUniqueName) != -1) {
-								readOnly = false;
-								editFlag = true;
-							} else if (!skipEditMust && !editFlag && defaultshowFields.indexOf(targetUniqueName) != -1 && nowValue != '') {
-								readOnly = true;
-							}
-						}
-					}
-					if (isHidden) {
-						t.clearFieldDataValue(data, targetUniqueName);
-					}
-					var finalRequired = isHidden ? false : skipEditMust ? 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 });
+					} else {
+						// 主表字段：子表触发时用触发行号读取子表触发值
+						var mainContextRow = typeof changedSubTblNo !== 'undefined' ? changedSubTblNo : undefined;
+						t.applyRelaRulesToTarget(targetUniqueName, rules, data, mainContextRow, changedUniqueName, changedSubTblNo, fieldControll, defaulthideFields, defaultmustFields, defaultshowFields);
 					}
-					t.reloadRelaItemParam(t.refs[targetUniqueName], paramList);
 				}
 			} catch (err) {
 				_didIteratorError3 = true;
@@ -2317,6 +2451,28 @@ var PageHome = function (_React$Component) {
 			this.props.newspyj.content = spyj + commonwords;
 		}
 
+		// 意见态度点击：先执行默认拼接，再触发 FlowCommon 扩展回调
+
+	}, {
+		key: 'attitudeItemClick',
+		value: function attitudeItemClick(item) {
+			var t = this;
+			var attitudeValue = item && item.value != null ? item.value : '';
+			t.phraseItemClick(attitudeValue);
+			var flowCommonRef = FlowCommon;
+			if (!flowCommonRef) {
+				var formCode = t.state.formCode || t.props.formCode || '';
+				var module = t.state.module || t.props.module;
+				if (formCode || module) {
+					var loaded = (0, _formExtHelper.loadFlowOrFormCommon)({ formCode: formCode, module: module || '' });
+					flowCommonRef = loaded.FlowCommon;
+				}
+			}
+			if (flowCommonRef && typeof flowCommonRef.dealwithAttitudeClick === 'function') {
+				flowCommonRef.dealwithAttitudeClick(item, t);
+			}
+		}
+
 		//切换修改常用语
 
 	}, {
@@ -2595,7 +2751,7 @@ var PageHome = function (_React$Component) {
 										this.state.attitudeList.length > 0 ? this.state.attitudeList.map(function (item, i) {
 											return _react2.default.createElement(
 												'div',
-												{ className: 'phrase-item', onClick: this.phraseItemClick.bind(this, item.value) },
+												{ className: 'phrase-item', onClick: this.attitudeItemClick.bind(this, item) },
 												item.value
 											);
 										}.bind(this)) : ''

package/lib/tblform/FlowCommentPane.js

@@ -223,7 +223,7 @@ var FlowCommentPane = function (_BaseTable) {
                         {
                           key: item.value,
                           className: 'phrase-item',
-                          onClick: this.phraseItemClick.bind(this, item.value)
+                          onClick: this.attitudeItemClick.bind(this, item)
                         },
                         item.value
                       );

package/package.json

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