fmui-base 2.3.72 → 2.3.73

package/README.md

@@ -3,6 +3,7 @@
 ---npm publish
 
 ## 更新日志 
+- 2.3.73：移动端流程表单增加退回后重新提交前的批示意见在表单下方显示
 - 2.3.72：移动端表单设置自定义样式时图标乱码问题
 - 2.3.71：移动端办理列表缓急标签样式
 - 2.3.70：移动端支持表单的规则设置校验

package/lib/comment_list/List.js

@@ -310,15 +310,29 @@ var PageHome = function (_React$Component) {
           { className: 't-PR5' },
           item.orgShowName
         );
-        var caImg = t.state.caSignatureMap && t.state.caSignatureMap[item.id] || t.normalizeBase64(item.caSignatureImg);
-        var hasSignImg = !!(caImg || item.signPic != null && item.signPic !== '');
-        var signPicHtml = caImg ? _react2.default.createElement('img', { className: 't-H64 t-PR5 signPic', src: 'data:image/png;base64,' + caImg }) : item.signPic ? _react2.default.createElement('img', { className: 't-H64 t-PR5 signPic', src: t.state.loadImg + item.signPic }) : "";
+        // 优先 base64 / dataURI，避免 viewImage?token= 拼在链接上
+        var signSrc = '';
+        if (item.imgSrc && String(item.imgSrc).indexOf('data:') === 0) {
+          signSrc = String(item.imgSrc);
+        } else {
+          var caImg = t.state.caSignatureMap && t.state.caSignatureMap[item.id] || t.normalizeBase64(item.caSignatureImg);
+          if (caImg) {
+            var mime = String(caImg).indexOf('/9j/') === 0 ? 'image/jpeg' : 'image/png';
+            signSrc = 'data:' + mime + ';base64,' + caImg;
+          } else if (item.signPic) {
+            // 兜底：后端未转 base64 时仍走附件预览（不推荐）
+            signSrc = t.state.loadImg + item.signPic;
+          }
+        }
+        var hasSignImg = !!signSrc;
+        var signPicHtml = signSrc ? _react2.default.createElement('img', { className: 't-H64 t-PR5 signPic', src: signSrc }) : "";
         var taskNameHtml = _react2.default.createElement(
           'span',
           { className: 't-PR5' },
           item.taskName
         );
