fmui-base 2.3.5 → 2.3.6

package/README.md

@@ -3,6 +3,7 @@
 ---npm publish
 
 ## 更新日志 
+- 2.3.6：待办表单支持切换组织
 - 2.3.5：联动字段保存后被清空
 - 2.3.4：移动端表单下拉单选和按钮按钮组件样式更换
 - 2.3.3：移动端表单下拉单选和按钮按钮组件样式更换

package/lib/db/db.js

@@ -1111,6 +1111,35 @@ context.create('FlowModuleAPI', {
       //   content: <Loading />
       // });
     }
+  },
+  getUserSetInfo: {
+    mockUrl: 'query/getUserSetInfo.json',
+    url: _variables2.default.URLS.getUserSetInfo,
+    method: 'GET',
+    header: {
+      Authorization: 'Bearer ' + getLoginUserInfo().token
+    },
+    willFetch: function willFetch() {}
+  },
+  orgSwitch: {
+    mockUrl: 'query/orgSwitch.json',
+    url: _variables2.default.URLS.orgSwitch,
+    method: 'POST',
+    postDataFomat: 'FORM',
+    header: {
+      Authorization: 'Bearer ' + getLoginUserInfo().token
+    },
+    willFetch: function willFetch() {}
+  },
+  updateStartUserOrg: {
+    mockUrl: 'query/updateStartUserOrg.json',
+    url: _variables2.default.URLS.updateStartUserOrg,
+    method: 'POST',
+    postDataFomat: 'FORM',
+    header: {
+      Authorization: 'Bearer ' + getLoginUserInfo().token
+    },
+    willFetch: function willFetch() {}
   }
 
 });

package/lib/db/variables.js

@@ -140,7 +140,10 @@ exports.default = {
         getProcessListByCodes: approveUrlPrefix + "getProcessListByCodes" + '?', //获取可发起的子流程
         getRelaObjByRelaId: approveUrlPrefix + "getRelaObjByRelaId" + '?', //获取相关对象
         getUrgencyEnum: approveUrlPrefix + "getUrgencyEnum" + '?', //获取枚举
-        getSysSettingByMark: approveUrlPrefix + "getSysSettingByMark" + '?' //获取系统设置
+        getSysSettingByMark: approveUrlPrefix + "getSysSettingByMark" + '?', //获取系统设置
+        getUserSetInfo: urlBasicPrefix + 'setting/userinfo/getUserSetInfo' + '?', //获取用户组织信息
+        orgSwitch: urlBasicPrefix + 'front/personal/orgSwitch' + '?', //切换组织
+        updateStartUserOrg: approveUrlPrefix + 'updateStartUserOrg' + '?' //更新发起人组织
     },
     nodataIcon: context + "/mobile/fmui/images/noData.png",
     loadingIcon: context + "/mobile/fmui/images/loading.gif",

package/lib/process_info/processInfo.js

@@ -137,6 +137,33 @@ function isSysTransferCommentRequired() {
     return getSysSettingByMark('approveTransferComment') == '1';
 }
 
