fmui-base 2.2.87 → 2.2.89

package/lib/form/table.js

@@ -86,6 +86,85 @@ var savePhraseList = [{
 }];
 var formRelaFieldMaps = void 0;
 
+/**
+ * 将按触发字段分组的数据转为按关联字段分组，并保持配置页自上而下优先级
+ */
+function buildFormRelaFieldMapsByRelaField(triggerFieldsMap) {
+	var relaFieldsMap = {};
+	if (!triggerFieldsMap) {
+		return relaFieldsMap;
+	}
+	var allRules = [];
+	var _iteratorNormalCompletion = true;
+	var _didIteratorError = false;
+	var _iteratorError = undefined;
+
+	try {
+		for (var _iterator = Object.keys(triggerFieldsMap)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+			var triggerKey = _step.value;
+
+			var ruleList = triggerFieldsMap[triggerKey] || [];
+			for (var i = 0; i < ruleList.length; i++) {
+				allRules.push(ruleList[i]);
+			}
+		}
+	} catch (err) {
+		_didIteratorError = true;
+		_iteratorError = err;
+	} finally {
+		try {
+			if (!_iteratorNormalCompletion && _iterator.return) {
+				_iterator.return();
+			}
+		} finally {
+			if (_didIteratorError) {
+				throw _iteratorError;
+			}
+		}
+	}
+
+	allRules.sort(function (a, b) {
+		var sortA = parseInt(a.sortNo, 10);
+		var sortB = parseInt(b.sortNo, 10);
+		if (isNaN(sortA)) {
+			sortA = 0;
+		}
+		if (isNaN(sortB)) {
+			sortB = 0;
+		}
+		return sortA - sortB;
+	});
+	allRules.reverse();
+	allRules.forEach(function (item) {
+		var relaFieldTblName = item.relaFieldTblName;
+		var relaFieldName = item.relaFieldName;
+		if (!relaFieldTblName) {
+			return;
+		}
+		var relaFieldTblNameArray = relaFieldTblName.split(",");
+		var relaFieldNameArray = relaFieldName ? relaFieldName.split(",") : [];
+		var relaTblNameArray = item.relaTblName ? item.relaTblName.split(",") : [];
+		relaFieldTblNameArray.forEach(function (relaFieldTblNameItem, index) {
+			var relaFieldItem = {
+				relaFieldTblName: relaFieldTblNameItem,
+				triggerFieldName: item.triggerFieldName,
+				triggerFieldVal: item.triggerFieldVal,
+				triggerTblName: item.triggerTblName,
+				editType: item.editType,
+				relaFieldName: relaFieldNameArray[index] || relaFieldNameArray[0],
+				relaTblName: relaTblNameArray[index] || relaTblNameArray[0],
+				sortNo: item.sortNo
+			};
+			if (relaFieldsMap[relaFieldTblNameItem]) {
+				relaFieldsMap[relaFieldTblNameItem].push(relaFieldItem);
+			} else {
+				relaFieldsMap[relaFieldTblNameItem] = [relaFieldItem];
+			}
+		});
+	});
+	return relaFieldsMap;
+}
+
 var PageHome = function (_React$Component) {
 	_inherits(PageHome, _React$Component);
 
@@ -118,53 +197,14 @@ var PageHome = function (_React$Component) {
 				async: false,
 				success: function success(data) {
 					if (data.code == "0") {
-						formRelaFieldMaps = data.data;
-						if (formRelaFieldMaps) {
-							var _iteratorNormalCompletion = true;
-							var _didIteratorError = false;
-							var _iteratorError = undefined;
-
-							try {
-								for (var _iterator = Object.keys(formRelaFieldMaps)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-									var k = _step.value;
-
-									formRelaFieldMaps[k].map(function (item) {
-										var relaFieldTblName = item.relaFieldTblName;
-										var relaFieldName = item.relaFieldName;
-										var relaFieldTblNameArray = relaFieldTblName.split(",");
-										var relaFieldNameArray = relaFieldName.split(",");
-										relaFieldTblNameArray.map(function (relaFieldTblNameArrayItem, index) {
-											var relaFieldTblNameNew = {
-												"relaFieldTblName": relaFieldTblNameArrayItem,
-												"triggerFieldName": item.triggerFieldName,
-												"triggerFieldVal": item.triggerFieldVal,
-												"triggerTblName": item.triggerTblName,
-												"editType": item.editType,
-												"relaFieldName": relaFieldNameArray[index],
-												"relaTblName": item.relaTblName
-											};
-											if (formRelaFieldMapsNew[relaFieldTblNameArrayItem]) {
-												formRelaFieldMapsNew[relaFieldTblNameArrayItem].push(relaFieldTblNameNew);
-											} else {
-												formRelaFieldMapsNew[relaFieldTblNameArrayItem] = [relaFieldTblNameNew];
-											}
-										});
-									});
-								}
-							} catch (err) {
-								_didIteratorError = true;
-								_iteratorError = err;
-							} finally {
-								try {
-									if (!_iteratorNormalCompletion && _iterator.return) {
-										_iterator.return();
-									}
-								} finally {
-									if (_didIteratorError) {
-										throw _iteratorError;
-									}
-								}
-							}
+						var responseData = data.data || {};
+						// 移动端新结构：triggerFieldsMap 按触发字段分组；relaFieldsMap 按关联字段分组且保留全局优先级
+						if (responseData.triggerFieldsMap) {
+							formRelaFieldMaps = responseData.triggerFieldsMap;
+							formRelaFieldMapsNew = responseData.relaFieldsMap || {};
+						} else {
+							formRelaFieldMaps = responseData;
+							formRelaFieldMapsNew = buildFormRelaFieldMapsByRelaField(formRelaFieldMaps);
 						}
 					}
 				},
@@ -339,8 +379,11 @@ var PageHome = function (_React$Component) {
 	}, {
 		key: 'change',
 		value: function change(data, itemParam, subTblNo) {
-			console.log("formRelaFieldMaps==" + this.state.formRelaFieldMaps);
 			var t = this;
+			// 字段关联 reloadItemParam 会再次进入 change，此处拦截避免死循环
+			if (t._isRelaFieldRefreshing) {
+				return;
+			}
 			var module = t.props.module;
 			var formKey = t.props.allForm ? t.props.allForm.formcode : "";
 			var formTblId = t.props.allForm ? t.props.allForm.formTblId : "";
@@ -774,11 +817,31 @@ var PageHome = function (_React$Component) {
 						}
 					}
 
-					//关联字段
-					if (formRelaFieldMaps) {
+					//关联字段刷新（silent 模式，不向上触发 onChange）
+					if (t.state.formRelaFieldMaps) {
+						var isSubTrigger = typeof subTblNo != 'undefined' && itemParam.tableName != data.mainTblName;
+						t._isRelaFieldRefreshing = true;
+						try {
+							if (!isSubTrigger) {
+								t.refreshAllRelaFieldsByRelaMap(data);
+							} else if (formRelaFieldMaps) {
+								var formRelaFieldMapsObj = formRelaFieldMaps[itemParam.uniqueName];
+								if (formRelaFieldMapsObj && formRelaFieldMapsObj.length > 0) {
+									t.dealwithRelaField(formRelaFieldMapsObj, data, itemParam);
+								}
+							}
+						} finally {
+							t._isRelaFieldRefreshing = false;
+						}
+					} else if (formRelaFieldMaps) {
 						var formRelaFieldMapsObj = formRelaFieldMaps[itemParam.uniqueName];
 						if (formRelaFieldMapsObj && formRelaFieldMapsObj.length > 0) {
-							t.dealwithRelaField(formRelaFieldMapsObj, data, itemParam);
+							t._isRelaFieldRefreshing = true;
+							try {
+								t.dealwithRelaField(formRelaFieldMapsObj, data, itemParam);
+							} finally {
+								t._isRelaFieldRefreshing = false;
+							}
 						}
 					}
 				}
@@ -845,30 +908,326 @@ var PageHome = function (_React$Component) {
 		value: function reloadFormRelaField() {
 			var t = this;
 			var data = t.props.data;
-			//关联字段
-			if (formRelaFieldMaps) {
-				var _iteratorNormalCompletion2 = true;
-				var _didIteratorError2 = false;
-				var _iteratorError2 = undefined;
+			t._isRelaFieldRefreshing = true;
+			try {
+				if (t.state.formRelaFieldMaps) {
+					t.refreshAllRelaFieldsByRelaMap(data);
+				} else if (formRelaFieldMaps) {
+					var _iteratorNormalCompletion2 = true;
+					var _didIteratorError2 = false;
+					var _iteratorError2 = undefined;
 
+					try {
+						for (var _iterator2 = Object.keys(formRelaFieldMaps)[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
+							var k = _step2.value;
+
+							var triggerRules = formRelaFieldMaps[k];
+							if (triggerRules && triggerRules.length > 0) {
+								t.dealwithRelaField(triggerRules, data, { uniqueName: k, key: k.split('_').pop(), tableName: k.split('_')[0] });
+							}
+						}
+					} catch (err) {
+						_didIteratorError2 = true;
+						_iteratorError2 = err;
+					} finally {
+						try {
+							if (!_iteratorNormalCompletion2 && _iterator2.return) {
+								_iterator2.return();
+							}
+						} finally {
+							if (_didIteratorError2) {
+								throw _iteratorError2;
+							}
+						}
+					}
+				}
+			} finally {
+				t._isRelaFieldRefreshing = false;
+			}
+		}
+	}, {
+		key: 'normalizeRelaTriggerValue',
+		value: function normalizeRelaTriggerValue(nowValue) {
+			if (nowValue == null || typeof nowValue == 'undefined') {
+				return "";
+			}
+			if (nowValue && nowValue.indexOf("[") >= 0 && nowValue.indexOf("]") >= 0) {
 				try {
-					for (var _iterator2 = Object.keys(formRelaFieldMaps)[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
-						var k = _step2.value;
+					var nowValueArray = JSON.parse(nowValue);
+					if (nowValueArray.length == 1) {
+						return nowValueArray[0];
+					}
+					return nowValueArray.join(",");
+				} catch (e) {
+					return nowValue;
+				}
+			}
+			if (nowValue != '' && (nowValue.indexOf("$#$#") >= 0 || nowValue.indexOf("#$#$") >= 0)) {
+				if (nowValue.indexOf("#$#$") >= 0) {
+					var nowValueList = nowValue.split("#$#$");
+					if (nowValueList.length == 1) {
+						return nowValueList[0].replace("$#$#", "");
+					}
+					return nowValueList.map(function (item) {
+						return item.replace("$#$#", "");
+					}).join(",");
+				}
+				return nowValue.replace("$#$#", "");
+			}
+			return nowValue;
+		}
+	}, {
+		key: 'clearFieldDataValue',
+		value: function clearFieldDataValue(data, uniqueName) {
+			if (!data || !uniqueName) {
+				return;
+			}
+			var mainTblName = data.mainTblName;
+			var mainTblData = data.mainTblData || [];
+			for (var i = 0; i < mainTblData.length; i++) {
+				if (mainTblName + '_' + mainTblData[i].key == uniqueName) {
+					mainTblData[i].value = '';
+				}
+			}
+			if (data.subTbl && data.subTbl.length > 0) {
+				for (var j = 0; j < data.subTbl.length; j++) {
+					var subRows = data.subTbl[j].subTblData || [];
+					for (var r = 0; r < subRows.length; r++) {
+						var row = subRows[r] || [];
+						for (var c = 0; c < row.length; c++) {
+							if (row[c].uniqueName == uniqueName) {
+								row[c].value = '';
+							}
+						}
+					}
+				}
+			}
+		}
+
+		// 同步关联字段的必填等元数据到提交数据（checkSubmit 读取 mainTblData.required，非组件 state）
 
-						t.dealwithRelaField(formRelaFieldMaps[k], data, k);
+	}, {
+		key: 'syncRelaFieldMetaToData',
+		value: function syncRelaFieldMetaToData(data, uniqueName, meta) {
+			if (!data || !uniqueName || !meta) {
+				return;
+			}
+			var mainTblName = data.mainTblName;
+			var mainTblData = data.mainTblData || [];
+			if (typeof meta.required !== 'undefined') {
+				for (var i = 0; i < mainTblData.length; i++) {
+					if (mainTblName + '_' + mainTblData[i].key == uniqueName) {
+						mainTblData[i].required = meta.required;
 					}
-				} catch (err) {
-					_didIteratorError2 = true;
-					_iteratorError2 = err;
-				} finally {
-					try {
-						if (!_iteratorNormalCompletion2 && _iterator2.return) {
-							_iterator2.return();
+				}
+			}
+			if (data.subTbl && data.subTbl.length > 0 && typeof meta.required !== 'undefined') {
+				for (var j = 0; j < data.subTbl.length; j++) {
+					var subRows = data.subTbl[j].subTblData || [];
+					for (var r = 0; r < subRows.length; r++) {
+						var row = subRows[r] || [];
+						for (var c = 0; c < row.length; c++) {
+							if (row[c].uniqueName == uniqueName) {
+								row[c].required = meta.required;
+							}
 						}
-					} finally {
-						if (_didIteratorError2) {
-							throw _iteratorError2;
+					}
+				}
+			}
+			if (data.relatedTbl && data.relatedTbl.length > 0 && typeof meta.required !== 'undefined') {
+				for (var ri = 0; ri < data.relatedTbl.length; ri++) {
+					var relatedMainTblData = data.relatedTbl[ri].relatedMainTblData;
+					if (!relatedMainTblData) {
+						continue;
+					}
+					var relatedTblName = data.relatedTbl[ri].relatedMainTblName;
+					for (var rk = 0; rk < relatedMainTblData.length; rk++) {
+						if (relatedTblName + '_' + relatedMainTblData[rk].key == uniqueName) {
+							relatedMainTblData[rk].required = meta.required;
+						}
+					}
+				}
+			}
+		}
+	}, {
+		key: 'getRelaTriggerFieldValue',
+		value: function getRelaTriggerFieldValue(rule, data) {
+			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) {
+				return '';
+			}
+			var mainTblData = data.mainTblData || [];
+			if (rule.triggerTblName == mainTblName) {
+				for (var i = 0; i < mainTblData.length; i++) {
+					if (mainTblData[i].key == rule.triggerFieldName) {
+						nowValue = mainTblData[i].value ? mainTblData[i].value : "";
+						break;
+					}
+				}
+			} else if (data.subTbl && data.subTbl.length > 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];
+						for (var k = 0; k < subRow.length; k++) {
+							if (subRow[k].key == rule.triggerFieldName) {
+								nowValue = subRow[k].value ? subRow[k].value : "";
+							}
+						}
+					}
+				}
+			}
+			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;
+		}
+
+		// 静默刷新关联字段 UI，不触发 change 死循环
+
+	}, {
+		key: 'reloadRelaItemParam',
+		value: function reloadRelaItemParam(formRef, paramList) {
+			if (formRef && formRef.reloadItemParam) {
+				formRef.reloadItemParam(paramList, { silent: true });
+			}
+		}
+
+		// 按 relaFieldsMap 全局顺序刷新所有关联字段（props 传入 form.jsx 的同一份数据）
+
+	}, {
+		key: 'refreshAllRelaFieldsByRelaMap',
+		value: function refreshAllRelaFieldsByRelaMap(data) {
+			var t = this;
+			var relaFieldsMap = t.state.formRelaFieldMaps;
+			if (!relaFieldsMap) {
+				return;
+			}
+			var fieldControll = t.props.fieldControll || {};
+			var defaulthideFields = [];
+			var defaultmustFields = [];
+			var defaultshowFields = [];
+			if (fieldControll.hiddenFields) {
+				fieldControll.hiddenFields.split(',').forEach(function (f) {
+					if (f) {
+						defaulthideFields.push(f);
+					}
+				});
+			}
+			if (fieldControll.mustFields) {
+				fieldControll.mustFields.split(',').forEach(function (f) {
+					if (f) {
+						defaultmustFields.push(f);
+					}
+				});
+			}
+			if (fieldControll.showFields) {
+				fieldControll.showFields.split(',').forEach(function (f) {
+					if (f) {
+						defaultshowFields.push(f);
+					}
+				});
+			}
+
+			var _iteratorNormalCompletion3 = true;
+			var _didIteratorError3 = false;
+			var _iteratorError3 = undefined;
+
+			try {
+				for (var _iterator3 = Object.keys(relaFieldsMap)[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {
+					var targetUniqueName = _step3.value;
+
+					var rules = relaFieldsMap[targetUniqueName];
+					if (!rules || !rules.length || !t.refs[targetUniqueName]) {
+						continue;
+					}
+					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 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 (matched && !hideFlag) {
+								required = true;
+								mustFlag = true;
+								isHidden = false;
+							} else if (!mustFlag) {
+								required = false;
+							}
+						} else if (editType == 'edit') {
+							if (matched && defaultshowFields.indexOf(targetUniqueName) != -1) {
+								readOnly = false;
+								editFlag = true;
+							} else if (!editFlag && defaultshowFields.indexOf(targetUniqueName) != -1 && nowValue != '') {
+								readOnly = true;
+							}
+						}
+					}
+					if (isHidden) {
+						t.clearFieldDataValue(data, targetUniqueName);
+					}
+					var finalRequired = isHidden ? 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 });
+					}
+					t.reloadRelaItemParam(t.refs[targetUniqueName], paramList);
+				}
+			} catch (err) {
+				_didIteratorError3 = true;
+				_iteratorError3 = err;
+			} finally {
+				try {
+					if (!_iteratorNormalCompletion3 && _iterator3.return) {
+						_iterator3.return();
+					}
+				} finally {
+					if (_didIteratorError3) {
+						throw _iteratorError3;
 					}
 				}
 			}
@@ -1121,7 +1480,7 @@ var PageHome = function (_React$Component) {
 															isSubField = true;
 															var subTblNameItem = "sub_" + subTblName;
 															var subItem = relaFieldTblNameArrayItem + '_' + thisSubTblNo;
-															t.refs[subTblNameItem].refs[subItem].reloadItemParam([relaFieldMap]);
+															t.reloadRelaItemParam(t.refs[subTblNameItem].refs[subItem], [relaFieldMap]);
 														}
 													}
 												}
@@ -1134,7 +1493,7 @@ var PageHome = function (_React$Component) {
 																isSubField = true;
 																var subTblNameItem = "sub_" + subTblName;
 																var subItem = relaFieldTblNameArrayItem + '_' + b;
-																t.refs[subTblNameItem].refs[subItem].reloadItemParam([relaFieldMap]);
+																t.reloadRelaItemParam(t.refs[subTblNameItem].refs[subItem], [relaFieldMap]);
 															}
 														}
 													}
@@ -1146,10 +1505,10 @@ var PageHome = function (_React$Component) {
 							}
 							if (isSubField) {} else if (t.refs[relaFieldTblNameArrayItem]) {
 								if (relaFieldMap.key == "required" && relaFieldMap.value) {
-									console.log('[{"key":"isHidden","value":true}]');
-									t.refs[relaFieldTblNameArrayItem].reloadItemParam([{ "key": "isHidden", "value": false }]);
+									t.reloadRelaItemParam(t.refs[relaFieldTblNameArrayItem], [{ "key": "isHidden", "value": false }, relaFieldMap]);
+								} else {
+									t.reloadRelaItemParam(t.refs[relaFieldTblNameArrayItem], [relaFieldMap]);
 								}
-								t.refs[relaFieldTblNameArrayItem].reloadItemParam([relaFieldMap]);
 							}
 						}
 					}