-        var sealHtml = item.sealFileId && item.sealFileId !== "" ? _react2.default.createElement('img', { className: 't-PR5', src: t.state.loadImg + item.sealFileId, style: { 'position': 'absolute', 'top': '-35px', 'right': '10px', 'height': '64px', 'opacity': 0.8 } }) : "";
+        var sealSrc = item.sealSrc && String(item.sealSrc).indexOf('data:') === 0 ? String(item.sealSrc) : item.sealFileId && item.sealFileId !== "" ? t.state.loadImg + item.sealFileId : '';
+        var sealHtml = sealSrc ? _react2.default.createElement('img', { className: 't-PR5', src: sealSrc, style: { 'position': 'absolute', 'top': '-35px', 'right': '10px', 'height': '64px', 'opacity': 0.8 } }) : "";
         var inscriptionShowArray = item.inscriptionShow.split(",");
         var showUserName = inscriptionShowArray.indexOf("userName") >= 0 && (item.inscriptionShow.indexOf("signImg") < 0 || item.inscriptionShow.indexOf("signImg") >= 0 && !hasSignImg);
         var _returnHtml = inscriptionShowArray.map(function (inscriptionItem) {

package/lib/process_info/processInfo.js

@@ -544,6 +544,8 @@ var PageHome = function (_React$Component) {
             mobileFlowChar: '0', //是否开启流程图  1开启 0禁用
             mobileSubTblDefault: '1', //移动端子表默认 1展开 0收起；未设置按展开
             enableMessageBoard: '0', //流程启用留言板
+            showPreResubmitComment: '0', //退回后重新提交前意见在表单下方显示
+            preResubmitCommentList: [], //重新发起前批示意见（历史轮）
             enableAttachmentArea: '0', //流程启用附件区
             relationCount: 0, //关联流程数量
             hasRelationBtn: false, //当前是否具备关联流程按钮权限
@@ -1730,6 +1732,8 @@ var PageHome = function (_React$Component) {
                         mobileSubTblDefault: mobileSubTblDefault,
                         enableMessageBoard: enableMessageBoard,
                         enableAttachmentArea: enableAttachmentArea,
+                        showPreResubmitComment: content.showPreResubmitComment != null && content.showPreResubmitComment !== '' ? String(content.showPreResubmitComment) : '0',
+                        preResubmitCommentList: Array.isArray(content.preResubmitCommentList) ? content.preResubmitCommentList : [],
                         readScopeId: readScopeId,
                         readScopeList: readScopeList,
                         readRangeType: readRangeType,
@@ -9627,10 +9631,215 @@ var PageHome = function (_React$Component) {
                 }
             }, 100);
         }
+
+        /** 按批示意见落款设置拼装（与 PC 一致） */
+
+    }, {
+        key: 'buildPreResubmitInscription',
+        value: function buildPreResubmitInscription(c) {
+            var show = (c.inscriptionShow || c.inscription_show || '').toString();
+            if (!show) {
+                show = 'userName,date,time';
+            }
+            var raw = c.signtime || c.time || c.createdDate || '';
+            var s = raw == null ? '' : String(raw).replace('T', ' ');
+            var date = s.length >= 10 ? s.substring(0, 10) : '';
+            var time = '';
+            if (s.length >= 19) {
+                time = s.substring(11, 19);
+            } else if (s.length >= 16) {
+                time = s.substring(11, 16);
+            }
+            var parts = [];
+            var hasSignImg = false;
+            if (show.indexOf('signImg') !== -1) {
+                // 与批示意见组件 List.jsx 一致：纯 base64 拼 dataURI。
+                // 注意：JPEG base64 以 /9j/ 开头，绝不能用 startsWith('/') 当路径跳过前缀。
+                var src = '';
+                if (c.imgSrc && String(c.imgSrc).indexOf('data:') === 0) {
+                    src = String(c.imgSrc);
+                } else {
+                    var caImg = c.caSignatureImg || c.ca_signature_img || '';
+                    if (caImg) {
+                        var imgData = String(caImg).replace(/\s+/g, '');
+                        var mark = 'base64,';
+                        var markIdx = imgData.indexOf(mark);
+                        if (markIdx > -1) {
+                            imgData = imgData.substring(markIdx + mark.length);
+                        }
+                        if (imgData.indexOf('data:') === 0 || imgData.indexOf('http') === 0) {
+                            src = imgData;
+                        } else if (imgData) {
+                            var mime = imgData.indexOf('/9j/') === 0 ? 'image/jpeg' : 'image/png';
+                            src = 'data:' + mime + ';base64,' + imgData;
+                        }
+                    } else if (c.signPic) {
+                        var fidRaw = String(c.signPic);
+                        if (fidRaw.indexOf('data:') === 0 || fidRaw.indexOf('http') === 0) {
+                            src = fidRaw;
+                        } else {
+                            var signFid = fidRaw;
+                            var sinIdx = signFid.indexOf('_sinPic');
+                            if (sinIdx > -1) {
+                                signFid = signFid.substring(0, sinIdx);
+                            }
+                            src = _variables2.default.loadImg + '&fid=' + signFid;
+                        }
+                    } else if (c.imgSrc) {
+                        src = String(c.imgSrc);
+                    }
+                }
+                if (src) {
+                    hasSignImg = true;
+                    parts.push(_react2.default.createElement('img', { key: 'sign', className: 'signPic', src: src, style: { maxHeight: 64, maxWidth: 120, verticalAlign: 'middle', marginRight: 6 } }));
+                }
+            }
+            // 有签名图时与表单一致：不再重复显示姓名
+            if (show.indexOf('userName') !== -1 && !hasSignImg) {
+                var un = c.userName || '';
+                if (c.replacename) {
+                    un = un ? un + '(' + c.replacename + ')' : c.replacename;
+                }
+                if (un) {
+                    parts.push(_react2.default.createElement(
+                        'span',
+                        { key: 'un' },
+                        un,
+                        ' '
+                    ));
+                }
+            }
+            if (show.indexOf('org') !== -1) {
+                var orgName = c.orgShowName || c.orgName || '';
+                if (orgName) {
+                    parts.push(_react2.default.createElement(
+                        'span',
+                        { key: 'org' },
+                        orgName,
+                        ' '
+                    ));
+                }
+            }
+            if (show.indexOf('date') !== -1 && date) {
+                parts.push(_react2.default.createElement(
+                    'span',
+                    { key: 'date' },
+                    date,
+                    ' '
+                ));
+            }
+            if (show.indexOf('time') !== -1 && time) {
+                parts.push(_react2.default.createElement(
+                    'span',
+                    { key: 'time' },
+                    time,
+                    ' '
+                ));
+            }
+            if (show.indexOf('taskName') !== -1 && c.taskName) {
+                parts.push(_react2.default.createElement(
+                    'span',
+                    { key: 'tn' },
+                    c.taskName
+                ));
+            }
+            return parts;
+        }
+
+        /** 按批示意见字段分组 */
+
+    }, {
+        key: 'groupPreResubmitByField',
+        value: function groupPreResubmitByField(list) {
+            var order = [];
+            var map = {};
+            (list || []).forEach(function (c, i) {
+                var item = c || {};
+                var key = item.field != null && String(item.field) !== '' ? String(item.field) : '_idx_' + i;
+                if (!map[key]) {
+                    map[key] = {
+                        key: key,
+                        label: item.taskName || item.field || '批示意见',
+                        items: []
+                    };
+                    order.push(key);
+                }
+                map[key].items.push(item);
+            });
+            return order.map(function (k) {
+                return map[k];
+            });
+        }
+
+        /** 表单下方：外框表格（左字段名 / 右内容+落款，同字段合并） */
+
+    }, {
+        key: 'renderPreResubmitCommentBlock',
+        value: function renderPreResubmitCommentBlock() {
+            var _this5 = this;
+
+            if (this.state.showPreResubmitComment !== '1') {
+                return null;
+            }
+            var list = this.state.preResubmitCommentList || [];
+            if (!list.length) {
+                return null;
+            }
+            var groups = this.groupPreResubmitByField(list);
+            return _react2.default.createElement(
+                'div',
+                { className: 'pre-resubmit-comment-area t-ML16 t-MR16 t-MT8 t-MB8 t-BCf', style: { border: '1px solid #d9d9d9', borderRadius: 2, overflow: 'hidden' } },
+                _react2.default.createElement(
+                    'div',
+                    { className: 't-FS14 t-PL12 t-PR12 t-PT10 t-PB10', style: { fontWeight: 'bold', borderBottom: '1px solid #d9d9d9', background: '#fafafa' } },
+                    '\u9000\u56DE\u540E\u91CD\u65B0\u63D0\u4EA4\u524D\u7684\u6279\u793A\u610F\u89C1'
+                ),
+                _react2.default.createElement(
+                    'table',
+                    { style: { width: '100%', borderCollapse: 'collapse', margin: 0 } },
+                    _react2.default.createElement(
+                        'tbody',
+                        null,
+                        groups.map(function (group) {
+                            return _react2.default.createElement(
+                                'tr',
+                                { key: group.key },
+                                _react2.default.createElement(
+                                    'td',
+                                    { style: { width: 88, verticalAlign: 'middle', textAlign: 'center', padding: '10px 6px', border: '1px solid #d9d9d9', background: '#fafafa', fontSize: 14 } },
+                                    group.label
+                                ),
+                                _react2.default.createElement(
+                                    'td',
+                                    { style: { verticalAlign: 'top', padding: '10px 12px', border: '1px solid #d9d9d9', fontSize: 14 } },
+                                    group.items.map(function (c, idx) {
+                                        var content = c.fullMessage != null ? c.fullMessage : c.content || '';
+                                        return _react2.default.createElement(
+                                            'div',
+                                            { key: c.id || idx, style: idx > 0 ? { marginTop: 12, paddingTop: 12, borderTop: '1px dashed #e8e8e8' } : null },
+                                            _react2.default.createElement(
+                                                'div',
+                                                { style: { whiteSpace: 'pre-wrap', wordBreak: 'break-word', lineHeight: 1.6 } },
+                                                content
+                                            ),
+                                            _react2.default.createElement(
+                                                'div',
+                                                { style: { textAlign: 'right', marginTop: 4, lineHeight: 1.6 } },
+                                                _this5.buildPreResubmitInscription(c)
+                                            )
+                                        );
+                                    })
+                                )
+                            );
+                        })
+                    )
+                )
+            );
+        }
     }, {
         key: 'render',
         value: function render() {
-            var _this5 = this;
+            var _this6 = this;
 
             var isReadOnly = false;
             var t = this;
@@ -9674,7 +9883,7 @@ var PageHome = function (_React$Component) {
                             title: this.state.titleCommentBackAlert,
                             show: this.state.showCommentBackAlert,
                             onConfirm: function onConfirm() {
-                                _this5.setState({ showCommentBackAlert: false });
+                                _this6.setState({ showCommentBackAlert: false });
                             }
                         },
                         _react2.default.createElement(
@@ -9732,7 +9941,8 @@ var PageHome = function (_React$Component) {
                                             _Group2.default.List,
                                             null,
                                             this.state.tableStatus == '0' ? "" : _react2.default.createElement(_table2.default, { key: 'approveFormTable_' + this.state.formTableKey, ref: 'approveFormTable', module: this.state.module, operate: this.state.operate, editType: this.state.editType, dataId: this.state.dataId, hasCommentField: t.state.hasCommentField, newspyj: t.state.newspyj, commentField: t.state.commentField, commentAttitude: t.state.commentAttitude, status: t.state.status, form: t.state.formItem, formStyleObj: t.state.formStyleObj, subColumnCount: t.state.subColumnCount, mobileSubTblDefault: t.state.mobileSubTblDefault, allForm: t.state.form, data: t.state.editFormData, commentFieldList: t.state.commentFieldList, defaultValue: t.state.defaultValue, commentDefaultList: t.state.commentDefaultList, commentBackList: t.state.commentBackList, fieldControll: t.state.fieldControll, caIsPrd: t.state.caIsPrd, preCaFields: t.state.preCaFields, formRelaField: t.state.formRelaField, isRemoveCommentFormHtml: t.state.isRemoveCommentFormHtml, commentUpload: t.state.commentUpload, isCaUser: t.state.isCaUser, caFirm: t.state.caFirm, caESignatureName: t.state.caESignatureName, caFormSign: t.state.caFormSign, inscriptionShow: t.state.inscriptionShow, finalButtons: t.state.finalButtons, onChange: this.change.bind(this) })
-                                        )
+                                        ),
+                                        this.renderPreResubmitCommentBlock()
                                     )
                                 )
                             ),