+/** 组织切换相关接口不可用（如后台未部署、404） */
+function isApproveOrgApiUnavailableError(err) {
+    if (!err) {
+        return false;
+    }
+    var code = err.status || err.statusCode || err.code;
+    if (code == 404 || code == '404') {
+        return true;
+    }
+    if (err.error) {
+        code = err.error.errorCode || err.error.code || err.error.status;
+        if (code == 404 || code == '404') {
+            return true;
+        }
+    }
+    var msg = '';
+    if (err.error && err.error.errorMsg) {
+        msg = err.error.errorMsg;
+    } else if (err.message) {
+        msg = err.message;
+    } else if (typeof err === 'string') {
+        msg = err;
+    }
+    msg = (msg || '').toLowerCase();
+    return msg.indexOf('404') >= 0 || msg.indexOf('not found') >= 0;
+}
+
 var isCaReload = false;
 window.addEventListener('pageshow', function () {
     console.log("isCaReload===" + isCaReload);
@@ -487,7 +514,7 @@ var PageHome = function (_React$Component) {
             selectProcessCode: '', //选中的子流程
             subProcessType: '', //子流程类型 0串行  1并行
             urgencyList: [], //紧急程度列表
-            urgency: '' }, _defineProperty(_param, 'urgent', ''), _defineProperty(_param, 'backInitiatorEndFlow', '0'), _defineProperty(_param, 'oauthWindowURL', ''), _defineProperty(_param, 'signDataId', ''), _defineProperty(_param, 'isCaUser', '0'), _defineProperty(_param, 'caFirm', ''), _defineProperty(_param, 'caESignatureName', ''), _defineProperty(_param, 'caFormSign', ''), _defineProperty(_param, 'addlotsReturn', ''), _defineProperty(_param, 'inscriptionShow', ''), _param);
+            urgency: '' }, _defineProperty(_param, 'urgent', ''), _defineProperty(_param, 'backInitiatorEndFlow', '0'), _defineProperty(_param, 'oauthWindowURL', ''), _defineProperty(_param, 'signDataId', ''), _defineProperty(_param, 'isCaUser', '0'), _defineProperty(_param, 'caFirm', ''), _defineProperty(_param, 'caESignatureName', ''), _defineProperty(_param, 'caFormSign', ''), _defineProperty(_param, 'addlotsReturn', ''), _defineProperty(_param, 'inscriptionShow', ''), _defineProperty(_param, 'showOrgSwitcher', false), _defineProperty(_param, 'approveOrgOptions', []), _defineProperty(_param, 'approveOrgSelectValue', {}), _defineProperty(_param, 'approveCurOrgId', ''), _defineProperty(_param, 'startUserOrgId', ''), _defineProperty(_param, 'taskAssignOrgId', ''), _defineProperty(_param, 'approveOrgApiUnavailable', false), _param);
         FlowCommon = require('pages/flow_common/' + module).default ? require('pages/flow_common/' + module).default : require('pages/flow_common/' + module);
 
         //处理特有参数
@@ -1517,8 +1544,11 @@ var PageHome = function (_React$Component) {
                         caESignatureName: caESignatureName,
                         caFormSign: caFormSign,
                         addlotsReturn: addlotsReturn,
-                        inscriptionShow: inscriptionShow
+                        inscriptionShow: inscriptionShow,
+                        startUserOrgId: content.startUserOrgId || content.startUserGroupId || '',
+                        taskAssignOrgId: content.taskAssignOrgId || ''
                     }, function () {
+                        t.initApproveOrgSwitcher();
                         t.refs["selectMember_circulate"].initSelectData();
                         t.refs["selectMember_circulate1"].initSelectData();
 
@@ -7538,6 +7568,256 @@ var PageHome = function (_React$Component) {
                 sendShortMessage: newremindStyle
             });
         }