@@ -1955,6 +2314,43 @@ var PageHome = function (_React$Component) {
 		// 	})
 		// }
 
+		// 子表列数：走 form_common / flow_common / mobileExt 现有扩展（dealwithCommonFormParam、dealwithFormParamExt）
+
+	}, {
+		key: 'getSubColumnCount',
+		value: function getSubColumnCount(detailItem) {
+			var t = this;
+			if (detailItem && detailItem.__subColumnCountResolved != null) {
+				return detailItem.__subColumnCountResolved;
+			}
+			var allForm = t.props.allForm;
+			var formKey = allForm && allForm.formcode;
+			var formCode = t.state.formCode || t.props.formCode || '';
+			var module = t.props.module;
+			var flowCommonRef = FlowCommon;
+			if (!flowCommonRef && formCode) {
+				var loaded = (0, _formExtHelper.loadFlowOrFormCommon)({ formCode: formCode, module: module || '' });
+				flowCommonRef = loaded.FlowCommon;
+			}
+			var itemParam = (0, _formExtHelper.applyDealwithFormParamExt)({
+				detailForm: detailItem,
+				FlowCommon: flowCommonRef,
+				module: module,
+				formKey: formKey,
+				formCode: formCode,
+				component: t
+			});
+			var count = (0, _formExtHelper.resolveSubColumnCountFromConfig)({
+				itemParam: itemParam,
+				detailForm: detailItem,
+				subColumnCount: t.props.subColumnCount,
+				allForm: allForm
+			});
+			if (detailItem) {
+				detailItem.__subColumnCountResolved = count;
+			}
+			return count;
+		}
 	}, {
 		key: 'render',
 		value: function render() {
@@ -1984,7 +2380,7 @@ var PageHome = function (_React$Component) {
 						}.bind(this)) : item.itemType == 'detail' ? _react2.default.createElement(
 							'div',
 							{ className: "subform_" + item.itemCode },
-							_react2.default.createElement(_subForm2.default, { keyNo: i, ref: 'sub_' + item.itemCode, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentField: t.props.commentField, commentAttitude: t.props.commentAttitude, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, isCaUser: t.props.isCaUser, caFirm: t.props.caFirm, caESignatureName: t.props.caESignatureName, caFormSign: t.props.caFormSign, commentList: t.props.commentFieldList, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, linkFields: t.state.linkFields, isRemoveCommentFormHtml: t.props.isRemoveCommentFormHtml, inscriptionShow: t.props.inscriptionShow, onChange: this.change.bind(this) })
+							_react2.default.createElement(_subForm2.default, { keyNo: i, ref: 'sub_' + item.itemCode, subColumnCount: t.getSubColumnCount(item), operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentField: t.props.commentField, commentAttitude: t.props.commentAttitude, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, isCaUser: t.props.isCaUser, caFirm: t.props.caFirm, caESignatureName: t.props.caESignatureName, caFormSign: t.props.caFormSign, commentList: t.props.commentFieldList, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, linkFields: t.state.linkFields, isRemoveCommentFormHtml: t.props.isRemoveCommentFormHtml, inscriptionShow: t.props.inscriptionShow, onChange: this.change.bind(this) })
 						) : _react2.default.createElement(
 							'div',
 							{ className: "form_" + item.uniqueName },
@@ -2020,7 +2416,7 @@ var PageHome = function (_React$Component) {
 								}.bind(this)) : item.itemType == 'detail' ? _react2.default.createElement(
 									'div',
 									{ className: t.state.active == item.tabCode ? "" : "t-DN" },
-									_react2.default.createElement(_subForm2.default, { className: "subform_" + item.itemCode, keyNo: i, ref: 'sub_' + item.itemCode, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentAttitude: t.props.commentAttitude, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, isCaUser: t.props.isCaUser, caFirm: t.props.caFirm, caESignatureName: t.props.caESignatureName, caFormSign: t.props.caFormSign, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, inscriptionShow: t.props.inscriptionShow, data: t.props.data, fieldControll: t.props.fieldControll, onChange: this.change.bind(this) })
+									_react2.default.createElement(_subForm2.default, { className: "subform_" + item.itemCode, keyNo: i, ref: 'sub_' + item.itemCode, subColumnCount: t.getSubColumnCount(item), operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentAttitude: t.props.commentAttitude, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, isCaUser: t.props.isCaUser, caFirm: t.props.caFirm, caESignatureName: t.props.caESignatureName, caFormSign: t.props.caFormSign, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, inscriptionShow: t.props.inscriptionShow, data: t.props.data, fieldControll: t.props.fieldControll, onChange: this.change.bind(this) })
 								) : _react2.default.createElement(
 									'div',
 									{ className: t.state.active == item.tabCode ? "" : "t-DN" },

package/lib/process_info/processInfo.js

@@ -349,6 +349,7 @@ var PageHome = function (_React$Component) {
             userId: loginUserId,
             formItem: [],
             formStyleObj: {}, //表单字体样式
+            subColumnCount: props.subColumnCount != null && props.subColumnCount !== '' ? props.subColumnCount : 1, //子表每行列数，默认1
             formTblName: '',
             dataId: dataId,
             formId: props.formId,
@@ -7786,7 +7787,7 @@ var PageHome = function (_React$Component) {
                                         _react2.default.createElement(
                                             _Group2.default.List,
                                             null,
-                                            this.state.tableStatus == '0' ? "" : _react2.default.createElement(_table2.default, { module: this.state.module, operate: this.state.operate, editType: this.state.editType, dataId: this.state.dataId, hasCommentField: t.state.hasCommentField, newspyj: t.state.newspyj, commentField: t.state.commentField, commentAttitude: t.state.commentAttitude, status: t.state.status, form: t.state.formItem, formStyleObj: t.state.formStyleObj, allForm: t.state.form, data: t.state.editFormData, commentFieldList: t.state.commentFieldList, defaultValue: t.state.defaultValue, commentDefaultList: t.state.commentDefaultList, commentBackList: t.state.commentBackList, fieldControll: t.state.fieldControll, caIsPrd: t.state.caIsPrd, preCaFields: t.state.preCaFields, formRelaField: t.state.formRelaField, isRemoveCommentFormHtml: t.state.isRemoveCommentFormHtml, commentUpload: t.state.commentUpload, isCaUser: t.state.isCaUser, caFirm: t.state.caFirm, caESignatureName: t.state.caESignatureName, caFormSign: t.state.caFormSign, inscriptionShow: t.state.inscriptionShow, onChange: this.change.bind(this) })
+                                            this.state.tableStatus == '0' ? "" : _react2.default.createElement(_table2.default, { module: this.state.module, operate: this.state.operate, editType: this.state.editType, dataId: this.state.dataId, hasCommentField: t.state.hasCommentField, newspyj: t.state.newspyj, commentField: t.state.commentField, commentAttitude: t.state.commentAttitude, status: t.state.status, form: t.state.formItem, formStyleObj: t.state.formStyleObj, subColumnCount: t.state.subColumnCount, allForm: t.state.form, data: t.state.editFormData, commentFieldList: t.state.commentFieldList, defaultValue: t.state.defaultValue, commentDefaultList: t.state.commentDefaultList, commentBackList: t.state.commentBackList, fieldControll: t.state.fieldControll, caIsPrd: t.state.caIsPrd, preCaFields: t.state.preCaFields, formRelaField: t.state.formRelaField, isRemoveCommentFormHtml: t.state.isRemoveCommentFormHtml, commentUpload: t.state.commentUpload, isCaUser: t.state.isCaUser, caFirm: t.state.caFirm, caESignatureName: t.state.caESignatureName, caFormSign: t.state.caFormSign, inscriptionShow: t.state.inscriptionShow, onChange: this.change.bind(this) })
                                         )
                                     )
                                 )

package/lib/tblform/README.md

@@ -325,8 +325,11 @@ export default {
     // table: TblForm 实例（可访问 refs）
   },
 
-  /** 字段参数处理（Form 加载字段时调用） */
-  dealwithCommonFormParam(itemParam, form) {
+  /** 字段参数处理（子表 SubForm 加载时也会调用，可设置 subColumnCount: 1-4） */
+  dealwithCommonFormParam(itemParam, subForm) {
+    if (itemParam.key === 'sub_tbl_1') {
+      itemParam.subColumnCount = 2;
+    }
     return itemParam;
   },
 
@@ -345,12 +348,18 @@ window.test_lizhao0316_mobileExt = {
   dealwithFormItemChangeExt(itemParam, table, callback) {
     // callback([{ type: 'main', key: 'f11$', data: '联动值' }]);
   },
-  dealwithFormParamExt(itemParam, form) {
+  dealwithFormParamExt(itemParam, subForm) {
+    // 子表多列：在现有扩展里赋值 subColumnCount（1-4），SubForm/Table 会自动读取
+    if (itemParam.key === 'sub_tbl_1') {
+      itemParam.subColumnCount = 2;
+    }
     return itemParam;
   },
 };
 ```
 
+流程表单在 `pages/flow_common/{module}.js` 的 **`dealwithCommonFormParam`** 中同样可设置 `itemParam.subColumnCount`；流程页还可通过 `{module}_{formKey}_mobileExt.dealwithFormParamExt` 按子表编码区分列数。无需新增扩展方法名。
+
 ### 手动加载扩展（高级）
 
 ```javascript