fmui-base 2.3.66 → 2.3.68

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.3.68：批示意见字段支持根据节点设置控制显示隐藏
+- 2.3.67：邮件转发按钮根据流程设置显示隐藏，办理缓急图标颜色支持自定义
 - 2.3.66：字段名带$报错转义
 - 2.3.65：发起按钮选择了邮件转发，则我的流程点开后显示邮件转发按钮
 - 2.3.64：关联值增加用户出生日期

package/lib/form/form.js

@@ -1294,6 +1294,10 @@ var PageHome = function (_React$Component) {
           this.props.newspyj.documentId = t.state.prefixName + "_" + itemParam.key;
           itemParam.show = true;
         }
+        // 流程数据权限隐藏批示意见字段时，不展示历史意见与输入框（含本节点意见字段被误配隐藏）
+        if (itemParam.isHidden) {
+          itemParam.show = false;
+        }
       } else if (itemType == 'upload' || itemType == 'image') {
         //附件图片
         var formDataAttr = form.dataAttr;
@@ -2176,7 +2180,9 @@ var PageHome = function (_React$Component) {
         var contentCss = this.buildFormCssDecls(cs, { important: true, withLineHeight: true });
         cssParts.push([scope + ' .t-text-field-input', scope + ' .t-text-field-content-main', scope + ' .t-text-field-content-main span', scope + ' .t-field-content-box > .t-FB1', scope + ' .t-field-content-box > .t-FB1 span', scope + ' .t-field-multi', scope + ' .t-field-multi span', scope + ' .t-select-field-value', scope + ' .t-select-field-value span', scope + ' .t-radio-field-value', scope + ' .t-radio-field-value span', scope + ' .t-radio-field-value .t-FB1', scope + ' .t-radio-field-value .t-omit', scope + ' .t-datetime-field-value', scope + ' .t-datetime-field-value span', scope + ' .t-textarea-field-content', scope + ' .t-textarea-field-content textarea', scope + ' .t-checkbox-field-content', scope + ' .t-checkbox-field-label', scope + ' .t-checkbox-field-value-list', scope + ' .t-checkbox-field-value-list span', scope + ' .dd-select-input-option-text', scope + ' .t-popuser-value', scope + ' .t-popuser-value span', scope + ' .t-popuser-placeholder', scope + ' .t-poppage-value', scope + ' .t-poppage-value span', scope + ' .t-poppage-placeholder',
         // 月日自定义、意见、html 等非 SaltUI 标准内容节点
-        scope + ' .t-FL', scope + ' .flex-comment .t-PT10', scope + ' .flex-comment .t-textarea-field-content', scope + ' .ueditor-content', scope + ' .t-FB1.t-FAL', scope + ' .t-FB1.t-omit', scope + ' .t-omit', scope + ' .t-LH1_4', scope + ' .t-FS16', scope + ' .t-field-box.t-FS16', scope + ' .t-field-box.t-FS16 .t-FB1', scope + ' .section-content .t-FB1'].join(',') + '{' + contentCss + '}');
+        scope + ' .t-FL', scope + ' .flex-comment .t-PT10', scope + ' .flex-comment .t-textarea-field-content',
+        // 批示意见落款与内容字体颜色一致
+        scope + ' .comment-html', scope + ' .comment-html span', scope + ' .ueditor-content', scope + ' .t-FB1.t-FAL', scope + ' .t-FB1.t-omit', scope + ' .t-omit', scope + ' .t-LH1_4', scope + ' .t-FS16', scope + ' .t-field-box.t-FS16', scope + ' .t-field-box.t-FS16 .t-FB1', scope + ' .section-content .t-FB1'].join(',') + '{' + contentCss + '}');
 
         var placeholderCss = this.buildFormCssDecls(cs, { important: true, skipColor: true, withLineHeight: true });
         cssParts.push([scope + ' .t-text-field-placeholder', scope + ' .t-select-field-placeholder', scope + ' .t-datetime-field-placeholder', scope + ' .t-checkbox-field-placeholder'].join(',') + '{' + placeholderCss + '}');
