fmui-base 2.2.94 → 2.2.96

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.2.96：表单字段关联选人字段关联时可能会出现死循环问题修复
+- 2.2.95：表单字段关联只读字段必填不需要生效
 - 2.2.94：流程办理回调时的type不准确问题修复
 - 2.2.93：表单关联字段重构兼容老版本接口
 - 2.2.92：选人组件页签用户改成组织

package/lib/form/form.js

@@ -1856,6 +1856,8 @@ var PageHome = function (_React$Component) {
       var formRelaFieldMapsArray = formRelaFieldMaps[itemParam.uniqueName];
       var fieldControll = this.props.fieldControll || {};
       var defaulthideFields = [];
+      var defaultshowFields = [];
+      var defaultmustFields = [];
       if (fieldControll.hiddenFields) {
         fieldControll.hiddenFields.split(',').forEach(function (f) {
           if (f) {
@@ -1863,9 +1865,25 @@ var PageHome = function (_React$Component) {
           }
         });
       }
+      if (fieldControll.showFields) {
+        fieldControll.showFields.split(',').forEach(function (f) {
+          if (f) {
+            defaultshowFields.push(f);
+          }
+        });
+      }
+      if (fieldControll.mustFields) {
+        fieldControll.mustFields.split(',').forEach(function (f) {
+          if (f) {
+            defaultmustFields.push(f);
+          }
+        });
+      }
       if (defaulthideFields.indexOf(itemParam.uniqueName) != -1) {
         itemParam.isHidden = true;
       }
+      // 流程只读/必填或表单设计只读时，关联编辑/必填不生效
+      var skipEditMust = defaultshowFields.indexOf(itemParam.uniqueName) != -1 || defaultmustFields.indexOf(itemParam.uniqueName) != -1 || itemParam.readOnly === true || this.props.form && this.props.form.readOnly === true;
 
       formRelaFieldMapsArray.forEach(function (rule) {
         var nowValue = this.getRelaTriggerFieldValue(rule, data, allForm);
@@ -1878,16 +1896,20 @@ var PageHome = function (_React$Component) {
             itemParam.isHidden = false;
           }
         } else if (editType == 'must') {
-          if (matched) {
-            itemParam.required = true;
-          } else {
-            itemParam.required = false;
+          if (!skipEditMust) {
+            if (matched) {
+              itemParam.required = true;
+            } else {
+              itemParam.required = false;
+            }
           }
         } else if (editType == 'edit') {
-          if (matched) {
-            itemParam.readOnly = false;
-          } else if (nowValue != '') {
-            itemParam.readOnly = true;
+          if (!skipEditMust) {
+            if (matched) {
+              itemParam.readOnly = false;
+            } else if (nowValue != '') {
+              itemParam.readOnly = true;
+            }
           }
         }
       }.bind(this));
@@ -1895,6 +1917,9 @@ var PageHome = function (_React$Component) {
       if (itemParam.isHidden) {
         itemParam.required = false;
       }
+      if (skipEditMust) {
+        itemParam.required = false;
+      }
       return itemParam;
     }
 
@@ -2045,7 +2070,17 @@ var PageHome = function (_React$Component) {
           //   this.props.reloadItemParam(itemNew,this.state.itemParam);
           // } 
           if (itemParam.itemType == 'popuser') {
-            this.refs['selectMember_' + itemParam.key].initSelectData();
+            // 静默关联刷新只改必填/隐藏，不重新 init，避免 initSelectData 触发 onChange 死循环
+            var hasValueUpdate = false;
+            for (var pi = 0; pi < itemNew.length; pi++) {
+              if (itemNew[pi].key === 'value') {
+                hasValueUpdate = true;
+                break;
+              }
+            }
+            if (hasValueUpdate && !silent) {
+              this.refs['selectMember_' + itemParam.key].initSelectData();
+            }
           }
           // 静默刷新时仍需同步 mainTblData.required，否则提交校验不生效
           if (silent && this.props.data) {
@@ -3042,6 +3077,21 @@ var PageHome = function (_React$Component) {
     value: function popuserChange(code, newValue, oldValue) {
       console.log("===popuserChange===");
       var t = this;
+      var normalizedNew = newValue;
+      if (normalizedNew && normalizedNew.length == 0) {
+        normalizedNew = "";
+      } else if (normalizedNew) {
+        normalizedNew = JSON.stringify(newValue);
+      } else {
+        normalizedNew = "";
+      }
+      var normalizedOld = oldValue;
+      if (normalizedOld && typeof normalizedOld !== 'string') {
+        normalizedOld = JSON.stringify(normalizedOld);
+      }
+      if (normalizedNew === normalizedOld) {
+        return;
+      }
       var userId = "";
       for (var i = 0; i < newValue.length; i++) {
         if (newValue[i] && newValue[i].scopeType == 'user') {

package/lib/form/table.js

@@ -828,7 +828,7 @@ var PageHome = function (_React$Component) {
 						t._isRelaFieldRefreshing = true;
 						try {
 							if (!isSubTrigger) {
-								t.refreshAllRelaFieldsByRelaMap(data);
+								t.refreshAllRelaFieldsByRelaMap(data, itemParam.uniqueName);
 							} else if (formRelaFieldMaps) {
 								var formRelaFieldMapsObj = formRelaFieldMaps[itemParam.uniqueName];
 								if (formRelaFieldMapsObj && formRelaFieldMapsObj.length > 0) {
@@ -1098,6 +1098,42 @@ var PageHome = function (_React$Component) {
 			return triggerFieldVal == nowValue || nowValue.split(',').indexOf(triggerFieldVal) != -1;
 		}
 
+		// 流程只读/必填或表单设计只读时，关联的编辑/必填不生效（与PC init-readonly-flag / init-notnull-flag 一致）
+
+	}, {
+		key: 'isRelaFieldSkipEditMust',
+		value: function isRelaFieldSkipEditMust(targetUniqueName, fieldControll, fieldRef) {
+			fieldControll = fieldControll || {};
+			var defaultshowFields = [];
+			var defaultmustFields = [];
+			if (fieldControll.showFields) {
+				fieldControll.showFields.split(',').forEach(function (f) {
+					if (f) {
+						defaultshowFields.push(f);
+					}
+				});
+			}
+			if (fieldControll.mustFields) {
+				fieldControll.mustFields.split(',').forEach(function (f) {
+					if (f) {
+						defaultmustFields.push(f);
+					}
+				});
+			}
+			if (defaultshowFields.indexOf(targetUniqueName) != -1 || defaultmustFields.indexOf(targetUniqueName) != -1) {
+				return true;
+			}
+			if (fieldRef) {
+				if (fieldRef.props && fieldRef.props.form && fieldRef.props.form.readOnly === true) {
+					return true;
+				}
+				if (fieldRef.state && fieldRef.state.itemParam && fieldRef.state.itemParam.readOnly === true) {
+					return true;
+				}
+			}
+			return false;
+		}
+
 		// 静默刷新关联字段 UI，不触发 change 死循环
 
 	}, {
@@ -1112,7 +1148,7 @@ var PageHome = function (_React$Component) {
 
 	}, {
 		key: 'refreshAllRelaFieldsByRelaMap',
-		value: function refreshAllRelaFieldsByRelaMap(data) {
+		value: function refreshAllRelaFieldsByRelaMap(data, changedUniqueName) {
 			var t = this;
 			var relaFieldsMap = t.state.formRelaFieldMaps;
 			if (!relaFieldsMap) {
@@ -1156,6 +1192,12 @@ var PageHome = function (_React$Component) {
 					if (!rules || !rules.length || !t.refs[targetUniqueName]) {
 						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;
@@ -1187,7 +1229,7 @@ var PageHome = function (_React$Component) {
 								isHidden = false;
 							}
 						} else if (editType == 'must') {
-							if (matched && !hideFlag) {
+							if (!skipEditMust && matched && !hideFlag) {
 								required = true;
 								mustFlag = true;
 								isHidden = false;
@@ -1195,10 +1237,10 @@ var PageHome = function (_React$Component) {
 								required = false;
 							}
 						} else if (editType == 'edit') {
-							if (matched && defaultshowFields.indexOf(targetUniqueName) != -1) {
+							if (!skipEditMust && matched && defaultshowFields.indexOf(targetUniqueName) != -1) {
 								readOnly = false;
 								editFlag = true;
-							} else if (!editFlag && defaultshowFields.indexOf(targetUniqueName) != -1 && nowValue != '') {
+							} else if (!skipEditMust && !editFlag && defaultshowFields.indexOf(targetUniqueName) != -1 && nowValue != '') {
 								readOnly = true;
 							}
 						}
@@ -1206,7 +1248,7 @@ var PageHome = function (_React$Component) {
 					if (isHidden) {
 						t.clearFieldDataValue(data, targetUniqueName);
 					}
-					var finalRequired = isHidden ? false : required;
+					var finalRequired = isHidden ? false : skipEditMust ? false : required;
 					t.syncRelaFieldMetaToData(data, targetUniqueName, { required: finalRequired });
 					var paramList = [];
 					if (isHidden) {
@@ -1429,7 +1471,7 @@ var PageHome = function (_React$Component) {
 								if (hideFlag) {
 									relaFieldMap["value"] = false;
 								}
-								if (defaultshowFields.indexOf(relaFieldTblNameArrayItem) != -1 || defaulthideFields.indexOf(relaFieldTblNameArrayItem) != -1) {
+								if (defaultshowFields.indexOf(relaFieldTblNameArrayItem) != -1 || defaulthideFields.indexOf(relaFieldTblNameArrayItem) != -1 || defaultmustFields.indexOf(relaFieldTblNameArrayItem) != -1) {
 									relaFieldMap["value"] = false;
 								}
 								var relaFieldNameArray = formRelaFieldMapsObjItem.relaFieldTblName.split(",");

package/package.json

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