+    }, {
+        key: 'hideApproveOrgSwitcherSilently',
+        value: function hideApproveOrgSwitcherSilently() {
+            this.setState({
+                showOrgSwitcher: false,
+                approveOrgOptions: [],
+                approveOrgSelectValue: {},
+                approveCurOrgId: '',
+                approveOrgApiUnavailable: true
+            });
+        }
+    }, {
+        key: 'isApproveOrgSwitcherScene',
+        value: function isApproveOrgSwitcherScene() {
+            var permissionCode = this.state.permissionCode;
+            return permissionCode == 'pending' || permissionCode == 'start' || permissionCode == 'draft';
+        }
+    }, {
+        key: 'isApproveStartOrgUpdateScene',
+        value: function isApproveStartOrgUpdateScene() {
+            var permissionCode = this.state.permissionCode;
+            return permissionCode == 'start' || permissionCode == 'draft' || this.state.isStart == true;
+        }
+    }, {
+        key: 'resolveApproveOrgTargetId',
+        value: function resolveApproveOrgTargetId(orgList, curOrgId, preferredOrgId, fallbackOrgId) {
+            if (preferredOrgId) {
+                for (var i = 0; i < orgList.length; i++) {
+                    if (orgList[i].id == preferredOrgId) {
+                        return preferredOrgId;
+                    }
+                }
+            }
+            if (fallbackOrgId) {
+                for (var i = 0; i < orgList.length; i++) {
+                    if (orgList[i].id == fallbackOrgId) {
+                        return fallbackOrgId;
+                    }
+                }
+            }
+            return curOrgId;
+        }
+    }, {
+        key: 'buildApproveOrgOption',
+        value: function buildApproveOrgOption(org) {
+            var orgName = org.name || org.orgNamePath || org.orgName || '';
+            return {
+                text: orgName,
+                value: org.id
+            };
+        }
+    }, {
+        key: 'renderApproveOrgSwitcher',
+        value: function renderApproveOrgSwitcher(orgList, selectedOrgId) {
+            if (!orgList || orgList.length <= 1) {
+                this.setState({
+                    showOrgSwitcher: false,
+                    approveOrgOptions: [],
+                    approveOrgSelectValue: {},
+                    approveCurOrgId: ''
+                });
+                return;
+            }
+            var options = [];
+            var selectValue = {};
+            for (var i = 0; i < orgList.length; i++) {
+                var option = this.buildApproveOrgOption(orgList[i]);
+                options.push(option);
+                if (orgList[i].id == selectedOrgId) {
+                    selectValue = option;
+                }
+            }
+            if (!selectValue.value && options.length > 0) {
+                selectValue = options[0];
+                selectedOrgId = selectValue.value;
+            }
+            this.setState({
+                showOrgSwitcher: true,
+                approveOrgOptions: options,
+                approveOrgSelectValue: selectValue,
+                approveCurOrgId: selectedOrgId || ''
+            });
+        }
+    }, {
+        key: 'initApproveOrgSwitcher',
+        value: function initApproveOrgSwitcher() {
+            var t = this;
+            if (!t.isApproveOrgSwitcherScene() || t.state.approveOrgApiUnavailable) {
+                return;
+            }
+            if (!window.approveOrgSwitcherSeq) {
+                window.approveOrgSwitcherSeq = 0;
+            }
+            window.approveOrgSwitcherSeq++;
+            var currentSeq = window.approveOrgSwitcherSeq;
+            var autoSwitchKey = t.state.taskId || t.state.processInstanceId || '';
+            if (!window.approveOrgAutoSwitchedMap) {
+                window.approveOrgAutoSwitchedMap = {};
+            }
+            _db2.default.FlowModuleAPI.getUserSetInfo({}).then(function (userInfo) {
+                if (currentSeq != window.approveOrgSwitcherSeq || t.state.approveOrgApiUnavailable) {
+                    return;
+                }
+                if (!userInfo) {
+                    t.hideApproveOrgSwitcherSilently();
+                    return;
+                }
+                if (userInfo.content && !userInfo.orgList) {
+                    userInfo = userInfo.content;
+                }
+                var orgList = userInfo.orgList || [];
+                if (!orgList || orgList.length <= 1) {
+                    t.setState({ showOrgSwitcher: false });
+                    return;
+                }
+                var curOrgId = userInfo.curOrgId || '';
+                var targetOrgId = t.resolveApproveOrgTargetId(orgList, curOrgId, t.state.taskAssignOrgId, t.state.startUserOrgId);
+                if (targetOrgId && targetOrgId != curOrgId && !window.approveOrgAutoSwitchedMap[autoSwitchKey]) {
+                    t.switchApproveOrg(targetOrgId, function () {
+                        if (currentSeq != window.approveOrgSwitcherSeq) {
+                            return;
+                        }
+                        window.approveOrgAutoSwitchedMap[autoSwitchKey] = true;
+                        t.renderApproveOrgSwitcher(orgList, targetOrgId);
+                    }, function () {
+                        if (currentSeq != window.approveOrgSwitcherSeq) {
+                            return;
+                        }
+                        t.hideApproveOrgSwitcherSilently();
+                    }, { silent: true });
+                    return;
+                }
+                t.renderApproveOrgSwitcher(orgList, targetOrgId || curOrgId);
+            }).catch(function (err) {
+                if (currentSeq == window.approveOrgSwitcherSeq) {
+                    t.hideApproveOrgSwitcherSilently();
+                }
+            });
+        }
+    }, {
+        key: 'handleApproveOrgSelect',
+        value: function handleApproveOrgSelect(value) {
+            var t = this;
+            if (t.state.approveOrgApiUnavailable) {
+                return;
+            }
+            if (!value || !value.value) {
+                return;
+            }
+            var newOrgId = value.value;
+            if (newOrgId == t.state.approveCurOrgId) {
+                return;
+            }
+            var prevOrgId = t.state.approveCurOrgId;
+            var prevSelectValue = t.state.approveOrgSelectValue;
+            t.switchApproveOrg(newOrgId, function () {
+                t.setState({
+                    approveCurOrgId: newOrgId,
+                    approveOrgSelectValue: value,
+                    startUserOrgId: t.isApproveStartOrgUpdateScene() ? newOrgId : t.state.startUserOrgId
+                });
+            }, function () {
+                t.setState({
+                    approveCurOrgId: prevOrgId,
+                    approveOrgSelectValue: prevSelectValue
+                });
+            });
+        }
+    }, {
+        key: 'switchApproveOrg',
+        value: function switchApproveOrg(orgId, callback, failCallback, options) {
+            var t = this;
+            options = options || {};
+            var silent = options.silent === true;
+            var handleOrgApiError = function handleOrgApiError(err) {
+                if (silent || isApproveOrgApiUnavailableError(err)) {
+                    t.hideApproveOrgSwitcherSilently();
+                    if (typeof failCallback === 'function') {
+                        failCallback();
+                    }
+                    return;
+                }
+                var errMsg = '组织切换失败';
+                if (err && err.error && err.error.errorMsg) {
+                    errMsg = err.error.errorMsg;
+                } else if (err && err.message) {
+                    errMsg = err.message;
+                }
+                _Toast2.default.show({
+                    type: 'error',
+                    content: errMsg
+                });
+                if (typeof failCallback === 'function') {
+                    failCallback();
+                }
+            };
+            var afterOrgSwitchSuccess = function afterOrgSwitchSuccess() {
+                if (t.isApproveStartOrgUpdateScene()) {
+                    var processInstanceId = t.state.processInstanceId || '';
+                    if (!processInstanceId) {
+                        if (typeof callback === 'function') {
+                            callback();
+                        }
+                        return;
+                    }
+                    _db2.default.FlowModuleAPI.updateStartUserOrg({
+                        processInstanceId: processInstanceId,
+                        orgId: orgId,
+                        userId: getLoginUserInfo().userId
+                    }).then(function () {
+                        if (typeof callback === 'function') {
+                            callback();
+                        }
+                    }).catch(function (err) {
+                        if (silent || isApproveOrgApiUnavailableError(err)) {
+                            t.hideApproveOrgSwitcherSilently();
+                            if (typeof callback === 'function') {
+                                callback();
+                            }
+                            return;
+                        }
+                        var errMsg = '更新发起人组织失败';
+                        if (err && err.error && err.error.errorMsg) {
+                            errMsg = err.error.errorMsg;
+                        } else if (err && err.message) {
+                            errMsg = err.message;
+                        }
+                        _Toast2.default.show({
+                            type: 'error',
+                            content: errMsg
+                        });
+                        if (typeof failCallback === 'function') {
+                            failCallback();
+                        }
+                    });
+                    return;
+                }
+                if (typeof callback === 'function') {
+                    callback();
+                }
+            };
+            _db2.default.FlowModuleAPI.orgSwitch({
+                curOrgIdRadios: orgId,
+                curOrgId: orgId
+            }).then(function () {
+                afterOrgSwitchSuccess();
+            }).catch(function (err) {
+                handleOrgApiError(err);
+            });
+        }
     }, {
         key: 'changeUrgencyList',
         value: function changeUrgencyList(value) {
@@ -7842,6 +8122,23 @@ var PageHome = function (_React$Component) {
                                 )
                             )
                         ),
