fmui-base 2.3.21 → 2.3.23

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.3.23：传阅增加传阅原因，被传阅人打开流程提示传阅原因，移动端流程办理中流程分类筛选支持只显示存在的数据的分类，流程管理支持设置流程办理缓急
+- 2.3.22：排他网关支持直接连其他网关
 - 2.3.21：移动端切换组织时支持重新加载当前组织选人字段
 - 2.3.20：移动端流程表单选人字段默认值支持选择当前用户，当前用户组织，与宏值逻辑一致
 - 2.3.19：移动端流程表单支持在线编辑

package/lib/comment_list/List.js

@@ -280,14 +280,38 @@ var PageHome = function (_React$Component) {
     value: function view(file) {
       var id = file.id;
       if (this.state.viewType == 'view') {
-        // var isLoadWatermark = this.props.isLoadWatermark;
-        // var allowDownLoad = this.props.allowDownLoad;
         var fileExt = file.fileExt;
         downloadFile(id, 'android', fileExt);
       } else {
         downloadFile(id);
       }
     }
+
+    //下载批示意见附件
+
+  }, {
+    key: 'downloadAttach',
+    value: function downloadAttach(file, e) {
+      if (e && e.stopPropagation) {
+        e.stopPropagation();
+      }
+      if (e && e.preventDefault) {
+        e.preventDefault();
+      }
+      // 公众号不支持下载
+      if (getLoginUserInfo().thirdMenuType == 'WeChat') {
+        return;
+      }
+      var id = file.id;
+      var fileExt = file.fileExt;
+      if (typeof downloadFile === 'function') {
+        try {
+          downloadFile(id, 'download', fileExt);
+        } catch (err) {
+          downloadFile(id);
+        }
+      }
+    }
   }, {
     key: 'getCommentSign',
     value: function getCommentSign(item) {
@@ -382,7 +406,7 @@ var PageHome = function (_React$Component) {
             ),
             _react2.default.createElement(
               'div',
-              { className: '' },
+              { className: 'comment-attach-list' },
               item.fileList && item.fileList.length > 0 ? item.fileList.map(function (item2, i) {
                 function calculate(no) {
                   var a = no / 1024;
@@ -395,9 +419,10 @@ var PageHome = function (_React$Component) {
                   }
                   return Math.round(b * 100) / 100 + 'MB';
                 }
+                var showDownload = getLoginUserInfo().thirdMenuType != 'WeChat';
                 return _react2.default.createElement(
                   'div',
-                  { className: 't-FBH', key: i },
+                  { className: 't-FBH comment-attach-item', key: i },
                   _react2.default.createElement(
                     'div',
                     { className: 'dd-t-border t-P6 t-MB10 t-FB1', onClick: t.view.bind(t, item2) },
@@ -407,7 +432,7 @@ var PageHome = function (_React$Component) {
                       { className: 'dd-t-list-text-content' },
                       _react2.default.createElement(
                         'div',
-                        { className: 't-list-title t-omit t-LH1_4' },
+                        { className: 't-list-title comment-attach-name t-LH1_4' },
                         typeof item2.fileDisplayName == 'undefined' ? item2.name : item2.fileDisplayName
                       ),
                       _react2.default.createElement(
@@ -416,7 +441,9 @@ var PageHome = function (_React$Component) {
                         calculate(typeof item2.fileSize == 'undefined' ? item2.size : item2.fileSize)
                       )
                     )
-                  )
+                  ),
+                  _react2.default.createElement('i', { className: showDownload ? 'iconfont icon-download1 comment-attach-download' : 't-DN',
+                    onClick: t.downloadAttach.bind(t, item2) })
                 );
               }) : ""
             ),

package/lib/comment_list/List.less

@@ -4,3 +4,46 @@
 .t-FBH.flex-comment.t-field-box{
   padding-right:0px;
 }
+
+/* 批示意见附件：名称完整换行显示 */
+.comment-attach-list {
+  .comment-attach-item {
+    align-items: flex-start;
+  }
+
+  .comment-attach-name,
+  .t-list-title.comment-attach-name {
+    display: block !important;
+    white-space: normal !important;
+    word-break: break-all !important;
+    overflow-wrap: break-word !important;
+    word-wrap: break-word !important;
+    overflow: visible !important;
+    text-overflow: clip !important;
+    -webkit-line-clamp: unset !important;
+    line-clamp: unset !important;
+    -webkit-box-orient: horizontal !important;
+    max-width: 100%;
+    line-height: 1.4;
+  }
+
+  .dd-t-list-text-content {
+    min-width: 0;
+    overflow: visible;
+  }
+
+  /* 与表单附件下载按钮保持一致：普通图标，无蓝色圆底 */
+  .comment-attach-download {
+    flex-shrink: 0;
+    margin-right: 5px;
+    margin-top: 8px;
+    font-size: 16px;
+    background: transparent;
+    color: inherit;
+    width: auto;
+    height: auto;
+    line-height: inherit;
+    border-radius: 0;
+    text-align: center;
+  }
+}

package/lib/process_batch/processBatch.js

@@ -667,6 +667,7 @@ var PageHome = function (_React$Component) {
                             checkedItem.must = item.must;
                             checkedItem.maxOutgoing = maxOutgoing;
                             checkedItem.participants = participants;
+                            checkedItem.parallelGatewayId = item.parallelGatewayId;
                             if (item.must == true && (maxOutgoing == 1 && checkActi == 0 || maxOutgoing == 0)) {
                                 //必须
                                 checkedItem.disable = false;
@@ -702,6 +703,14 @@ var PageHome = function (_React$Component) {
                             //如果没有默认选中的下一个节点且是单选，则第一个默认选中
                             if (nextActivityList.length > 0 && nextRadomList.length == 0) {
                                 nextActivityList[0].checked = true;
+                                var pgFirst = nextActivityList[0].parallelGatewayId;
+                                if (pgFirst) {
+                                    for (var pgi = 0; pgi < nextActivityList.length; pgi++) {
+                                        if (nextActivityList[pgi].parallelGatewayId == pgFirst) {
+                                            nextActivityList[pgi].checked = true;
+                                        }
+                                    }
+                                }
                                 //nextSelectType = 'next';
                             } else if (nextRadomList.length > 0 && nextActivityList.length == 0) {
                                 nextRadomList[0].subRandomList[0].checked = true;
@@ -1369,11 +1378,16 @@ var PageHome = function (_React$Component) {
                     //单选
                     if (!checked) {
                         //选中的时候
+                        var pgId = item.parallelGatewayId;
                         for (var j = 0; j < nextActivityList.length; j++) {
                             if (nextActivityList[j].disable == true) {
                                 return false;
                             }
                             if (nextActivityList[j].isRadio) {
+                                // 排他下并行同组不能互相取消
+                                if (pgId && nextActivityList[j].parallelGatewayId == pgId) {
+                                    continue;
+                                }
                                 if (type == 'radom') {
                                     if (maxOutgoing == 1 || value == nextActivityList[j].value) {
                                         nextActivityList[j].checked = false;
@@ -1384,6 +1398,13 @@ var PageHome = function (_React$Component) {
                             }
                         }
                         nextActivityList[i].checked = !checked;
+                        if (pgId) {
+                            for (var j = 0; j < nextActivityList.length; j++) {
+                                if (nextActivityList[j].parallelGatewayId == pgId) {
+                                    nextActivityList[j].checked = true;
+                                }
+                            }
+                        }
                         if (checked == false && item.end == false) {
                             //当选中时
                             this.refs[item.value + "_" + i].clickAdd();
@@ -1394,6 +1415,14 @@ var PageHome = function (_React$Component) {
                             return false;
                         } else {
                             nextActivityList[i].checked = !checked;
+                            var pgIdUn = item.parallelGatewayId;
+                            if (pgIdUn) {
+                                for (var j = 0; j < nextActivityList.length; j++) {
+                                    if (nextActivityList[j].parallelGatewayId == pgIdUn) {
+                                        nextActivityList[j].checked = false;
+                                    }
+                                }
+                            }
                         }
                     }
                 } else {
@@ -1403,6 +1432,14 @@ var PageHome = function (_React$Component) {
                         //     return false;
                         // }else{
                         nextActivityList[i].checked = !checked;
+                        var pgIdCk = item.parallelGatewayId;
+                        if (pgIdCk) {
+                            for (var j = 0; j < nextActivityList.length; j++) {
+                                if (nextActivityList[j].parallelGatewayId == pgIdCk) {
+                                    nextActivityList[j].checked = true;
+                                }
+                            }
+                        }
                         if (checked == false && item.end == false) {
                             //当选中时
                             this.refs[item.value + "_" + i].clickAdd();
@@ -1426,6 +1463,14 @@ var PageHome = function (_React$Component) {
                                 return false;
                             }
                             nextActivityList[i].checked = !checked;
+                            var pgIdCkUn = item.parallelGatewayId;
+                            if (pgIdCkUn) {
+                                for (var j = 0; j < nextActivityList.length; j++) {
+                                    if (nextActivityList[j].parallelGatewayId == pgIdCkUn) {
+                                        nextActivityList[j].checked = false;
+                                    }
+                                }
+                            }
                         }
                     }
                 }
@@ -1761,7 +1806,12 @@ var PageHome = function (_React$Component) {
                                     _react2.default.createElement(
                                         Box,
                                         { className: 't-LH24 t-FS16 t-PL18 t-omit', flex: 1 },
-                                        item.name
+                                        item.name,
+                                        item.parallelGatewayId ? _react2.default.createElement(
+                                            'span',
+                                            { className: 't-FCc t-FS12' },
+                                            '\uFF08\u5E76\u884C\uFF09'
+                                        ) : null
                                     )
                                 ),
                                 _react2.default.createElement(

package/lib/process_info/processInfo.js

@@ -445,6 +445,7 @@ var PageHome = function (_React$Component) {
             circulateNodePersonValue: [], //传阅节点选择的用户
             forwardNodePersonValue: [], //转发节点选择的用户
             circulatePersonValue: [], //通过传阅的用户
+            circulateReason: '', //传阅原因
             chaoSongPersonValue: [], //邮件转发抄送的用户
             sendMailPersonValue: [], //邮件转发选择的用户
             buttonList: [], //待办按钮列表
@@ -902,8 +903,30 @@ var PageHome = function (_React$Component) {
                     if (content.subProcessType && typeof content.subProcessType != "undefined") {
                         subProcessType = content.subProcessType;
                     }
-                    if (content.urgency && typeof content.urgency != "undefined") {
-                        urgency = content.urgency;
+                    // 办理缓急默认（与 PC 对齐）：
+                    // 发起/草稿/发起人：流程配置 processUrgency 优先
+                    // 待办等：实例 urgency（非默认50）> processUrgency > 实例 urgency > 50
+                    var processUrgencyVal = '';
+                    if (content.processUrgency && typeof content.processUrgency != "undefined" && content.processUrgency != '') {
+                        processUrgencyVal = String(content.processUrgency);
+                    }
+                    var instanceUrgency = '';
+                    if (content.urgency != null && typeof content.urgency != "undefined" && content.urgency !== '') {
+                        instanceUrgency = String(content.urgency);
+                    }
+                    var listTypeForUrgency = t.state && t.state.listType != null ? String(t.state.listType) : '';
+                    var startLike = listTypeForUrgency === '5' || content.isStart == 'true' || content.isStart === true || content.isStart === 'true' || content.permissionCode == 'start' || content.owntype == 'initiator' || content.ownType == 'initiator';
+                    // 与 PC 对齐：发起/发起人节点流程配置优先；其他待办非默认50用实例值，否则回落流程配置
+                    if (startLike && processUrgencyVal) {
+                        urgency = processUrgencyVal;
+                    } else if (instanceUrgency && instanceUrgency !== '50') {
+                        urgency = instanceUrgency;
+                    } else if (processUrgencyVal) {
+                        urgency = processUrgencyVal;
+                    } else if (instanceUrgency) {
+                        urgency = instanceUrgency;
+                    } else {
+                        urgency = '50';
                     }
                     if (content.backInitiatorEndFlow && typeof content.backInitiatorEndFlow != "undefined") {
                         backInitiatorEndFlow = content.backInitiatorEndFlow;
@@ -915,7 +938,18 @@ var PageHome = function (_React$Component) {
                         urgencyList = content.urgencyList;
                         if (urgencyList.length > 0) {
                             for (var i = 0; i < urgencyList.length; i++) {
-                                if (urgency == urgencyList[i].value) {
+                                // 兼容 value / urgencyCode，统一转字符串比较
+                                var optCode = urgencyList[i].value;
+                                if (optCode == null || optCode === '') {
+                                    optCode = urgencyList[i].urgencyCode;
+                                }
+                                if (optCode != null && optCode !== '' && !urgencyList[i].value) {
+                                    urgencyList[i].value = optCode;
+                                }
+                                if (optCode != null && urgencyList[i].urgencyName && !urgencyList[i].text) {
+                                    urgencyList[i].text = urgencyList[i].urgencyName;
+                                }
+                                if (String(urgency) === String(optCode)) {
                                     urgentSelectList = urgencyList[i];
                                 }
                             }
@@ -1322,6 +1356,22 @@ var PageHome = function (_React$Component) {
                         details.fullMessage = details.operationDetails;
                         commentBackAlert.push(content.details);
                     }
+                    var readtype = content.readtype;
+                    if (!readtype) {
+                        readtype = "2";
+                    }
+                    // 待阅传阅原因：与退回原因弹窗完全一致（CommentList + Dialog）
+                    var listTypeForReason = t.state && t.state.listType != null ? String(t.state.listType) : '';
+                    if ((readtype == '1' || listTypeForReason === '1') && content.circulateReason && content.circulateReason != 'null' && commentBackAlert.length == 0) {
+                        titleCommentBackAlert = '传阅原因';
+                        commentBackAlert.push({
+                            type: 'text',
+                            inscriptionShow: 'userName,date',
+                            userName: content.circulateSenderName || '',
+                            time: content.circulateTime || '',
+                            fullMessage: content.circulateReason
+                        });
+                    }
                     //退回意见弹框 
                     // var commentBackAlert = [{
                     //     "type":"text",
@@ -1356,10 +1406,6 @@ var PageHome = function (_React$Component) {
                             commentDefaultList.push(commentItem);
                         }
                     }
-                    var readtype = content.readtype;
-                    if (!readtype) {
-                        readtype = "2";
-                    }
 
                     //已办记录
                     var processLogList = content.processLogList;
@@ -1718,6 +1764,10 @@ var PageHome = function (_React$Component) {
                             if (buttonCode == 'PAGE_SAVE' || buttonCode == 'BASE_SUMBIT') {
                                 buttonArrayNew.push(buttonCode);
                             }
+                            // 发起人已配置作废，且流程已有数据（退回/撤回到发起人）时显示作废
+                            if (buttonCode == 'BASE_INVALID' && dataId) {
+                                buttonArrayNew.push(buttonCode);
+                            }
                         } else {
                             if (buttonCode != '') {
                                 buttonArrayNew.push(buttonCode);
@@ -1768,6 +1818,10 @@ var PageHome = function (_React$Component) {
                             //发起人撤销按钮
                             buttonList.push({ name: t.state.finalButtons.get("FLOW_REVOKE"), type: 'secondary', display: 'inline', no: 7 });
                         }
+                        // 发起人配置了作废，且流程在发起人节点时（退回/撤回后）可作废
+                        if (startButtons.indexOf('BASE_INVALID') >= 0 && (isStart == true || isStart == 'true')) {
+                            buttonList.push({ name: t.state.finalButtons.get("BASE_INVALID"), type: 'danger', display: 'inline', no: 9 });
+                        }
                     }
                     if (t.state.urgeDataList != null && t.state.urgeDataList.length > 0) {
                         buttonList.push({ name: t.state.finalButtons.get("PAGE_URGE"), type: 'secondary', display: 'inline', no: 12 });
@@ -1792,6 +1846,9 @@ var PageHome = function (_React$Component) {
                         if (buttonCode == 'PAGE_SAVE' || buttonCode == 'BASE_SUMBIT') {
                             buttonArrayNew.push(buttonCode);
                         }
+                        if (buttonCode == 'BASE_INVALID' && dataId) {
+                            buttonArrayNew.push(buttonCode);
+                        }
                     }
                 }
 
@@ -1801,6 +1858,8 @@ var PageHome = function (_React$Component) {
                         buttonList.push({ name: t.state.finalButtons.get("BASE_SUMBIT"), type: 'primary', display: 'inline', no: 1 });
                     } else if (buttonCode == 'PAGE_SAVE') {
                         buttonList.push({ name: t.state.finalButtons.get("PAGE_SAVE"), type: 'secondary', display: 'inline', no: 13 });
+                    } else if (buttonCode == 'BASE_INVALID') {
+                        buttonList.push({ name: t.state.finalButtons.get("BASE_INVALID"), type: 'danger', display: 'inline', no: 9 });
                     }
                 }
             }
@@ -2862,6 +2921,7 @@ var PageHome = function (_React$Component) {
                                     checkedItem.participants = participants;
                                     checkedItem.level = item.level;
                                     checkedItem.maxOutgoing = maxOutgoing;
+                                    checkedItem.parallelGatewayId = item.parallelGatewayId;
                                     if (item.must == true && (maxOutgoing == 1 && checkActi == 0 || maxOutgoing == 0)) {
                                         //必须
                                         checkedItem.disable = false;
@@ -2897,6 +2957,14 @@ var PageHome = function (_React$Component) {
                                     //如果没有默认选中的下一个节点且是单选，则第一个默认选中
                                     if (nextActivityList.length > 0 && nextRadomList.length == 0) {
                                         nextActivityList[0].checked = true;
+                                        var pgFirst = nextActivityList[0].parallelGatewayId;
+                                        if (pgFirst) {
+                                            for (var pgi = 0; pgi < nextActivityList.length; pgi++) {
+                                                if (nextActivityList[pgi].parallelGatewayId == pgFirst) {
+                                                    nextActivityList[pgi].checked = true;
+                                                }
+                                            }
+                                        }
                                         //nextSelectType = 'next';
                                     } else if (nextRadomList.length > 0 && nextActivityList.length == 0) {
                                         nextRadomList[0].subRandomList[0].checked = true;
@@ -2922,7 +2990,8 @@ var PageHome = function (_React$Component) {
                                 nextActivityList: nextActivityList,
                                 pageStatus: '1',
                                 operate: operate,
-                                // urgentSelectList:urgentSelectList,
+                                // 打开提交页时兜底回填办理缓急，避免取消后再进显示「无」
+                                urgentSelectList: t.state.urgentSelectList && (t.state.urgentSelectList.value || t.state.urgentSelectList.urgencyCode) ? t.state.urgentSelectList : t.resolveUrgentSelectList(t.state.urgent, t.state.urgencyList),
                                 urgentList: urgentList,
                                 urgentHidden: urgentHidden,
                                 isEnd: isEnd,
@@ -5992,7 +6061,8 @@ var PageHome = function (_React$Component) {
                 formId: t.state.formId,
                 permissionCode: t.state.permissionCode,
                 processInstanceId: t.state.processInstanceId,
-                shortMessage: circulateShortMessage
+                shortMessage: circulateShortMessage,
+                circulateReason: t.state.circulateReason || ''
             }).then(function (content) {
                 _Toast2.default.show({
                     type: 'success',
@@ -7266,12 +7336,14 @@ var PageHome = function (_React$Component) {
             }
             this.refs["selectMember_mailsend"].dialogClearItem();
             this.refs["selectMember_chaosong"].dialogClearItem();
+            // 取消后恢复办理缓急选中，避免再次打开显示「无」
+            var restoreUrgent = this.resolveUrgentSelectList(this.state.urgent, this.state.urgencyList);
             this.setState({
                 pageStatus: '0',
                 operate: 0,
                 nextActivityList: [], //下一个活动节点列表
                 nextRadomList: [], //下一个随机节点
-                urgentSelectList: {}, //紧急选项
+                urgentSelectList: restoreUrgent, //紧急选项（按当前 urgent 回填）
                 circulatePersonValue: [], //清空传阅人
                 sendMailPersonValue: [],
                 chaosongPersonValue: [],
@@ -7344,11 +7416,16 @@ var PageHome = function (_React$Component) {
                     //单选
                     if (!checked) {
                         //选中的时候
+                        var pgId = item.parallelGatewayId;
                         for (var j = 0; j < nextActivityList.length; j++) {
                             if (nextActivityList[j].disable == true) {
                                 return false;
                             }
                             if (nextActivityList[j].isRadio) {
+                                // 排他下并行同组不能互相取消
+                                if (pgId && nextActivityList[j].parallelGatewayId == pgId) {
+                                    continue;
+                                }
                                 if (type == 'radom') {
                                     if (maxOutgoing == 1 || value == nextActivityList[j].value) {
                                         nextActivityList[j].checked = false;
@@ -7359,6 +7436,13 @@ var PageHome = function (_React$Component) {
                             }
                         }
                         nextActivityList[i].checked = !checked;
+                        if (pgId) {
+                            for (var j = 0; j < nextActivityList.length; j++) {
+                                if (nextActivityList[j].parallelGatewayId == pgId) {
+                                    nextActivityList[j].checked = true;
+                                }
+                            }
+                        }
                         if (checked == false && item.end == false) {//当选中时
                             // this.refs[item.value+"_"+i].clickAdd();
                         }
@@ -7368,6 +7452,14 @@ var PageHome = function (_React$Component) {
                             return false;
                         } else {
                             nextActivityList[i].checked = !checked;
+                            var pgIdUn = item.parallelGatewayId;
+                            if (pgIdUn) {
+                                for (var j = 0; j < nextActivityList.length; j++) {
+                                    if (nextActivityList[j].parallelGatewayId == pgIdUn) {
+                                        nextActivityList[j].checked = false;
+                                    }
+                                }
+                            }
                         }
                     }
                 } else {
@@ -7377,6 +7469,14 @@ var PageHome = function (_React$Component) {
                         //     return false;
                         // }else{
                         nextActivityList[i].checked = !checked;
+                        var pgIdCk = item.parallelGatewayId;
+                        if (pgIdCk) {
+                            for (var j = 0; j < nextActivityList.length; j++) {
+                                if (nextActivityList[j].parallelGatewayId == pgIdCk) {
+                                    nextActivityList[j].checked = true;
+                                }
+                            }
+                        }
                         if (checked == false && item.end == false) {} //当选中时
                         // this.refs[item.value+"_"+i].clickAdd();
 
@@ -7399,6 +7499,14 @@ var PageHome = function (_React$Component) {
                                 return false;
                             }
                             nextActivityList[i].checked = !checked;
+                            var pgIdCkUn = item.parallelGatewayId;
+                            if (pgIdCkUn) {
+                                for (var j = 0; j < nextActivityList.length; j++) {
+                                    if (nextActivityList[j].parallelGatewayId == pgIdCkUn) {
+                                        nextActivityList[j].checked = false;
+                                    }
+                                }
+                            }
                         }
                     }
                 }
@@ -7516,6 +7624,13 @@ var PageHome = function (_React$Component) {
                 circulateNodePersonValue: value
             });
         }
+    }, {
+        key: 'changeCirculateReason',
+        value: function changeCirculateReason(value) {
+            this.setState({
+                circulateReason: value
+            });
+        }
 
         //转发回调
 
@@ -8044,6 +8159,27 @@ var PageHome = function (_React$Component) {
                 });
             }
         }
+        /** 按缓急编码从选项列表解析已选项（兼容 value / urgencyCode） */
+
+    }, {
+        key: 'resolveUrgentSelectList',
+        value: function resolveUrgentSelectList(urgencyCode, urgencyList) {
+            var list = urgencyList || [];
+            var code = urgencyCode != null && urgencyCode !== '' ? String(urgencyCode) : '';
+            if (!code || list.length === 0) {
+                return {};
+            }
+            for (var i = 0; i < list.length; i++) {
+                var optCode = list[i].value;
+                if (optCode == null || optCode === '') {
+                    optCode = list[i].urgencyCode;
+                }
+                if (optCode != null && String(optCode) === code) {
+                    return list[i];
+                }
+            }
+            return {};
+        }
     }, {
         key: 'changeJumpShortMessage',
         value: function changeJumpShortMessage(data) {
@@ -8587,7 +8723,12 @@ var PageHome = function (_React$Component) {
                                     _react2.default.createElement(
                                         Box,
                                         { className: 't-LH24 t-FS16 t-PL18 t-omit', flex: 1 },
-                                        item.name
+                                        item.name,
+                                        item.parallelGatewayId ? _react2.default.createElement(
+                                            'span',
+                                            { className: 't-FCc t-FS12' },
+                                            '\uFF08\u5E76\u884C\uFF09'
+                                        ) : null
                                     )
                                 ),
                                 _react2.default.createElement(
@@ -8734,6 +8875,14 @@ var PageHome = function (_React$Component) {
                             isDelete: true,
                             onChange: this.getCirculatePerson.bind(this)
                         }),
+                        _react2.default.createElement(_TextareaField2.default, {
+                            readOnly: false,
+                            label: '传阅原因',
+                            required: false,
+                            minRows: 3, maxRows: 6,
+                            placeholder: '请输入传阅原因',
+                            value: this.state.circulateReason,
+                            onChange: this.changeCirculateReason.bind(this) }),
                         _react2.default.createElement(_CheckboxField2.default, {
                             data: this.state.readShortMessageList,
                             className: '',
@@ -8995,6 +9144,14 @@ var PageHome = function (_React$Component) {
                             isDelete: true,
                             onChange: this.circulateCallback.bind(this)
                         }),
+                        _react2.default.createElement(_TextareaField2.default, {
+                            readOnly: false,
+                            label: '传阅原因',
+                            required: false,
+                            minRows: 3, maxRows: 6,
+                            placeholder: '请输入传阅原因',
+                            value: this.state.circulateReason,
+                            onChange: this.changeCirculateReason.bind(this) }),
                         _react2.default.createElement(_CheckboxField2.default, {
                             data: this.state.readShortMessageList,
                             className: '',

package/lib/process_list/processList.js

@@ -722,7 +722,7 @@ var PageHome = function (_React$Component2) {
       category: category
     };
     _this3.getTransactionTitleCount(module, "undo,unread", category);
-    _this3.getCategoryListByModule(module, category);
+    _this3.getCategoryListByModule(module, category, activeIndex);
     /**
      * 办理页面搜索框设置项
      * @type {{locale: string, instantSearch: boolean, hasHistory: boolean, searchDelay: number, onEnter: (()), onExit: (()), onChange: ((p1:*)), onSearch: ((p1?:*))}}
@@ -802,6 +802,8 @@ var PageHome = function (_React$Component2) {
 
       // 点击tab页签，关闭遮罩
       $('.title-wrapper.active').click();
+      // 切换 Tab 时按当前列表重新拉取「有数据」的分类
+      this.getCategoryListByModule(this.state.module, this.state.category, active);
     }
 
     /**
@@ -827,21 +829,33 @@ var PageHome = function (_React$Component2) {
     }
 
     /**
-     * 获取分类
+     * 获取分类（仅当前列表有数据的分类）
+     * @param listType 0待办/1待阅/2已办/3已阅/4我的，默认当前 Tab
      */
 
   }, {
     key: 'getCategoryListByModule',
-    value: function getCategoryListByModule(module, category) {
+    value: function getCategoryListByModule(module, category, listType) {
       var _this5 = this;
 
       var t = this;
+      var type = listType;
+      if (type === undefined || type === null || type === '') {
+        type = this.state.activeTabIndex;
+      }
       _db2.default.FlowApproval.getCategoryListByModule({
         module: module,
-        code: category
+        code: category,
+        listType: type
       }).then(function (content) {
         if (content) {
-          _this5.state.categoryList = content;
+          _this5.setState({
+            categoryList: content
+          });
+        } else {
+          _this5.setState({
+            categoryList: []
+          });
         }
       }).catch(function (error) {
         console.log(error);

package/lib/upload/upload.js

@@ -33,6 +33,8 @@ require('whatwg-fetch');
 
 require('es6-promise');
 
+require('./upload.less');
+
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -262,19 +264,28 @@ var PageHome = function (_React$Component) {
         key: 'componentDidMount',
         value: function componentDidMount() {
             var t = this;
-            var param = {
-                name: 'file',
-                url: this.state.uploadUrl,
-                autoPending: true,
-                accept: t.state.accept,
-                multiple: true,
-                fileSizeLimit: t.state.fileSizeLimit
-            };
-            var limitNo = t.state.limitNo;
-            //param.queueCapcity= limitNo;
-            var up = this.getCore(param);
-            var picker = up.getPickerCollector();
-            picker.addArea(document.getElementById('ddUploadPic' + t.state.keyNum));
+            try {
+                var param = {
+                    name: 'file',
+                    url: this.state.uploadUrl,
+                    autoPending: true,
+                    accept: t.state.accept,
+                    multiple: true,
+                    fileSizeLimit: t.state.fileSizeLimit
+                };
+                var up = this.getCore(param);
+                var picker = up.getPickerCollector();
+                var areaEl = document.getElementById('ddUploadPic' + t.state.keyNum);
+                if (areaEl) {
+                    picker.addArea(areaEl);
+                }
+            } catch (e) {
+                console.log('upload picker init error:', e);
+            }
+            // 父级 ref 回调偶发未触发时，自行按 initIds 拉附件列表
+            if (this.props.initIds) {
+                this.initData();
+            }
         }
     }, {
         key: 'getCore',
@@ -613,21 +624,29 @@ var PageHome = function (_React$Component) {
                     // t.props.onChange(initList);
                     if (res.ok) {
                         res.json().then(function (obj) {
-                            var objList = obj.data;
+                            // 接口常 HTTP 200 + body failure；data 非数组时不能 concat，否则渲染崩溃导致附件区空白
+                            var objList = obj && obj.data ? obj.data : [];
+                            if (!(objList instanceof Array)) {
+                                objList = [];
+                            }
+                            if (obj && obj.type === 'failure') {
+                                console.log('getAttachmentByIds failure:', obj.message || obj.code);
+                                return;
+                            }
                             initList = initList.concat(objList);
                             if (t.props.onChange) {
-                                t.props.onChange(initList);
+                                // 初始化回填：传 '1'，避免触发表单向上 onChange 导致重挂载丢列表
+                                t.props.onChange(initList, '1');
                             }
                             t.setState({
                                 initList: initList
                             });
-                            // Get the JSON
                         });
                     } else if (res.status == 401) {
-                        // To do with res
+                        console.log('getAttachmentByIds 401');
                     }
                 }, function (e) {
-                    // Handling errors
+                    console.log('getAttachmentByIds network error', e);
                 }).catch(function (error) {
                     console.log("错误：" + error);
                 });
@@ -731,7 +750,7 @@ var PageHome = function (_React$Component) {
                                                     _react2.default.createElement('i', { className: _this3.getIcon(item.fileExt) }),
                                                     _react2.default.createElement(
                                                         'div',
-                                                        { className: 't-list-title t-omit t-LH1_4' },
+                                                        { className: 't-list-title upload-file-name t-LH1_4' },
                                                         typeof item.fileDisplayName == 'undefined' ? item.name : item.fileDisplayName
                                                     )
                                                 ),
@@ -751,7 +770,7 @@ var PageHome = function (_React$Component) {
                                             _react2.default.createElement('i', { className: _this3.getIcon(item.fileExt) }),
                                             _react2.default.createElement(
                                                 'div',
-                                                { className: 't-list-title t-omit t-LH1_4' },
+                                                { className: 't-list-title upload-file-name t-LH1_4' },
                                                 typeof item.fileDisplayName == 'undefined' ? item.name : item.fileDisplayName
                                             )
                                         ),

package/lib/upload/upload.less

@@ -0,0 +1,345 @@
+/* 上传组件基础样式（勿整文件覆盖，否则附件区会空白） */
+.upload {
+  width: 100%;
+  text-align: left;
+  box-sizing: border-box;
+}
+
+.upload .t-field-box {
+  padding-right: 10px;
+}
+
+.upload-list {
+  margin: 5px 0;
+}
+
+.upload-list-item {
+  display: flex;
+  align-items: center;
+  width: 100%;
+  padding: 5px 10px 5px 10px;
+  border-radius: 5px;
+  background: #f5f5f5;
+}
+
+.upload-list-item-content {
+  max-width: 85%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: flex-start;
+}
+
+.upload-name-icon {
+  width: 100%;
+  display: flex;
+  align-items: center;
+}
+
+.upload-icon {
+  margin-left: auto;
+}
+
+.upload-list-item .icon-delete {
+  margin-left: auto;
+  font-size: 16px;
+  color: #fa5151;
+}
+
+.upload-list-item .t-list-title {
+  font-size: 14px;
+  color: #000000;
+}
+
+.upload-list-item .iconfont-fontsize {
+  margin-right: 5px;
+  font-size: 12px;
+}
+
+.upload-list-item .icon-PDF {
+  color: #ee3434;
+}
+
+.upload-list-item .icon-DPS {
+  color: #ff6a10;
+}
+
+.upload-list-item .icon-XLS {
+  color: #4ec10f;
+}
+
+.upload-list-item .icon-DOC {
+  color: #4799e7;
+}
+
+.upload-list-item .icon-ET {
+  color: #4ec10f;
+}
+
+.upload-list-item .icon-OFD {
+  color: #ee3434;
+}
+
+.upload-list-item .icon-WPS {
+  color: #ff6a10;
+}
+
+.upload-list-item .icon-ZIP {
+  color: #337ab7;
+}
+
+.upload-list-item .icon-TXT {
+  color: #4799e7;
+}
+
+.upload-list-item .icon-TIF {
+  color: #ff9900;
+}
+
+.upload-list-item .icon-SWF {
+  color: #a94442;
+}
+
+.upload-list-item .icon-RAR {
+  color: #337ab7;
+}
+
+.upload-list-item .icon-PPT {
+  color: #ff6a10;
+}
+
+.upload-list-item .icon-MP3 {
+  color: #a06feb;
+}
+
+.upload-list-item .icon-MP4 {
+  color: #a06feb;
+}
+
+.upload-list-item .icon-MOV {
+  color: #0fb8c3;
+}
+
+.upload-list-item .icon-GIF {
+  color: #ff9900;
+}
+
+.upload-list-item .icon-FLV {
+  color: #0fb8c3;
+}
+
+.upload-list-item .icon-EXE {
+  color: #31708f;
+}
+
+.upload-list-item .icon-AVI {
+  color: #0fb8c3;
+}
+
+.upload-list-item .icon-7Z {
+  color: #337ab7;
+}
+
+.upload-list-item .icon-download1 {
+  margin-right: 5px;
+  font-size: 16px;
+}
+
+.upload-list-item .dd-t-list-time {
+  font-size: 10px;
+  line-height: 12px;
+}
+
+.upload-file {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  position: relative;
+  width: 100%;
+  height: 40px;
+  font-size: 20px;
+  background: #ffffff;
+  color: rgba(0, 0, 0, 0.3);
+  border-radius: 10px;
+  border: 1px dashed rgba(0, 0, 0, 0.3);
+}
+
+.upload-image {
+  position: relative;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 100px;
+  height: 99px;
+  background: #ffffff;
+  font-size: 20px;
+  color: rgba(0, 0, 0, 0.3);
+  border-radius: 10px;
+  border: 1px dashed rgba(0, 0, 0, 0.3);
+}
+
+.upload-image .icon-plus {
+  color: rgba(0, 0, 0, 0.3);
+}
+
+.upload-file-p {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  position: relative;
+  width: 100%;
+  padding: 4px;
+  margin-bottom: 5px;
+  font-size: 20px;
+  background: #ffffff;
+  color: rgba(0, 0, 0, 0.3);
+  border-radius: 10px;
+  border: 1px dashed rgba(0, 0, 0, 0.3);
+}
+
+.upload-image-p {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 100px;
+  height: 99px;
+  margin-right: 10px;
+  padding: 0 4px;
+  background: #ffffff;
+  font-size: 20px;
+  color: rgba(0, 0, 0, 0.3);
+  border-radius: 10px;
+  border: 1px dashed rgba(0, 0, 0, 0.3);
+}
+
+.upload-image-item {
+  width: 100px;
+  height: 98px;
+  position: relative;
+  margin: 0 10px 25px 0px;
+  border-radius: 10px;
+  background: rgba(0, 0, 0, 0.2);
+}
+
+.upload-progress {
+  margin-bottom: 15px;
+}
+
+.upload-progress-tip {
+  width: 100%;
+  display: block;
+  text-align: center;
+  font-size: 12px;
+}
+
+.upload-progress .progress-bar.green-bar .bar-core {
+  box-shadow: 0 0;
+}
+
+.upload-image-item img {
+  border-radius: 10px;
+}
+
+.upload-image-content {
+  position: relative;
+}
+
+.dd-upload-file {
+  flex-wrap: wrap;
+}
+
+.upload-image-item .iconfont {
+  position: absolute;
+  right: -10px;
+  top: -10px;
+  background: #fa5151;
+  font-size: 14px;
+  width: 21px;
+  height: 21px;
+  line-height: 21px;
+  text-align: center;
+  border-radius: 50%;
+  color: #fff;
+  z-index: 10;
+}
+
+.upload-image-test-hidden {
+  display: none;
+}
+
+.upload-image-test {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  width: 100%;
+  padding-right: 27px;
+  margin-top: 18px;
+  margin-bottom: 21px;
+}
+
+.upload-image-test-left {
+  font-family: PingFangSC-Regular;
+  font-size: 16px;
+  color: rgba(0, 0, 0, 0.85);
+}
+
+.upload-image-test-right {
+  font-size: 12px;
+  color: rgba(0, 0, 0, 0.3);
+  font-family: SourceHanSansSC-Regular;
+}
+
+.dd-uploaded-delete {
+  background: #ff213b;
+  font-size: 14px;
+  width: 21px;
+  height: 21px;
+  line-height: 21px;
+  text-align: center;
+  border-radius: 50%;
+  color: #fff;
+  margin: 14px 0 0 16px;
+}
+
+/* 流程表单附件：名称完整显示，过长换行（不截断省略） */
+.upload-list {
+  .upload-list-item {
+    align-items: flex-start;
+  }
+
+  .upload-content,
+  .upload-list-item,
+  .upload-list-item-content,
+  .upload-name-icon {
+    min-width: 0;
+  }
+
+  .upload-list-item-content {
+    flex: 1;
+    max-width: none;
+  }
+
+  .upload-name-icon {
+    align-items: flex-start;
+  }
+
+  .upload-name-icon > i {
+    flex-shrink: 0;
+  }
+
+  .upload-file-name,
+  .t-list-title.upload-file-name {
+    flex: 1;
+    min-width: 0;
+    white-space: normal !important;
+    word-break: break-all !important;
+    overflow-wrap: break-word !important;
+    word-wrap: break-word !important;
+    overflow: visible !important;
+    text-overflow: clip !important;
+    -webkit-line-clamp: unset !important;
+    line-clamp: unset !important;
+    max-width: 100%;
+    line-height: 1.4;
+  }
+}

package/package.json

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