@@ -10402,7 +10612,7 @@ var PageHome = function (_React$Component) {
                                         '(\u5DF2\u529E)'
                                     ) : _react2.default.createElement(
                                         'span',
-                                        { key: 'add-' + item.userid + '-' + idx, onClick: _this5.moveToReducePool.bind(_this5, item.userid), style: { margin: '0 8px 8px 0', padding: '4px 10px', background: '#e60012', color: '#fff', borderRadius: '4px', fontSize: '13px' } },
+                                        { key: 'add-' + item.userid + '-' + idx, onClick: _this6.moveToReducePool.bind(_this6, item.userid), style: { margin: '0 8px 8px 0', padding: '4px 10px', background: '#e60012', color: '#fff', borderRadius: '4px', fontSize: '13px' } },
                                         item.username,
                                         ' \xD7'
                                     );
@@ -10423,7 +10633,7 @@ var PageHome = function (_React$Component) {
                                 (this.state.reduceSignReducePool || []).map(function (item, idx) {
                                     return _react2.default.createElement(
                                         'span',
-                                        { key: 'reduce-' + item.userid + '-' + idx, onClick: _this5.moveToAddPool.bind(_this5, item.userid), style: { margin: '0 8px 8px 0', padding: '4px 10px', background: '#e60012', color: '#fff', borderRadius: '4px', fontSize: '13px' } },
+                                        { key: 'reduce-' + item.userid + '-' + idx, onClick: _this6.moveToAddPool.bind(_this6, item.userid), style: { margin: '0 8px 8px 0', padding: '4px 10px', background: '#e60012', color: '#fff', borderRadius: '4px', fontSize: '13px' } },
                                         item.username,
                                         ' \xD7'
                                     );

package/package.json

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