@@ -4984,7 +4990,7 @@ var PageHome = function (_React$Component) {
               t.state.itemParam.isVerifySing == "1" ? _react2.default.createElement('i', { className: 'iconfont icon-checked t-PT10', style: { color: 'green' } }) : t.state.itemParam.isVerifySing == "2" ? _react2.default.createElement('i', { className: 'iconfont icon-close t-PT10', style: { color: 'red' } }) : ""
             )
           )
-        ) : this.state.itemParam.itemType == 'comment' && (this.state.itemParam.show || this.state.isRemoveCommentFormHtml != '1') ? _react2.default.createElement(
+        ) : this.state.itemParam.itemType == 'comment' && !this.state.itemParam.isHidden && (this.state.itemParam.show || this.state.isRemoveCommentFormHtml != '1') ? _react2.default.createElement(
           'div',
           { className: t.state.itemParam.fieldId, style: t.state.itemParam.formStyleObj.contentStyle },
           _react2.default.createElement(
@@ -5005,7 +5011,7 @@ var PageHome = function (_React$Component) {
               _react2.default.createElement(
                 'div',
                 { className: 't-PT10 t-FB1' },
-                _react2.default.createElement(_List2.default, { list: t.state.itemParam.value, isCaUser: t.state.isCaUser, caFirm: t.state.caFirm, caESignatureName: t.state.caESignatureName, caFormSign: t.state.caFormSign, finalButtons: t.props.finalButtons }),
+                _react2.default.createElement(_List2.default, { list: t.state.itemParam.value, contentStyle: t.state.itemParam.formStyleObj && t.state.itemParam.formStyleObj.contentStyle, isCaUser: t.state.isCaUser, caFirm: t.state.caFirm, caESignatureName: t.state.caESignatureName, caFormSign: t.state.caFormSign, finalButtons: t.props.finalButtons }),
                 _react2.default.createElement(
                   'div',
                   { className: t.state.commentField == this.state.itemParam.uniqueName ? 't-PL10 t-PR10' : 't-DN' },

package/lib/msg_list/msgList.js

@@ -190,23 +190,27 @@ var ListItem = function (_React$Component) {
       var checkIsNotComplete = true;
       var urgencyTag = false;
       var tagClass = '';
+      var urgencyStyle = null;
       if (data.type == 0) {
         //待办
         checkIsNotComplete = true;
-        if (data.urgency == '90') {
-          urgencyTag = true;
-          tagClass = 'label label-danger';
-        } else if (data.urgency == '80') {
-          urgencyTag = true;
-          tagClass = 'label label-danger';
-        } else if (data.urgency == '70') {
-          urgencyTag = true;
-          tagClass = 'label label-warn';
-        } else if (data.urgency == '60') {
-          urgencyTag = true;
-          tagClass = 'label label-primary';
-        } else {
-          urgencyTag = false;
+        // 枚举禁用时后端不回填 urgencyName，此时不渲染角标（避免空 label 色块）
+        // 优先 fieldColor；无配置时回退历史 60/70/80/90 样式
+        if (data.urgencyName) {
+          if (data.fieldColor) {
+            urgencyTag = true;
+            tagClass = 'label';
+            urgencyStyle = { backgroundColor: data.fieldColor, borderColor: data.fieldColor, color: '#fff' };
+          } else if (data.urgency == '90' || data.urgency == '80') {
+            urgencyTag = true;
+            tagClass = 'label label-danger';
+          } else if (data.urgency == '70') {
+            urgencyTag = true;
+            tagClass = 'label label-warn';
+          } else if (data.urgency == '60') {
+            urgencyTag = true;
+            tagClass = 'label label-primary';
+          }
         }
       } else if (data.type == 1) {
         //待阅
@@ -398,7 +402,7 @@ var ListItem = function (_React$Component) {
               { className: 'approveItem-title' },
               _react2.default.createElement(
                 Box,
-                { className: urgencyTag ? tagClass : 't-DN' },
+                { className: urgencyTag ? tagClass : 't-DN', style: urgencyStyle || undefined },
                 this.props.urgencyName
               ),
               _react2.default.createElement(

package/lib/process_info/processInfo.js

@@ -563,7 +563,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', ''), _defineProperty(_param, 'showOrgSwitcher', false), _defineProperty(_param, 'approveOrgOptions', []), _defineProperty(_param, 'approveOrgSelectValue', {}), _defineProperty(_param, 'approveOrgLocked', false), _defineProperty(_param, 'approveFormParttimeOrgEnabled', true), _defineProperty(_param, 'approveCurOrgId', ''), _defineProperty(_param, 'startUserOrgId', ''), _defineProperty(_param, 'taskAssignOrgId', ''), _defineProperty(_param, 'approveOrgApiUnavailable', false), _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, 'approveOrgLocked', false), _defineProperty(_param, 'approveFormParttimeOrgEnabled', true), _defineProperty(_param, 'approveProcessMailForwardEnabled', false), _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);
 
         //处理特有参数
@@ -779,6 +779,44 @@ var PageHome = function (_React$Component) {
                     t.imageView(e.target.src);
                 }
             });
+            // 流程设置「流程办理邮件转发」：默认禁用，仅明确为 1 时启用
+            _db2.default.FlowModuleAPI.getSysSettingByMark({ mark: 'approveProcessMailForward' }).then(function (content) {
+                var val = content;
+                if (content && (typeof content === 'undefined' ? 'undefined' : _typeof(content)) === 'object' && content.content != null) {
+                    val = content.content;
+                }
+                var enabled = val == '1';
+                t.setState({ approveProcessMailForwardEnabled: enabled }, function () {
+                    if (enabled) {
+                        // 配置启用时，若按钮已拼完则补上邮件转发
+                        var mailBtnState = t.applyMailForwardToButtonState(t.state.buttonList || [], t.state.actionSheetButtonOpt || [], t.state.actionSheetButtonOptName || [], !!t.state.buttonIsMore);
+                        t.setState({
+                            buttonList: mailBtnState.buttonList,
+                            actionSheetButtonOpt: mailBtnState.actionSheetButtonOpt,
+                            actionSheetButtonOptName: mailBtnState.actionSheetButtonOptName,
+                            buttonIsMore: mailBtnState.buttonIsMore
+                        });
+                    } else {
+                        var bl = (t.state.buttonList || []).filter(function (b) {
+                            return !(b && (b.no == 18 || b.no === '18'));
+                        });
+                        var opt = [];
+                        var optName = [];
+                        var oldOpt = t.state.actionSheetButtonOpt || [];
+                        var oldName = t.state.actionSheetButtonOptName || [];
+                        for (var i = 0; i < oldOpt.length; i++) {
+                            if (oldOpt[i] == 'MAILSEND' || oldOpt[i] == 18) {
+                                continue;
+                            }
+                            opt.push(oldOpt[i]);
+                            optName.push(oldName[i]);
+                        }
+                        t.setState({ buttonList: bl, actionSheetButtonOpt: opt, actionSheetButtonOptName: optName });
+                    }
+                });
+            }).catch(function () {
+                t.setState({ approveProcessMailForwardEnabled: false });
+            });
 
             var taskId = this.state.taskId;
             var processInstanceId = this.state.processInstanceId;
@@ -1893,7 +1931,7 @@ var PageHome = function (_React$Component) {
                     }
                     //PAGE_SAVE保存按钮只有当新建时才有，HELP_ADDLOTS加签只有在会签和串签才有,RADOM_FINISH随机流程完成按钮去掉
                     // OTHER_RELATION 移动端已支持，不再跳过
-                    if (buttonCode == 'FLOW_REVOKE' || buttonCode == 'RADOM_FINISH' || buttonCode == 'FLOW_CANCEL' || buttonCode == 'FLOW_RECOVER' || buttonCode == 'PAGE_PRINT' || buttonCode == 'PAGE_URGE' || buttonCode == 'PAGE_REDSET' || buttonCode == 'PAGE_FEEDBACK' || buttonCode == 'RECORD' || buttonCode == 'HELP_ADDLOTS' && participantMode == '0') {
+                    if (buttonCode == 'FLOW_REVOKE' || buttonCode == 'RADOM_FINISH' || buttonCode == 'FLOW_CANCEL' || buttonCode == 'FLOW_RECOVER' || buttonCode == 'PAGE_PRINT' || buttonCode == 'PAGE_URGE' || buttonCode == 'PAGE_REDSET' || buttonCode == 'PAGE_FEEDBACK' || buttonCode == 'RECORD' || buttonCode == 'MAILSEND' || buttonCode == 'HELP_ADDLOTS' && participantMode == '0') {
                         continue;
                     } else {
                         if (isStart == true && permissionCode == 'start' || isDraft == '1') {
@@ -1938,9 +1976,11 @@ var PageHome = function (_React$Component) {
                 for (var d = 0; d < extensionButtonList.length; d++) {
                     buttonList.push(extensionButtonList[d]);
                 }
+                buttonList = t.appendMailForwardButton(buttonList);
             } else if (listType == "3") {
                 buttonList.push({ name: t.state.finalButtons.get("HELP_CIRCULATE"), type: 'secondary', display: 'inline', no: 4 });
                 buttonList.push({ name: t.state.finalButtons.get("HELP_FORWARD"), type: 'secondary', display: 'inline', no: 20 });
+                buttonList = t.appendMailForwardButton(buttonList);
             } else if (listType == "4") {
                 //我的
                 var processStatusNow = String(content.processStatus != null ? content.processStatus : content.status != null ? content.status : '');
@@ -1993,14 +2033,12 @@ var PageHome = function (_React$Component) {
                         //传阅
                         buttonList.push({ name: t.state.finalButtons.get("HELP_CIRCULATE"), type: 'secondary', display: 'inline', no: 4 });
                     }
-                    // 与 PC 一致：发起人节点配置了 MAILSEND 时显示邮件转发
-                    if (startButtons.indexOf('MAILSEND') >= 0) {
-                        buttonList.push({ name: t.state.finalButtons.get("MAILSEND") || '邮件转发', type: 'secondary', display: 'inline', no: 18 });
-                    }
                 }
                 for (var d = 0; d < extensionButtonList.length; d++) {
                     buttonList.push(extensionButtonList[d]);
                 }
+                // 邮件转发改由流程设置总开关控制，忽略发起人节点 MAILSEND
+                buttonList = t.appendMailForwardButton(buttonList);
             } else if (listType == "5") {
                 for (var d = 0; d < extensionButtonList.length; d++) {
                     buttonArray.push(extensionButtonList[d].name);
@@ -2731,8 +2769,9 @@ var PageHome = function (_React$Component) {
                         processInstanceId: _this2.state.processInstanceId,
                         permissionCode: _this2.state.permissionCode
                         // 仅当提交 formData 有真实主键时带 optlock（勿用 state.dataId 兜底，新建易误传）
+                        // 自动通过继续办理不带：首轮已落库，本地 optlock 已过期
                     };if (t.state.module === 'approve') {
-                        if ((0, _filterEmptySubTblRows.isValidFormDataId)(sendData && sendData.dataId) && t.state.formDataOptlock !== '' && t.state.formDataOptlock != null) {
+                        if (!t.state.autoSendFlag && (0, _filterEmptySubTblRows.isValidFormDataId)(sendData && sendData.dataId) && t.state.formDataOptlock !== '' && t.state.formDataOptlock != null) {
                             param.optlock = t.state.formDataOptlock;
                         } else if (param.optlock !== undefined) {
                             delete param.optlock;
@@ -5778,6 +5817,7 @@ var PageHome = function (_React$Component) {
          * - 以 formData.dataId 为准（再 slim 一次）
          * - 无有效主键时删除顶栏 optlock，并去掉 formData 内 optlock
          * - 勿用 state.dataId 兜底（新建场景易误传 0）
+         * - 自动通过继续办理：首轮已落库，optlock 已过期且响应未回新版本，不传以避免乐观锁冲突
          */
 
     }, {
@@ -5796,6 +5836,17 @@ var PageHome = function (_React$Component) {
             } catch (e1) {
                 fd = null;
             }
+            // 自动通过二次办理：不传 optlock（首轮提交后版本已变，本地未刷新）
+            if (t.state.autoSendFlag) {
+                delete param.optlock;
+                if (fd && fd.hasOwnProperty('optlock')) {
+                    delete fd.optlock;
+                    try {
+                        param.formData = JSON.stringify(fd);
+                    } catch (e0) {}
+                }
+                return;
+            }
             var payloadDataId = '';
             if (fd && (0, _filterEmptySubTblRows.isValidFormDataId)(fd.dataId)) {
                 payloadDataId = fd.dataId;
@@ -5993,6 +6044,8 @@ var PageHome = function (_React$Component) {
                         operate: 1,
                         autoSendText: autoSendText,
                         dataId: newdataId,
+                        // 首轮 sendFlow 已更新主表版本，响应未带回新 optlock，清空以免二次办理乐观锁失败
+                        formDataOptlock: '',
                         autoPassCommentSynced: !!synced,
                         autoPassCommentContent: syncedContent,
                         autoPassCommentId: syncedId
@@ -7629,16 +7682,18 @@ var PageHome = function (_React$Component) {
             var _this4 = this;
 
             //  buttonCodes=buttonCodes.replace('OTHER_RELATION','');
-            //  buttonCodes=buttonCodes.replace('MAILSEND','');
+            // 邮件转发改由流程设置总开关控制，忽略节点 MAILSEND
+            if (buttonCodes != null && buttonCodes != '') {
+                buttonCodes = (',' + buttonCodes + ',').replace(/,MAILSEND,/g, ',').replace(/^,|,$/g, '');
+            }
             if (buttonCodes == null || buttonCodes == '') {
-                //  var sysWatermark=this.state.sysWatermark;
-                //     if(null!=sysWatermark && sysWatermark!=''){
-                //         $('#sysWatermarkName').val(sysWatermark);
-                //         showWaterMarker('approveWaterMarker',sysWatermark);
-                //     }else{
-                //         $('#sysWatermarkName').val('');
-                //     }
-
+                var emptyBtnState = this.applyMailForwardToButtonState(extensionButtonList ? extensionButtonList.slice() : [], [], [], false);
+                this.setState({
+                    buttonList: emptyBtnState.buttonList,
+                    actionSheetButtonOpt: emptyBtnState.actionSheetButtonOpt,
+                    actionSheetButtonOptName: emptyBtnState.actionSheetButtonOptName,
+                    buttonIsMore: emptyBtnState.buttonIsMore
+                });
             } else {
                 _db2.default.FlowModuleAPI.getListButtonsByCodes({
                     buttonCodes: buttonCodes
@@ -7735,7 +7790,7 @@ var PageHome = function (_React$Component) {
                                 } else if (buttonCode == 'HELP_DISTRIBUTE') {
                                     buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: 'distributeFlow' });
                                 } else if (buttonCode == 'MAILSEND') {
-                                    buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: 18 });
+                                    // 忽略节点 MAILSEND，改由总开关追加
                                 } else if (buttonCode == 'OTHER_RELATION') {
                                     buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: 'OTHER_RELATION' });
                                 } else {
@@ -7806,7 +7861,7 @@ var PageHome = function (_React$Component) {
                             } else if (buttonCode == 'HELP_FORWARD') {
                                 buttonList.push({ name: buttonName, type: 'secondary', display: 'inline', no: 20 });
                             } else if (buttonCode == 'MAILSEND') {
-                                buttonList.push({ name: buttonName, type: 'secondary', display: 'inline', no: 18 });
+                                // 忽略节点 MAILSEND，改由总开关追加
                             } else if (buttonCode == 'OTHER_RELATION') {
                                 buttonList.push({ name: buttonName, type: 'secondary', display: 'inline', no: 'OTHER_RELATION' });
                             } else {
@@ -7814,6 +7869,11 @@ var PageHome = function (_React$Component) {
                             }
                         }
                     }
+                    var mailBtnState = _this4.applyMailForwardToButtonState(buttonList, actionSheetButtonOpt, actionSheetButtonOptName, buttonIsMore);
+                    buttonList = mailBtnState.buttonList;
+                    actionSheetButtonOpt = mailBtnState.actionSheetButtonOpt;
+                    actionSheetButtonOptName = mailBtnState.actionSheetButtonOptName;
+                    buttonIsMore = mailBtnState.buttonIsMore;
 
                     _this4.setState({
                         buttonCodeList: content,
@@ -8771,6 +8831,84 @@ var PageHome = function (_React$Component) {
         value: function isApproveFormParttimeOrgEnabled() {
             return this.state.approveFormParttimeOrgEnabled !== false;
         }
+
+        /** 流程设置「流程办理邮件转发」是否启用，默认禁用（仅明确为 1 时启用） */
+
+    }, {
+        key: 'isApproveProcessMailForwardEnabled',
+        value: function isApproveProcessMailForwardEnabled() {
+            return this.state.approveProcessMailForwardEnabled === true;
+        }
+
+        /** 待办/待阅/已办/已阅/我的等办理入口（含推送待办，以 listType 为准） */
+
+    }, {
+        key: 'isMailForwardListType',
+        value: function isMailForwardListType() {
+            var lt = String(this.state.listType);
+            return lt === '0' || lt === '1' || lt === '2' || lt === '3' || lt === '4';
+        }
+
+        /** 按总开关追加邮件转发按钮，忽略节点 MAILSEND；避免重复 */
+
+    }, {
+        key: 'appendMailForwardButton',
+        value: function appendMailForwardButton(buttonList) {
+            if (!buttonList) {
+                buttonList = [];
+            }
+            if (!this.isApproveProcessMailForwardEnabled() || !this.isMailForwardListType()) {
+                return buttonList;
+            }
+            for (var i = 0; i < buttonList.length; i++) {
+                if (buttonList[i] && (buttonList[i].no == 18 || buttonList[i].no === '18')) {
+                    return buttonList;
+                }
+            }
+            buttonList.push({
+                name: this.state.finalButtons && this.state.finalButtons.get("MAILSEND") || '邮件转发',
+                type: 'secondary',
+                display: 'inline',
+                no: 18
+            });
+            return buttonList;
+        }
+
+        /** 待办「更多」面板时把邮件转发放入动作面板，否则追加到按钮条 */
+
+    }, {
+        key: 'applyMailForwardToButtonState',
+        value: function applyMailForwardToButtonState(buttonList, actionSheetButtonOpt, actionSheetButtonOptName, buttonIsMore) {
+            if (!this.isApproveProcessMailForwardEnabled() || !this.isMailForwardListType()) {
+                return {
+                    buttonList: buttonList || [],
+                    actionSheetButtonOpt: actionSheetButtonOpt || [],
+                    actionSheetButtonOptName: actionSheetButtonOptName || [],
+                    buttonIsMore: !!buttonIsMore
+                };
+            }
+            buttonList = buttonList || [];
+            actionSheetButtonOpt = actionSheetButtonOpt || [];
+            actionSheetButtonOptName = actionSheetButtonOptName || [];
+            var mailName = this.state.finalButtons && this.state.finalButtons.get("MAILSEND") || '邮件转发';
+            for (var i = 0; i < buttonList.length; i++) {
+                if (buttonList[i] && (buttonList[i].no == 18 || buttonList[i].no === '18')) {
+                    return { buttonList: buttonList, actionSheetButtonOpt: actionSheetButtonOpt, actionSheetButtonOptName: actionSheetButtonOptName, buttonIsMore: !!buttonIsMore };
+                }
+            }
+            for (var j = 0; j < actionSheetButtonOpt.length; j++) {
+                if (actionSheetButtonOpt[j] == 'MAILSEND' || actionSheetButtonOpt[j] == 18) {
+                    return { buttonList: buttonList, actionSheetButtonOpt: actionSheetButtonOpt, actionSheetButtonOptName: actionSheetButtonOptName, buttonIsMore: !!buttonIsMore };
+                }
+            }
+            if (buttonIsMore) {
+                actionSheetButtonOpt.push('MAILSEND');
+                actionSheetButtonOptName.push(mailName);
+            } else {
+                buttonList = this.appendMailForwardButton(buttonList);
+            }
+            return { buttonList: buttonList, actionSheetButtonOpt: actionSheetButtonOpt, actionSheetButtonOptName: actionSheetButtonOptName, buttonIsMore: !!buttonIsMore };
+        }
     }, {
         key: 'renderApproveOrgSwitcher',
         value: function renderApproveOrgSwitcher(orgList, selectedOrgId, locked) {
@@ -10001,24 +10139,27 @@ var PageHome = function (_React$Component) {
                         onChange: this.changeTransferShortMessage.bind(this),
                         required: false })
                 ),
-                _react2.default.createElement(
+                this.state.listType == 1 && this.state.readtype == "1" && this.state.loadSuccess ? _react2.default.createElement(
                     'div',
-                    { className: this.state.listType == 1 && this.state.readtype == "1" && this.state.loadSuccess ? 't-P0 t-bottom-fixed' : 't-DN' },
+                    { className: 't-P0 t-bottom-fixed' },
                     _react2.default.createElement(
                         _Button2.default.Group,
                         null,
-                        _react2.default.createElement(
+                        [_react2.default.createElement(
                             _Button2.default,
-                            { type: 'secondary', display: 'inline', onClick: t.handleSubmit.bind(t, 4) },
+                            { key: 'circulate', type: 'secondary', display: 'inline', onClick: t.handleSubmit.bind(t, 4) },
                             this.state.finalButtons.get("HELP_CIRCULATE")
-                        ),
-                        _react2.default.createElement(
+                        ), this.isApproveProcessMailForwardEnabled() ? _react2.default.createElement(
+                            _Button2.default,
+                            { key: 'mail', type: 'secondary', display: 'inline', onClick: t.handleSubmit.bind(t, 18) },
+                            this.state.finalButtons.get("MAILSEND") || '邮件转发'
+                        ) : null, _react2.default.createElement(
                             _Button2.default,
-                            { type: 'primary', display: 'inline', onClick: t.clickRead.bind(t) },
+                            { key: 'read', type: 'primary', display: 'inline', onClick: t.clickRead.bind(t) },
                             '\u5DF2\u9605'
-                        )
+                        )].filter(Boolean)
                     )
-                ),
+                ) : null,
                 _react2.default.createElement(
                     'div',
                     { className: this.state.pageStatus == '1' ? "page-add" : 't-DN' },

package/lib/process_list/processList.js

@@ -385,6 +385,7 @@ var ListItem = function (_React$Component) {
       var checkIsNotComplete = true;
       var urgencyTag = false;
       var tagClass = '';
+      var urgencyStyle = null;
       if (data.listTabType == 0 || data.listTabType == 2) {
         //待办 / 已办：缓急角标
         if (data.listTabType == 0) {
@@ -394,20 +395,23 @@ var ListItem = function (_React$Component) {
         } else {
           checkIsNotComplete = true;
         }
-        if (data.urgency == '90') {
-          urgencyTag = true;
-          tagClass = 'label label-danger';
-        } else if (data.urgency == '80') {
-          urgencyTag = true;
-          tagClass = 'label label-danger';
-        } else if (data.urgency == '70') {
-          urgencyTag = true;
-          tagClass = 'label label-warn';
-        } else if (data.urgency == '60') {
-          urgencyTag = true;
-          tagClass = 'label label-primary';
-        } else {
-          urgencyTag = false;
+        // 枚举禁用时后端不回填 urgencyName，此时不渲染角标（避免空 label 色块）
+        // 优先 fieldColor；无配置时回退历史 60/70/80/90 样式
+        if (data.urgencyName) {
+          if (data.fieldColor) {
+            urgencyTag = true;
+            tagClass = 'label';
+            urgencyStyle = { backgroundColor: data.fieldColor, borderColor: data.fieldColor, color: '#fff' };
+          } else if (data.urgency == '90' || data.urgency == '80') {
+            urgencyTag = true;
+            tagClass = 'label label-danger';
+          } else if (data.urgency == '70') {
+            urgencyTag = true;
+            tagClass = 'label label-warn';
+          } else if (data.urgency == '60') {
+            urgencyTag = true;
+            tagClass = 'label label-primary';
+          }
         }
       } else if (data.listTabType == 1) {
         //待阅
@@ -598,7 +602,7 @@ var ListItem = function (_React$Component) {
               { className: 'approveItem-title' },
               _react2.default.createElement(
                 Box,
-                { className: urgencyTag ? tagClass : 't-DN' },
+                { className: urgencyTag ? tagClass : 't-DN', style: urgencyStyle || undefined },
                 this.props.urgencyName
               ),
               _react2.default.createElement(

package/package.json

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