fmui-base 2.3.41 → 2.3.43

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.3.43：表单字段关联时，空值影响
+- 2.3.42：表单字段关联时，为空行隐藏后，切换值显示不了问题处理
 - 2.3.41：移动端支持表单字段校验属性
 - 2.3.40：表单html字段增加className="ueditor-content"
 - 2.3.39：表单说明组件附件允许下载

package/lib/form/form.js

@@ -1988,19 +1988,7 @@ var PageHome = function (_React$Component) {
           }
         });
       }
-      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;
+      return (0, _formExtHelper.normalizeRelaMatchValue)(nowValue);
     }
 
     //处理关联字段初始化（按 relaFieldsMap 全局顺序，后写入覆盖先写入，与配置页优先级一致）
@@ -2059,7 +2047,7 @@ var PageHome = function (_React$Component) {
       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 matched = (0, _formExtHelper.isRelaRuleMatched)(rule, nowValue);
         var editType = rule.editType;
         if (editType == 'hide' || editType == 'rowhide') {
           if (matched) {
@@ -2080,7 +2068,7 @@ var PageHome = function (_React$Component) {
           if (!skipEditMust && matched && defaultshowFields.indexOf(itemParam.uniqueName) != -1) {
             itemParam.readOnly = false;
             editFlag = true;
-          } else if (!skipEditMust && !editFlag && defaultshowFields.indexOf(itemParam.uniqueName) != -1 && nowValue != '') {
+          } else if (!skipEditMust && !editFlag && defaultshowFields.indexOf(itemParam.uniqueName) != -1 && nowValue != '' && nowValue != ' ') {
             itemParam.readOnly = true;
           } else if (!editFlag && defaultshowFields.indexOf(itemParam.uniqueName) != -1) {
             itemParam.readOnly = baseline.readOnly;

package/lib/form/formExtHelper.js

@@ -10,6 +10,7 @@ exports.buildDetailItemParam = buildDetailItemParam;
 exports.applyDealwithFormParamExt = applyDealwithFormParamExt;
 exports.resolveSubColumnCountFromConfig = resolveSubColumnCountFromConfig;
 exports.normalizeRelaTriggerValue = normalizeRelaTriggerValue;
+exports.normalizeRelaMatchValue = normalizeRelaMatchValue;
 exports.isRelaRuleMatched = isRelaRuleMatched;
 exports.getRelaTriggerFieldValueForLayout = getRelaTriggerFieldValueForLayout;
 exports.resolveFieldRelaHidden = resolveFieldRelaHidden;
@@ -264,17 +265,27 @@ function normalizeRelaTriggerValue(nowValue) {
   return nowValue;
 }
 
-/** 关联规则是否命中（与 form.jsx isRelaRuleMatched 一致） */
+/** 关联匹配用触发值：空值与 PC getRelaTriggerValFromDom 一致转为空格（单选未选/请选择） */
+function normalizeRelaMatchValue(nowValue) {
+  var normalized = normalizeRelaTriggerValue(nowValue);
+  if (normalized === '' || normalized == null) {
+    return ' ';
+  }
+  return normalized;
+}
+
+/** 关联规则是否命中（与 PC linkageUtils.isRelaRuleMatchedPc 一致） */
 function isRelaRuleMatched(rule, nowValue) {
   var triggerFieldVal = rule.triggerFieldVal;
-  if (triggerFieldVal == ' ') {
-    triggerFieldVal = '';
+  if (nowValue == null || nowValue === '') {
+    nowValue = ' ';
+  } else {
+    nowValue = String(nowValue);
   }
-  if (triggerFieldVal === '') {
-    return true;
+  if (triggerFieldVal == null) {
+    triggerFieldVal = '';
   }
-  nowValue = nowValue == null ? '' : String(nowValue);
-  return triggerFieldVal == nowValue || nowValue.split(',').indexOf(triggerFieldVal) !== -1;
+  return triggerFieldVal == nowValue || nowValue.split(',').indexOf(String(triggerFieldVal)) !== -1;
 }
 
 /** 读取关联触发字段当前值（布局预判，与 form.jsx 子表场景一致） */
@@ -306,7 +317,7 @@ function getRelaTriggerFieldValueForLayout(rule, fullFormData, rowIndex) {
       }
     }
   }
-  return normalizeRelaTriggerValue(nowValue);
+  return normalizeRelaMatchValue(nowValue);
 }
 
 /**

package/lib/form/table.js

@@ -1132,7 +1132,7 @@ var PageHome = function (_React$Component) {
 				triggerRef = this.refs[triggerUnique];
 			}
 			if (triggerRef && triggerRef.state && triggerRef.state.itemParam.isHidden) {
-				return '';
+				return ' ';
 			}
 			var mainTblData = data.mainTblData || [];
 			if (rule.triggerTblName == mainTblName) {
@@ -1155,19 +1155,7 @@ var PageHome = function (_React$Component) {
 					}
 				}
 			}
-			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;
+			return (0, _formExtHelper.normalizeRelaMatchValue)(nowValue);
 		}
 
 		// 获取关联字段还原基线（流程权限/表单设计后的初始状态）
@@ -1291,7 +1279,7 @@ var PageHome = function (_React$Component) {
 						continue;
 					}
 				}
-				var matched = t.isRelaRuleMatched(rule, nowValue);
+				var matched = (0, _formExtHelper.isRelaRuleMatched)(rule, nowValue);
 				var editType = rule.editType;
 				if (editType == 'hide' || editType == 'rowhide') {
 					if (matched) {
@@ -1316,7 +1304,7 @@ var PageHome = function (_React$Component) {
 					if (!skipEditMust && matched && defaultshowFields.indexOf(targetUniqueName) != -1) {
 						readOnly = false;
 						editFlag = true;
-					} else if (!skipEditMust && !editFlag && defaultshowFields.indexOf(targetUniqueName) != -1 && nowValue != '') {
+					} else if (!skipEditMust && !editFlag && defaultshowFields.indexOf(targetUniqueName) != -1 && nowValue != '' && nowValue != ' ') {
 						readOnly = true;
 					} else if (!editFlag && defaultshowFields.indexOf(targetUniqueName) != -1) {
 						readOnly = baseline.readOnly;
@@ -1475,9 +1463,6 @@ var PageHome = function (_React$Component) {
 					var formRelaFieldMapsObjItem = formRelaFieldMapsObj[formIndex];
 					mustFlag = false;
 					var triggerFieldVal = formRelaFieldMapsObjItem.triggerFieldVal;
-					if (triggerFieldVal == " ") {
-						triggerFieldVal = "";
-					}
 					var relaFieldTblName = formRelaFieldMapsObjItem.relaFieldTblName;
 					var editType = formRelaFieldMapsObjItem.editType;
 					if (relaFieldTblName) {
@@ -1544,14 +1529,15 @@ var PageHome = function (_React$Component) {
 									}
 								}
 							var relaFieldMap = {};
+							if (nowValue === '' || nowValue == null) {
+								nowValue = ' ';
+							}
 							if (editType == 'hide' || editType == 'rowhide') {
 								relaFieldMap["key"] = "isHidden";
-								if (triggerFieldVal == nowValue || nowValue.split(',').indexOf(triggerFieldVal) != -1) {
+								if ((0, _formExtHelper.isRelaRuleMatched)({ triggerFieldVal: triggerFieldVal }, nowValue)) {
 									relaFieldMap["value"] = true;
 									hideFlag = true;
 									hideFields.push(relaFieldTblNameArrayItem);
-								} else if (triggerFieldVal == '') {
-									relaFieldMap["value"] = true;
 								} else if (!hideFlag && defaulthideFields.indexOf(relaFieldTblNameArrayItem) != -1) {
 									relaFieldMap["value"] = true;
 								} else if (!hideFlag && hideFields.indexOf(relaFieldTblNameArrayItem) == -1) {
@@ -1595,7 +1581,7 @@ var PageHome = function (_React$Component) {
 							} else if (editType == 'must') {
 								relaFieldMap["key"] = "required";
 								var triggerFieldValBoolean = mustFlag;
-								if (triggerFieldVal == nowValue || nowValue.split(',').indexOf(triggerFieldVal) != -1) {
+								if ((0, _formExtHelper.isRelaRuleMatched)({ triggerFieldVal: triggerFieldVal }, nowValue)) {
 									relaFieldMap["value"] = true;
 									triggerFieldValBoolean = true;
 									mustFlag = true;
@@ -1642,7 +1628,7 @@ var PageHome = function (_React$Component) {
 								}
 							} else if (editType == 'edit') {
 								relaFieldMap["key"] = "readOnly";
-								if ((triggerFieldVal == nowValue || nowValue.split(',').indexOf(triggerFieldVal) != -1) && defaultshowFields.indexOf(relaFieldTblNameArrayItem) != -1) {
+								if ((0, _formExtHelper.isRelaRuleMatched)({ triggerFieldVal: triggerFieldVal }, nowValue) && defaultshowFields.indexOf(relaFieldTblNameArrayItem) != -1) {
 									relaFieldMap["value"] = false;
 									editFlag = true;
 								} else if (!editFlag && defaultshowFields.indexOf(relaFieldTblNameArrayItem) != -1) {

package/package.json

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