fmui-base 2.2.93 → 2.2.95

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.2.95：表单字段关联只读字段必填不需要生效
+- 2.2.94：流程办理回调时的type不准确问题修复
 - 2.2.93：表单关联字段重构兼容老版本接口
 - 2.2.92：选人组件页签用户改成组织
 - 2.2.91：流程办理按钮名称要与办理弹窗标题同步

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;
     }
 

package/lib/form/table.js

@@ -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 死循环
 
 	}, {
@@ -1156,6 +1192,8 @@ var PageHome = function (_React$Component) {
 					if (!rules || !rules.length || !t.refs[targetUniqueName]) {
 						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 +1225,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 +1233,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 +1244,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 +1467,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/lib/process_info/processInfo.js

@@ -2803,9 +2803,6 @@ var PageHome = function (_React$Component) {
                                     checkedItem.end = item.end;
                                     checkedItem.must = item.must;
                                     checkedItem.participants = participants;
-                                    if (item.end == true) {
-                                        isEnd = true;
-                                    }
                                     checkedItem.level = item.level;
                                     checkedItem.maxOutgoing = maxOutgoing;
                                     if (item.must == true && (maxOutgoing == 1 && checkActi == 0 || maxOutgoing == 0)) {
@@ -2849,6 +2846,7 @@ var PageHome = function (_React$Component) {
                                         //nextSelectType = 'radom';
                                     }
                                 }
+                                isEnd = t.getSelectedIsEnd(nextActivityList, nextRadomList);
 
                                 //紧急
                                 var _urgent = t.state.urgent;
@@ -4874,6 +4872,33 @@ var PageHome = function (_React$Component) {
                 t.saveForm(1);
             }, saveTime * 60 * 1000);
         }
+        //根据当前选中的后继/随机节点判断是否结束
+
+    }, {
+        key: 'getSelectedIsEnd',
+        value: function getSelectedIsEnd(nextActivityList, nextRadomList) {
+            var t = this;
+            var activityList = nextActivityList != null ? nextActivityList : t.state.nextActivityList || [];
+            var radomList = nextRadomList != null ? nextRadomList : t.state.nextRadomList || [];
+            for (var i = 0; i < activityList.length; i++) {
+                if (activityList[i].checked && activityList[i].end === true) {
+                    return true;
+                }
+            }
+            for (var j = 0; j < radomList.length; j++) {
+                var subList = radomList[j].subRandomList || [];
+                for (var k = 0; k < subList.length; k++) {
+                    if (subList[k].checked && subList[k].end === true) {
+                        return true;
+                    }
+                }
+            }
+            if (activityList.length === 0 && radomList.length === 0) {
+                return t.state.isEnd;
+            }
+            return false;
+        }
+
         //提交发送流程
 
     }, {
@@ -5017,8 +5042,8 @@ var PageHome = function (_React$Component) {
                     //是不是起始节点 或再次发起
                     type = 4;
                 }
-                if (t.state.isEnd) {
-                    //是不是结束节点
+                if (t.getSelectedIsEnd()) {
+                    //是不是结束节点（以实际选中节点为准）
                     type = 1;
                 }
                 var dataId = t.state.dataId;
@@ -7312,7 +7337,8 @@ var PageHome = function (_React$Component) {
 
                         this.setState({
                             nextActivityList: nextActivityList,
-                            nextRadomList: nextRadomListMain
+                            nextRadomList: nextRadomListMain,
+                            isEnd: this.getSelectedIsEnd(nextActivityList, nextRadomListMain)
                             //nextSelectType:type
                         });
                     } else {
@@ -7337,7 +7363,8 @@ var PageHome = function (_React$Component) {
                         }
                         this.setState({
                             nextActivityList: nextActivity,
-                            nextRadomList: nextRadomListMain
+                            nextRadomList: nextRadomListMain,
+                            isEnd: this.getSelectedIsEnd(nextActivity, nextRadomListMain)
                             //nextSelectType:type
                         });
                     }
@@ -7345,7 +7372,8 @@ var PageHome = function (_React$Component) {
                     if (type == 'next') {
                         //选的是后继节点
                         this.setState({
-                            nextActivityList: nextActivityList
+                            nextActivityList: nextActivityList,
+                            isEnd: this.getSelectedIsEnd(nextActivityList, this.state.nextRadomList)
                             //nextSelectType:type
                         });
                     } else {
@@ -7353,7 +7381,8 @@ var PageHome = function (_React$Component) {
                         var nextRadomListMain = this.state.nextRadomList;
                         nextRadomListMain[n].subRandomList = nextActivityList;
                         this.setState({
-                            nextRadomList: nextRadomListMain
+                            nextRadomList: nextRadomListMain,
+                            isEnd: this.getSelectedIsEnd(this.state.nextActivityList, nextRadomListMain)
                             //nextSelectType:type
                         });
                     }

package/package.json

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