fmui-base 2.2.95 → 2.2.96

package/README.md

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

package/lib/form/form.js

@@ -2070,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) {
@@ -3067,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) {
@@ -1148,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) {
@@ -1192,6 +1192,10 @@ 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;

package/package.json

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