+                        _react2.default.createElement(
+                            'div',
+                            { className: this.state.showOrgSwitcher ? 'approve-org-switch-wrap' : 't-DN' },
+                            _react2.default.createElement(
+                                _Group2.default.List,
+                                null,
+                                _react2.default.createElement(_SelectField2.default, {
+                                    label: '\u5F53\u524D\u7EC4\u7EC7',
+                                    readOnly: false,
+                                    options: this.state.approveOrgOptions,
+                                    placeholder: '\u8BF7\u9009\u62E9',
+                                    onSelect: this.handleApproveOrgSelect.bind(this),
+                                    value: this.state.approveOrgSelectValue,
+                                    multiLine: true
+                                })
+                            )
+                        ),
                         _react2.default.createElement(
                             _Tab2.default,
                             { activeKey: this.state.activeItemIndex == null ? '0' : this.state.activeItemIndex, onChange: this.handleChange.bind(this) },

package/lib/process_info/processInfo.less

@@ -1,4 +1,7 @@
 .approval-details{
      padding-bottom: calc(62px + constant(safe-area-inset-bottom)) !important; /* 兼容旧版 iOS */
      padding-bottom: calc(62px + env(safe-area-inset-bottom)) !important; /* 兼容新版 iOS */
+}
+.approve-org-switch-wrap{
+    background: #fff;
 }

package/package.json

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