fmui-base 2.3.43 → 2.3.45

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.3.45：数据已被他人修改时，刷新表单内容保留批示意见
+- 2.3.44：数据已被他人修改时，刷新表单内容
 - 2.3.43：表单字段关联时，空值影响
 - 2.3.42：表单字段关联时，为空行隐藏后，切换值显示不了问题处理
 - 2.3.41：移动端支持表单字段校验属性

package/lib/process_info/processInfo.js

@@ -487,6 +487,7 @@ var PageHome = function (_React$Component) {
             errorMsg: '',
             buttonCodeList: '',
             tableStatus: '0',
+            formTableKey: 0,
             finalButtons: finalButtons,
             backReasonText: '', //驳回原因
             recoverReasonText: '', //收回原因
@@ -1541,9 +1542,14 @@ var PageHome = function (_React$Component) {
                     //         urgentSelectList = urgentList;
                     //     }
                     // }
+                    var resolvedOptlock = formData && formData.optlock !== undefined && formData.optlock !== null && formData.optlock !== '' ? String(formData.optlock) : content.optlock !== undefined && content.optlock !== null && content.optlock !== '' ? String(content.optlock) : '';
+                    if (t._pendingForceOptlock) {
+                        resolvedOptlock = String(t._pendingForceOptlock);
+                        t._pendingForceOptlock = null;
+                    }
                     t.setState({
                         editFormData: formData,
-                        formDataOptlock: formData && formData.optlock !== undefined && formData.optlock !== null && formData.optlock !== '' ? String(formData.optlock) : content.optlock !== undefined && content.optlock !== null && content.optlock !== '' ? String(content.optlock) : '',
+                        formDataOptlock: resolvedOptlock,
                         //formDataNew:content.formDataNew,
                         // formData: formData,
                         // fileContent: fileContent,
@@ -1624,6 +1630,14 @@ var PageHome = function (_React$Component) {
                         startUserOrgId: content.startUserOrgId || content.startUserGroupId || '',
                         taskAssignOrgId: content.taskAssignOrgId || ''
                     }, function () {
+                        if (t._pendingCommentRestore != null && t._pendingCommentRestore !== '') {
+                            var restoredComment = t._pendingCommentRestore;
+                            t._pendingCommentRestore = null;
+                            t.setState({
+                                spyj: restoredComment,
+                                newspyj: Object.assign({}, t.state.newspyj, { content: restoredComment })
+                            });
+                        }
                         t.initApproveOrgSwitcher();
                         t.refs["selectMember_circulate"].initSelectData();
                         t.refs["selectMember_circulate1"].initSelectData();
@@ -5271,6 +5285,116 @@ var PageHome = function (_React$Component) {
 
         //发送流程function
 
+    }, {
+        key: 'refreshFormAfterOptlockConflict',
+        value: function refreshFormAfterOptlockConflict() {
+            var t = this;
+            var savedComment = t.state.spyj || t.state.newspyj && t.state.newspyj.content || '';
+            t._pendingCommentRestore = savedComment;
+            t._pendingFormDataRestore = null;
+            try {
+                _Popup2.default.hide();
+            } catch (e) {}
+            try {
+                if (typeof _Dialog2.default !== 'undefined' && _Dialog2.default.hide) {
+                    _Dialog2.default.hide();
+                }
+            } catch (e2) {}
+            // 办理页是 pageStatus=1，冲突后必须先回到表单页（与取消办理一致）
+            try {
+                if (typeof t.handleCancelClick === 'function') {
+                    t.handleCancelClick();
+                } else {
+                    t.setState({ pageStatus: '0', operate: 0 });
+                }
+            } catch (e3) {
+                try {
+                    t.setState({ pageStatus: '0', operate: 0 });
+                } catch (e4) {}
+            }
+            var param = {
+                formId: t.state.formId,
+                dataId: t.state.dataId,
+                permissionCode: t.state.permissionCode,
+                taskId: t.state.taskId,
+                processInstanceId: t.state.processInstanceId,
+                type: t.state.listType,
+                module: t.state.module,
+                isSub: isSub
+            };
+            _db2.default.FlowModuleAPI.getUndoTaskInfo({
+                taskId: t.state.taskId,
+                processInstanceId: t.state.processInstanceId,
+                module: t.state.module,
+                permissionCode: t.state.permissionCode,
+                dataId: t.state.dataId,
+                formId: t.state.formId
+            }).then(function (content) {
+                if (!content || content.message === 'delete' || content.message === 'view' || content.buttons === '') {
+                    _Toast2.default.show({ type: 'error', content: '流程已被他人办理' });
+                    setTimeout(function () {
+                        if (t.state.isPush == '1') {
+                            closePage();
+                        } else {
+                            backPage();
+                        }
+                    }, 1500);
+                    t._pendingCommentRestore = null;
+                    t._pendingForceOptlock = null;
+                    return;
+                }
+                var optlock = '';
+                if (content.optlock !== undefined && content.optlock !== null && content.optlock !== '') {
+                    optlock = String(content.optlock);
+                } else if (content.formData && content.formData.optlock !== undefined && content.formData.optlock !== null && content.formData.optlock !== '') {
+                    optlock = String(content.formData.optlock);
+                }
+                // 注意：content.lock 是流程锁，与主表 optlock 无关；精简 getUndoTaskInfo 可能未带 optlock
+                var afterBackToForm = function afterBackToForm() {
+                    // 再次确保仍在表单页（loadPage 异步后办理态可能残留）
+                    if (t.state.pageStatus !== '0') {
+                        t.setState({ pageStatus: '0', operate: 0 });
+                    }
+                    try {
+                        $(window).scrollTop(0);
+                    } catch (e5) {}
+                    _Toast2.default.show({
+                        type: 'error',
+                        content: '该表单已经被别人修改过，已刷新为最新版本，请核对后重新填写并提交',
+                        duration: 6000
+                    });
+                };
+                // 表单控件只在挂载时读展示值，必须先卸载再 loadPage，否则界面仍是旧显示值
+                var remountAndReload = function remountAndReload(optlockVal) {
+                    if (optlockVal) {
+                        t._pendingForceOptlock = optlockVal;
+                    } else {
+                        t._pendingForceOptlock = null;
+                    }
+                    t.setState({
+                        formDataOptlock: optlockVal || '',
+                        pageStatus: '0',
+                        operate: 0,
+                        tableStatus: '0',
+                        formTableKey: (t.state.formTableKey || 0) + 1,
+                        loadSuccess: false
+                    }, function () {
+                        setTimeout(function () {
+                            t.loadPage(param);
+                            afterBackToForm();
+                        }, 50);
+                    });
+                };
+                remountAndReload(optlock);
+            }).catch(function () {
+                t._pendingCommentRestore = null;
+                t._pendingForceOptlock = null;
+                try {
+                    t.setState({ pageStatus: '0', operate: 0 });
+                } catch (e6) {}
+                _Toast2.default.show({ type: 'error', content: '刷新表单失败，请手动刷新页面' });
+            });
+        }
     }, {
         key: 'sendFlowFuc',
         value: function sendFlowFuc(param) {
@@ -5461,6 +5585,10 @@ var PageHome = function (_React$Component) {
                     if (message.indexOf('已经办理') != -1) {
                         message = "流程已办理！";
                     }
+                    if (message.indexOf('数据已被他人修改') >= 0 || message.indexOf('请刷新后重试') >= 0) {
+                        t.refreshFormAfterOptlockConflict();
+                        return;
+                    }
                     setTimeout(function () {
                         _Toast2.default.show({
                             type: 'error',
@@ -8700,7 +8828,7 @@ var PageHome = function (_React$Component) {
                                         _react2.default.createElement(
                                             _Group2.default.List,
                                             null,
-                                            this.state.tableStatus == '0' ? "" : _react2.default.createElement(_table2.default, { ref: 'approveFormTable', 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) })
+                                            this.state.tableStatus == '0' ? "" : _react2.default.createElement(_table2.default, { key: 'approveFormTable_' + this.state.formTableKey, ref: 'approveFormTable', 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/package.json

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