fmui-base 2.3.47 → 2.3.48

package/README.md

@@ -3,6 +3,7 @@
 ---npm publish
 
 ## 更新日志 
+- 2.3.48：表单组件爱你增加字段关联参数，流程待办或者推送打开已办理或者作废的流程会弹出相应状态的弹框
 - 2.3.47：表单子表编辑保存时会丢失第一条数据
 - 2.3.46：表单子表支持默认展开或者收起
 - 2.3.45：数据已被他人修改时，刷新表单内容保留批示意见

package/lib/form/table.js

@@ -165,6 +165,63 @@ function buildFormRelaFieldMapsByRelaField(triggerFieldsMap) {
 	return relaFieldsMap;
 }
 
+/**
+ * 解析 getRelaFieldsMap 接口返回，写入模块级 triggerFieldsMap，并返回按关联字段分组的 relaFieldsMap
+ */
+function parseRelaFieldsMapResponse(responseData) {
+	var formRelaFieldMapsNew = {};
+	if (!responseData) {
+		formRelaFieldMaps = null;
+		return formRelaFieldMapsNew;
+	}
+	// 兼容新老接口：新结构 {triggerFieldsMap,relaFieldsMap}；老结构直接为按触发字段分组的 Map
+	if (responseData.triggerFieldsMap) {
+		formRelaFieldMaps = responseData.triggerFieldsMap;
+		formRelaFieldMapsNew = responseData.relaFieldsMap;
+	} else {
+		formRelaFieldMaps = responseData;
+		formRelaFieldMapsNew = null;
+	}
+	// 老接口或新接口未返回 relaFieldsMap 时，前端按 sortNo 本地转换，保证联动逻辑一致
+	if (!formRelaFieldMapsNew || Object.keys(formRelaFieldMapsNew).length === 0) {
+		formRelaFieldMapsNew = buildFormRelaFieldMapsByRelaField(formRelaFieldMaps);
+	}
+	return formRelaFieldMapsNew || {};
+}
+
+/**
+ * 同步拉取关联字段配置（setId = formRelaField）
+ */
+function fetchFormRelaFieldMapsSync(formId, formRelaField) {
+	var formRelaFieldMapsNew = {};
+	if (!formRelaField) {
+		formRelaFieldMaps = null;
+		return formRelaFieldMapsNew;
+	}
+	$.ajax({
+		type: 'GET',
+		url: getLoginUserInfo().context + "/api/m/model/formmgr/relafield/getRelaFieldsMap",
+		data: {
+			formId: formId,
+			setId: formRelaField
+		},
+		headers: {
+			Authorization: 'Bearer ' + getLoginUserInfo().token
+		},
+		dataType: "json",
+		async: false,
+		success: function success(data) {
+			if (data.code == "0") {
+				formRelaFieldMapsNew = parseRelaFieldsMapResponse(data.data || {});
+			}
+		},
+		error: function error() {
+			console.log("异常");
+		}
+	});
+	return formRelaFieldMapsNew;
+}
+
 // 构建联动下拉选项（对齐 PC：从联动结果 + 已保存 multiItemsLinkField 取显示文本）
 function buildLinkageSelectOptions(contentValue, relateItemParam, fieldDataItem) {
 	var selectOptions = [];
@@ -242,47 +299,12 @@ var PageHome = function (_React$Component) {
 
 		var defaultValue = props.defaultValue;
 		var status = props.status;
-		var formRelaField = props.formRelaField; //关联字段
+		var formRelaField = props.formRelaField; //关联字段 setId（流程从表单接口带出；纯表单由 props 直接传入）
 		var linkFields = props.allForm ? props.allForm.linkFields : ""; //级联字段
 		var formId = props.data ? props.data.formId : ""; //表单id
 
 		//关联字段
-		var formRelaFieldMapsNew = {};
-		if (formRelaField) {
-			$.ajax({
-				type: 'GET',
-				url: getLoginUserInfo().context + "/api/m/model/formmgr/relafield/getRelaFieldsMap",
-				data: {
-					formId: formId,
-					setId: formRelaField
-				},
-				headers: {
-					Authorization: 'Bearer ' + getLoginUserInfo().token
-				},
-				dataType: "json",
-				async: false,
-				success: function success(data) {
-					if (data.code == "0") {
-						var responseData = data.data || {};
-						// 兼容新老接口：新结构 {triggerFieldsMap,relaFieldsMap}；老结构直接为按触发字段分组的 Map
-						if (responseData.triggerFieldsMap) {
-							formRelaFieldMaps = responseData.triggerFieldsMap;
-							formRelaFieldMapsNew = responseData.relaFieldsMap;
-						} else {
-							formRelaFieldMaps = responseData;
-							formRelaFieldMapsNew = null;
-						}
-						// 老接口或新接口未返回 relaFieldsMap 时，前端按 sortNo 本地转换，保证联动逻辑一致
-						if (!formRelaFieldMapsNew || Object.keys(formRelaFieldMapsNew).length === 0) {
-							formRelaFieldMapsNew = buildFormRelaFieldMapsByRelaField(formRelaFieldMaps);
-						}
-					}
-				},
-				error: function error() {
-					console.log("异常");
-				}
-			});
-		}
+		var formRelaFieldMapsNew = fetchFormRelaFieldMapsSync(formId, formRelaField);
 
 		var linkFieldsNew = {};
 		// if(linkFields){
@@ -420,7 +442,19 @@ var PageHome = function (_React$Component) {
 		return _this;
 	}
 
+	/**
+  * 按 formId + formRelaField(setId) 重新拉取关联字段配置（纯表单 formId/setId 变更时可调用）
+  */
+
+
 	_createClass(PageHome, [{
+		key: 'reloadFormRelaFieldMaps',
+		value: function reloadFormRelaFieldMaps(formId, formRelaField) {
+			var formRelaFieldMapsNew = fetchFormRelaFieldMapsSync(formId, formRelaField);
+			this.setState({ formRelaFieldMaps: formRelaFieldMapsNew });
+			return formRelaFieldMapsNew;
+		}
+	}, {
 		key: 'componentDidMount',
 		value: function componentDidMount() {
 			var t = this;
@@ -436,7 +470,8 @@ var PageHome = function (_React$Component) {
 		key: 'initFormLinkageAndRelaFields',
 		value: function initFormLinkageAndRelaFields() {
 			var t = this;
-			var data = t.props.data;
+			// 流程 Table 用 props.data；纯表单 TblForm 用 state.editFormData
+			var data = t.props.data || t.state.editFormData;
 			if (!data) {
 				t._isFormInitialLoading = false;
 				return;
@@ -907,7 +942,7 @@ var PageHome = function (_React$Component) {
 		key: 'reloadFormRelaField',
 		value: function reloadFormRelaField(options) {
 			var t = this;
-			var data = t.props.data;
+			var data = t.props.data || t.state.editFormData;
 			var initFlag = options && options.initFlag === true;
 			t._isRelaFieldRefreshing = true;
 			try {
@@ -1340,7 +1375,7 @@ var PageHome = function (_React$Component) {
 			if (!relaFieldsMap) {
 				return;
 			}
-			var fieldControll = t.props.fieldControll || {};
+			var fieldControll = t.props.fieldControll || t.state.fieldControll || {};
 			var defaulthideFields = [];
 			var defaultmustFields = [];
 			var defaultshowFields = [];
@@ -1426,7 +1461,7 @@ var PageHome = function (_React$Component) {
 			var defaulthideFields = [];
 			var defaultshowFields = [];
 
-			var fieldControll = this.props.fieldControll;
+			var fieldControll = this.props.fieldControll || this.state.fieldControll || {};
 			var hiddenFields = fieldControll.hiddenFields;
 			var mustFieldsStr = fieldControll.mustFields;
 			var showFieldsStr = fieldControll.showFields;

package/lib/form_info/formInfo.js

@@ -528,17 +528,34 @@ var PageHome = function (_React$Component) {
                 });
             }
 
+            // 办结状态弹窗：仅待办 type=0 或推送 isPush=1
+            var showDoneStatusAlert = String(t.state.listType) === '0' || String(t.state.isPush) === '1';
+            if (showDoneStatusAlert) {
+                if (content['buttons'] == '' && content['message']) {
+                    var doneMsgMap = {
+                        'delete': '此文件已删除',
+                        'transfer': '此文件已转交',
+                        'jump': '此文件已跳转',
+                        'zf': '此文件已作废',
+                        'end': '此文件已结束',
+                        'withdraw': '此文件已撤回',
+                        'back': '此文件已退回',
+                        'view': '此文件已办理'
+                    };
+                    var doneAlert = doneMsgMap[content['message']];
+                    if (doneAlert) {
+                        t.setState({
+                            status: '2'
+                        });
+                        _Dialog2.default.alert({
+                            title: '',
+                            content: doneAlert
+                        });
+                    }
+                }
+            }
             if (t.state.listType == '0') {
                 var tipsTitle = content['tipsTitle'];
-                if (content['buttons'] == '' && content['message'] == 'view') {
-                    t.setState({
-                        status: '2'
-                    });
-                    _Dialog2.default.alert({
-                        title: '',
-                        content: '此文件已办理'
-                    });
-                }
                 if (t.state.operationDetails != null && t.state.operationDetails != '') {
                     if (tipsTitle != null && tipsTitle != '' && tipsTitle != 'undefined') {
                         var tipsContent = content['tipsContent'];

package/lib/process_info/processInfo.js

@@ -541,6 +541,9 @@ var PageHome = function (_React$Component) {
         param.nextTaskId = '';
         param.autoSendFlag = false; //是否是自动通过选人界面
         param.autoSendText = ''; //自动通过选人界面标题
+        param.autoPassCommentSynced = false; //Hold 路径是否已按设置同步意见
+        param.autoPassCommentContent = ''; //同步出的源意见原文
+        param.autoPassCommentId = '';
         param.nextActivityName = '';
         param.backAttachId = ""; //退回增加附件
         param.backInitList = [];
@@ -841,9 +844,14 @@ var PageHome = function (_React$Component) {
                      var shortMessageList1=[];
                      var readShortMessageList1=[];*/
                     if (!content.code) {
+                        var failMsg = (content.message || content.msg || '') + '';
+                        var alertContent = '此文件已作废';
+                        if (failMsg.indexOf('删除') >= 0) {
+                            alertContent = '此文件已删除';
+                        }
                         _Dialog2.default.alert({
                             title: '',
-                            content: '此文件已作废'
+                            content: alertContent
                         });
                         if (isPush == '1') {
                             closePage();
@@ -1151,25 +1159,34 @@ var PageHome = function (_React$Component) {
                         });
                     }
 
+                    // 办结状态弹窗：仅待办 type=0 或推送 isPush=1（推送待办 listType 仍为 0）
+                    var showDoneStatusAlert = String(t.state.listType) === '0' || String(t.state.isPush) === '1';
+                    if (showDoneStatusAlert) {
+                        if (content['buttons'] == '' && content['message']) {
+                            var doneMsgMap = {
+                                'delete': '此文件已删除',
+                                'transfer': '此文件已转交',
+                                'jump': '此文件已跳转',
+                                'zf': '此文件已作废',
+                                'end': '此文件已结束',
+                                'withdraw': '此文件已撤回',
+                                'back': '此文件已退回',
+                                'view': '此文件已办理'
+                            };
+                            var doneAlert = doneMsgMap[content['message']];
+                            if (doneAlert) {
+                                t.setState({
+                                    status: '2'
+                                });
+                                _Dialog2.default.alert({
+                                    title: '',
+                                    content: doneAlert
+                                });
+                            }
+                        }
+                    }
                     if (t.state.listType == '0') {
                         var tipsTitle = content['tipsTitle'];
-                        if (content['buttons'] == '' && content['message'] == 'delete') {
-                            t.setState({
-                                status: '2'
-                            });
-                            _Dialog2.default.alert({
-                                title: '',
-                                content: '该流程已被删除'
-                            });
-                        } else if (content['buttons'] == '' && content['message'] == 'view') {
-                            t.setState({
-                                status: '2'
-                            });
-                            _Dialog2.default.alert({
-                                title: '',
-                                content: '此文件已办理'
-                            });
-                        }
                         if (t.state.operationDetails != null && t.state.operationDetails != '') {
                             if (tipsTitle != null && tipsTitle != '' && tipsTitle != 'undefined') {
                                 var tipsContent = content['tipsContent'];
@@ -2304,6 +2321,18 @@ var PageHome = function (_React$Component) {
                     if (operate == 3) {
                         commentRequired = commentRequired && isSysTransferCommentRequired();
                     }
+                    // 自动通过继续办理：有同步则预填；查不到也不拦截弹窗
+                    if (t.state.autoSendFlag) {
+                        commentRequired = false;
+                        if (t.state.autoPassCommentSynced && t.state.autoPassCommentContent) {
+                            newComment = t.state.autoPassCommentContent;
+                            t.setState({
+                                spyj: newComment,
+                                defaultValue: newComment,
+                                newspyj: Object.assign({}, t.state.newspyj, { content: newComment })
+                            });
+                        }
+                    }
                     if (commentRequired) {
                         //不可为空
                         var documentId = t.state.newspyj.documentId;
@@ -4007,7 +4036,17 @@ var PageHome = function (_React$Component) {
                         return false;
                     }
                 } else if (hasCommentField == '1' && defaultComValue == '') {
-                    if (commentIsNull == '1' || commentIsNotNull == '1') {
+                    if (t.state.autoSendFlag) {
+                        // 自动通过继续办理：查不到同步意见也不拦截
+                        if (t.state.autoPassCommentSynced && t.state.autoPassCommentContent) {
+                            newComment = t.state.autoPassCommentContent;
+                            t.setState({
+                                spyj: newComment,
+                                defaultValue: newComment,
+                                newspyj: Object.assign({}, t.state.newspyj, { content: newComment })
+                            });
+                        }
+                    } else if (commentIsNull == '1' || commentIsNotNull == '1') {
                         //不可为空
                         _Toast2.default.show({
                             type: 'error',
@@ -5334,7 +5373,7 @@ var PageHome = function (_React$Component) {
                 dataId: t.state.dataId,
                 formId: t.state.formId
             }).then(function (content) {
-                if (!content || content.message === 'delete' || content.message === 'view' || content.buttons === '') {
+                if (!content || content.message === 'delete' || content.message === 'view' || content.message === 'transfer' || content.message === 'jump' || content.message === 'zf' || content.message === 'end' || content.message === 'withdraw' || content.message === 'back' || content.buttons === '') {
                     _Toast2.default.show({ type: 'error', content: '流程已被他人办理' });
                     setTimeout(function () {
                         if (t.state.isPush == '1') {
@@ -5547,20 +5586,40 @@ var PageHome = function (_React$Component) {
                     nextTaskId = content.nextTaskId;
                     autoSendText = content.nextTaskName;
                     newdataId = content.dataId;
+                    var synced = content.autoPassCommentSynced === true || content.autoPassCommentSynced === 'true' || content.autoPassCommentSynced === 1 || content.autoPassCommentSynced === '1';
+                    var syncedContent = content.autoPassCommentContent || '';
+                    var syncedId = content.autoPassCommentId || '';
                     try {
                         t.handleCancelClick();
                     } catch (e) {}
-                    t.setState({
+                    var nextState = {
                         autoSendFlag: true,
                         taskId: nextTaskId,
                         nextTaskId: nextTaskId,
                         operate: 1,
                         autoSendText: autoSendText,
-                        dataId: newdataId
-                    }, function () {
+                        dataId: newdataId,
+                        autoPassCommentSynced: !!synced,
+                        autoPassCommentContent: syncedContent,
+                        autoPassCommentId: syncedId
+                    };
+                    if (synced && syncedContent) {
+                        nextState.defaultValue = syncedContent;
+                        nextState.spyj = syncedContent;
+                        nextState.newspyj = Object.assign({}, t.state.newspyj, { content: syncedContent });
+                    }
+                    if (synced && syncedId) {
+                        nextState.commentId = syncedId;
+                    }
+                    t.setState(nextState, function () {
                         t.handleSubmit(1);
                     });
                 } else {
+                    t.setState({
+                        autoPassCommentSynced: false,
+                        autoPassCommentContent: '',
+                        autoPassCommentId: ''
+                    });
                     if (isSub == '1') {
                         backPage(2);
                     }

package/lib/tblform/README.md

@@ -30,7 +30,7 @@ src/tblform/
 
 | 能力 | `form/table`（流程） | `tblform/TblForm`（纯表单） |
 |------|----------------------|------------------------------|
-| 入参 | 大量流程参数（批示意见、commentField 等） | **仅需 formId、editType、dataId** |
+| 入参 | 大量流程参数（批示意见、commentField 等） | **formId、editType、dataId**；可选 **formRelaField**（关联设置 setId，直接入参） |
 | 数据加载 | 流程接口 `getMobileForm` | `getPureMobileForm` |
 | 数据保存 | `saveForm`（流程草稿） | `runtimeDataSave` |
 | 批示意见 UI | 内置 | 无（可用 `FlowCommentPane` 单独挂载） |
@@ -142,14 +142,18 @@ export default class PureFormPage extends React.Component {
 | `editType` | string | `'add'` | 编辑类型，见下表 |
 | `dataId` | string | `''` | 数据 ID |
 | `formCode` | string | `''` | 扩展编码；不传则使用接口返回的 `form.formcode` |
+| `formRelaField` | string | `''` | 关联字段设置 setId；**直接入参**，无需从流程/表单加载接口获取。有值时内部请求 `getRelaFieldsMap` 启用字段关联（显隐/必填等） |
 
-**editType 与内部 status 映射：**
+```jsx
+<TblForm
+  formId="4028b28a9cf4442a019cf45667820020"
+  editType="add"
+  dataId=""
+  formRelaField="4028b2c6a03bd3a401a03d9421b00bfb"
+/>
+```
 
-| editType | status | 字段表现 |
-|----------|--------|----------|
-| `add` | `0` | 可编辑（新增） |
-| `edit` | `1` | 可编辑（修改） |
-| `view` | `2` | 只读（查看） |
+> 流程场景下 `formRelaField` 由 `getMobileForm` 等接口返回；纯表单场景不依赖该接口，由业务页直接传入关联设置 ID 即可。
 
 ### 回调参数（可选）
 
@@ -489,4 +493,5 @@ onSaveSuccess={(result) => {
 
 | 版本 | 说明 |
 |------|------|
+| 1.0.1 | 支持 props 直接传入 `formRelaField`（关联设置 setId），启用字段关联 |
 | 1.0.0 | 初始版本：纯表单加载/保存、form_common 扩展、FlowCommentPane 分离 |

package/lib/tblform/TblForm.js

@@ -54,7 +54,8 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
 
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; } /**
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                * 纯表单容器：仅接收 formId、editType、dataId，内部请求 getPureMobileForm 并渲染表单
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                * 纯表单容器：接收 formId、editType、dataId，可选 formRelaField（关联设置 setId，直接入参，无需从流程接口获取）
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                * 内部请求 getPureMobileForm 并渲染表单
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 */
 
 
@@ -66,7 +67,7 @@ var TblForm = function (_BaseTable) {
 
     var _this = _possibleConstructorReturn(this, (TblForm.__proto__ || Object.getPrototypeOf(TblForm)).call(this, {
       module: '',
-      formRelaField: '',
+      formRelaField: props.formRelaField || '',
       defaultValue: '',
       data: { formId: props.formId },
       allForm: {}
@@ -100,7 +101,7 @@ var TblForm = function (_BaseTable) {
   }, {
     key: 'componentDidUpdate',
     value: function componentDidUpdate(prevProps) {
-      if (prevProps.formId !== this.props.formId || prevProps.editType !== this.props.editType || prevProps.dataId !== this.props.dataId) {
+      if (prevProps.formId !== this.props.formId || prevProps.editType !== this.props.editType || prevProps.dataId !== this.props.dataId || prevProps.formRelaField !== this.props.formRelaField) {
         this.loadPureForm();
       }
     }
@@ -111,7 +112,8 @@ var TblForm = function (_BaseTable) {
       var _props = this.props,
           formId = _props.formId,
           editType = _props.editType,
-          dataId = _props.dataId;
+          dataId = _props.dataId,
+          formRelaField = _props.formRelaField;
 
       if (!formId) {
         t.setState({ loading: false, loadError: '缺少 formId' });
@@ -120,6 +122,13 @@ var TblForm = function (_BaseTable) {
 
       t.setState({ loading: true, loadError: '' });
 
+      // formId / formRelaField 变更时刷新关联字段配置（构造时已按入参拉过一次）
+      if (formRelaField) {
+        t.reloadFormRelaFieldMaps(formId, formRelaField);
+      } else {
+        t.reloadFormRelaFieldMaps(formId, '');
+      }
+
       _db2.default.form.getPureMobileForm({
         formId: formId,
         editType: editType || 'add',
@@ -143,6 +152,10 @@ var TblForm = function (_BaseTable) {
           savedDataId: loadedDataId,
           formCode: formCode
         }, function () {
+          // 表单数据就绪后再跑一遍关联初始化，与流程 Table.componentDidMount 对齐
+          setTimeout(function () {
+            t.initFormLinkageAndRelaFields();
+          }, 500);
           if (typeof t.props.onLoad === 'function') {
             t.props.onLoad(normalized.editFormData, normalized);
           }

package/package.json

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