fmui-base 2.3.53 → 2.3.55

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.3.55：作废、结束、不通过弹框样式修改
+- 2.3.54：移动端支持作废数据进行删除,我的流程点开显示作废按钮显示逻辑和PC一致,移动端流程表单支持留言页签显示附件区和留言区
 - 2.3.53：移动端审批不通过功能
 - 2.3.52：移动端批示意见为空时允许保存并显示落款
 - 2.3.51：移动表单支持矩阵表单设置的字段名称字段内容的字体大小及颜色

package/lib/db/db.js

@@ -807,6 +807,22 @@ context.create('FlowModuleAPI', {
       });
     }
   },
+  delMyProcess: {
+    mockUrl: 'query/getDoneTaskListByProcessId.json',
+    url: _variables2.default.URLS.delMyProcess,
+    method: 'POST',
+    postDataFomat: 'FORM',
+    header: {
+      Authorization: 'Bearer ' + getLoginUserInfo().token
+    },
+    willFetch: function willFetch() {
+      _Toast2.default.show({
+        content: _react2.default.createElement(_loading2.default, null),
+        hasMask: true,
+        duration: 800
+      });
+    }
+  },
   forceEnd: {
     mockUrl: 'query/getDoneTaskListByProcessId.json',
     url: _variables2.default.URLS.forceEnd,
@@ -1201,6 +1217,76 @@ context.create('FlowModuleAPI', {
       Authorization: 'Bearer ' + getLoginUserInfo().token
     },
     willFetch: function willFetch() {}
+  },
+  getMessageReplyInfo: {
+    url: _variables2.default.URLS.getMessageReplyInfo,
+    method: 'GET',
+    header: {
+      Authorization: 'Bearer ' + getLoginUserInfo().token
+    },
+    willFetch: function willFetch() {}
+  },
+  saveMessageReply: {
+    url: _variables2.default.URLS.saveMessageReply,
+    method: 'POST',
+    postDataFomat: 'FORM',
+    header: {
+      Authorization: 'Bearer ' + getLoginUserInfo().token
+    },
+    willFetch: function willFetch() {}
+  },
+  deleteMessageReply: {
+    url: _variables2.default.URLS.deleteMessageReply,
+    method: 'POST',
+    postDataFomat: 'FORM',
+    header: {
+      Authorization: 'Bearer ' + getLoginUserInfo().token
+    },
+    willFetch: function willFetch() {}
+  },
+  saveMessageReplyDetails: {
+    url: _variables2.default.URLS.saveMessageReplyDetails,
+    method: 'POST',
+    postDataFomat: 'FORM',
+    header: {
+      Authorization: 'Bearer ' + getLoginUserInfo().token
+    },
+    willFetch: function willFetch() {}
+  },
+  deleteMessageReplyDetails: {
+    url: _variables2.default.URLS.deleteMessageReplyDetails,
+    method: 'POST',
+    postDataFomat: 'FORM',
+    header: {
+      Authorization: 'Bearer ' + getLoginUserInfo().token
+    },
+    willFetch: function willFetch() {}
+  },
+  getAttachmentAreaInfo: {
+    url: _variables2.default.URLS.getAttachmentAreaInfo,
+    method: 'GET',
+    header: {
+      Authorization: 'Bearer ' + getLoginUserInfo().token
+    },
+    willFetch: function willFetch() {}
+  },
+  saveAttachmentArea: {
+    url: _variables2.default.URLS.saveAttachmentArea,
+    method: 'POST',
+    postDataFomat: 'FORM',
+    header: {
+      Authorization: 'Bearer ' + getLoginUserInfo().token
+    },
+    willFetch: function willFetch() {}
+  },
+  deleteAttachmentArea: {
+    url: _variables2.default.URLS.deleteAttachmentArea,
+    method: 'POST',
+    postDataFomat: 'FORM',
+    header: {
+      Authorization: 'Bearer ' + getLoginUserInfo().token
+    },
+    willFetch: function willFetch() {}
   }
 
 });

package/lib/db/variables.js

@@ -94,6 +94,7 @@ exports.default = {
         jump: approveUrlPrefix + "jump" + '?', //跳转
         getDoneTaskListByProcessId: approveUrlPrefix + "getDoneTaskListByProcessId" + '?', //根据流程实例id查询已办
         cancelProcess: approveUrlPrefix + 'cancelProcess' + '?', //作废流程
+        delMyProcess: approveUrlPrefix + 'delMyProcess' + '?', //我的流程删除
         forceEnd: approveUrlPrefix + 'forceEnd' + '?', //结束流程
         notPass: approveUrlPrefix + 'notPass' + '?', //不通过
         getUndoTaskInfo: approveUrlPrefix + "getUndoTaskInfo" + '?', //获取待办详情
@@ -149,7 +150,16 @@ exports.default = {
         updateStartUserOrg: approveUrlPrefix + 'updateStartUserOrg' + '?', //更新发起人组织
         reloadFuzhiMacroFields: approveUrlPrefix + 'reloadFuzhiMacroFields' + '?', //组织切换后重载赋值宏值
         getUserIdsByGrpId: approveUrlPrefix + 'getUserIdsByGrpId', //根据群组id获取用户（POST FORM）
-        getUserIdsByDutyId: approveUrlPrefix + 'getUserIdsByDutyId' //根据职务id获取用户（POST FORM）
+        getUserIdsByDutyId: approveUrlPrefix + 'getUserIdsByDutyId', //根据职务id获取用户（POST FORM）
+        // 留言板 / 附件区（ApproveMobile 代理）
+        getMessageReplyInfo: approveUrlPrefix + 'getMessageReplyInfo?',
+        saveMessageReply: approveUrlPrefix + 'saveMessageReply',
+        deleteMessageReply: approveUrlPrefix + 'deleteMessageReply',
+        saveMessageReplyDetails: approveUrlPrefix + 'saveMessageReplyDetails',
+        deleteMessageReplyDetails: approveUrlPrefix + 'deleteMessageReplyDetails',
+        getAttachmentAreaInfo: approveUrlPrefix + 'getAttachmentAreaInfo?',
+        saveAttachmentArea: approveUrlPrefix + 'saveAttachmentArea',
+        deleteAttachmentArea: approveUrlPrefix + 'deleteAttachmentArea'
     },
     nodataIcon: context + "/mobile/fmui/images/noData.png",
     loadingIcon: context + "/mobile/fmui/images/loading.gif",

package/lib/process_info/MessageBoard.js

@@ -0,0 +1,564 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = undefined;
+
+var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+
+var _react = require('react');
+
+var _react2 = _interopRequireDefault(_react);
+
+var _Toast = require('saltui/lib/Toast');
+
+var _Toast2 = _interopRequireDefault(_Toast);
+
+var _Button = require('saltui/lib/Button');
+
+var _Button2 = _interopRequireDefault(_Button);
+
+var _Dialog = require('saltui/lib/Dialog');
+
+var _Dialog2 = _interopRequireDefault(_Dialog);
+
+var _TextareaField = require('saltui/lib/TextareaField');
+
+var _TextareaField2 = _interopRequireDefault(_TextareaField);
+
+var _Boxs = require('saltui/lib/Boxs');
+
+var _Boxs2 = _interopRequireDefault(_Boxs);
+
+var _Group = require('saltui/lib/Group');
+
+var _Group2 = _interopRequireDefault(_Group);
+
+var _upload = require('../upload/upload');
+
+var _upload2 = _interopRequireDefault(_upload);
+
+var _db = require('../db/db');
+
+var _db2 = _interopRequireDefault(_db);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+
+var HBox = _Boxs2.default.HBox,
+    Box = _Boxs2.default.Box,
+    VBox = _Boxs2.default.VBox;
+
+/**
+ * 移动端流程留言页签：对齐 PC 附件区 + 留言区
+ */
+
+var MessageBoard = function (_React$Component) {
+  _inherits(MessageBoard, _React$Component);
+
+  function MessageBoard(props) {
+    _classCallCheck(this, MessageBoard);
+
+    var _this = _possibleConstructorReturn(this, (MessageBoard.__proto__ || Object.getPrototypeOf(MessageBoard)).call(this, props));
+
+    _this.state = {
+      messageContent: '',
+      msglist: [],
+      replyDraft: {},
+      replyOpenId: '',
+      attmPreList: [],
+      pendingUploadList: [],
+      uploadKey: 0
+    };
+    return _this;
+  }
+
+  _createClass(MessageBoard, [{
+    key: 'componentDidMount',
+    value: function componentDidMount() {
+      this.reloadAll();
+    }
+  }, {
+    key: 'componentDidUpdate',
+    value: function componentDidUpdate(prevProps) {
+      if (prevProps.processInstanceId !== this.props.processInstanceId) {
+        this.reloadAll();
+      }
+    }
+  }, {
+    key: 'getLinkParams',
+    value: function getLinkParams() {
+      return {
+        modelflag: 'flow',
+        linkid: this.props.processInstanceId || ''
+      };
+    }
+  }, {
+    key: 'reloadAll',
+    value: function reloadAll() {
+      if (this.props.enableAttachmentArea === '1') {
+        this.loadAttachment();
+      }
+      if (this.props.enableMessageBoard === '1') {
+        this.loadMessages();
+      }
+    }
+  }, {
+    key: 'loadMessages',
+    value: function loadMessages() {
+      var t = this;
+      var params = this.getLinkParams();
+      if (!params.linkid) {
+        return;
+      }
+      _db2.default.FlowModuleAPI.getMessageReplyInfo(params).then(function (content) {
+        var data = content || {};
+        var msglist = data.msglist || [];
+        var replist = data.replist || [];
+        var withReplies = msglist.map(function (msg) {
+          var replies = replist.filter(function (r) {
+            return String(r.message_id) === String(msg.id);
+          });
+          return Object.assign({}, msg, { replies: replies });
+        });
+        t.setState({
+          msglist: withReplies,
+          replyOpenId: '',
+          replyDraft: {}
+        });
+      }).catch(function () {
+        _Toast2.default.show({ type: 'error', content: '加载留言失败' });
+      });
+    }
+  }, {
+    key: 'loadAttachment',
+    value: function loadAttachment() {
+      var t = this;
+      var params = this.getLinkParams();
+      if (!params.linkid) {
+        return;
+      }
+      _db2.default.FlowModuleAPI.getAttachmentAreaInfo(params).then(function (content) {
+        var data = content || {};
+        t.setState({
+          attmPreList: data.attmPreList || [],
+          pendingUploadList: [],
+          uploadKey: t.state.uploadKey + 1
+        });
+      }).catch(function () {
+        _Toast2.default.show({ type: 'error', content: '加载附件区失败' });
+      });
+    }
+  }, {
+    key: 'onMessageChange',
+    value: function onMessageChange(value) {
+      var text = value || '';
+      if (text.length > 1000) {
+        text = text.substring(0, 1000);
+      }
+      this.setState({ messageContent: text });
+    }
+  }, {
+    key: 'saveMessage',
+    value: function saveMessage() {
+      var t = this;
+      var content = (this.state.messageContent || '').trim();
+      if (!content) {
+        _Toast2.default.show({ type: 'error', content: '请输入留言' });
+        return;
+      }
+      var params = Object.assign({}, this.getLinkParams(), { messageContent: content });
+      _db2.default.FlowModuleAPI.saveMessageReply(params).then(function () {
+        _Toast2.default.show({ type: 'success', content: '添加成功！' });
+        t.setState({ messageContent: '' });
+        t.loadMessages();
+      }).catch(function (err) {
+        _Toast2.default.show({ type: 'error', content: err && err.errorMsg || '添加失败' });
+      });
+    }
+  }, {
+    key: 'toggleReply',
+    value: function toggleReply(msgId) {
+      this.setState({
+        replyOpenId: this.state.replyOpenId === msgId ? '' : msgId
+      });
+    }
+  }, {
+    key: 'onReplyChange',
+    value: function onReplyChange(msgId, value) {
+      var text = value || '';
+      if (text.length > 1000) {
+        text = text.substring(0, 1000);
+      }
+      var draft = Object.assign({}, this.state.replyDraft);
+      draft[msgId] = text;
+      this.setState({ replyDraft: draft });
+    }
+  }, {
+    key: 'saveReply',
+    value: function saveReply(msgId) {
+      var t = this;
+      var replyContent = ((this.state.replyDraft || {})[msgId] || '').trim();
+      if (!replyContent) {
+        _Toast2.default.show({ type: 'error', content: '请先填写留言回复的内容！' });
+        return;
+      }
+      _db2.default.FlowModuleAPI.saveMessageReplyDetails({
+        messageId: msgId,
+        replyContent: replyContent
+      }).then(function () {
+        _Toast2.default.show({ type: 'success', content: '添加成功！' });
+        t.loadMessages();
+      }).catch(function (err) {
+        _Toast2.default.show({ type: 'error', content: err && err.errorMsg || '回复失败' });
+      });
+    }
+  }, {
+    key: 'confirmDelete',
+    value: function confirmDelete(title, onOk) {
+      _Dialog2.default.confirm({
+        locale: 'zh_CN',
+        title: '提示',
+        content: title || '确认删除？',
+        onConfirm: function onConfirm() {
+          if (typeof onOk === 'function') {
+            onOk();
+          }
+        }
+      });
+    }
+  }, {
+    key: 'deleteMessage',
+    value: function deleteMessage(id) {
+      var t = this;
+      this.confirmDelete('确认删除该留言？', function () {
+        _db2.default.FlowModuleAPI.deleteMessageReply({ id: id }).then(function () {
+          _Toast2.default.show({ type: 'success', content: '删除成功' });
+          t.loadMessages();
+        }).catch(function (err) {
+          _Toast2.default.show({ type: 'error', content: err && err.errorMsg || '删除失败' });
+        });
+      });
+    }
+  }, {
+    key: 'deleteReply',
+    value: function deleteReply(id) {
+      var t = this;
+      this.confirmDelete('确认删除该回复？', function () {
+        _db2.default.FlowModuleAPI.deleteMessageReplyDetails({ id: id }).then(function () {
+          _Toast2.default.show({ type: 'success', content: '删除成功' });
+          t.loadMessages();
+        }).catch(function (err) {
+          _Toast2.default.show({ type: 'error', content: err && err.errorMsg || '删除失败' });
+        });
+      });
+    }
+  }, {
+    key: 'onUploadChange',
+    value: function onUploadChange(value) {
+      this.setState({ pendingUploadList: value || [] });
+    }
+  }, {
+    key: 'saveAttachment',
+    value: function saveAttachment() {
+      var t = this;
+      var list = this.state.pendingUploadList || [];
+      if (!list.length) {
+        _Toast2.default.show({ type: 'error', content: '请先添加附件' });
+        return;
+      }
+      var fileids = list.map(function (f) {
+        return f.id;
+      }).filter(Boolean).join('|');
+      if (!fileids) {
+        _Toast2.default.show({ type: 'error', content: '请先添加附件' });
+        return;
+      }
+      var params = Object.assign({}, this.getLinkParams(), {
+        fileids: fileids,
+        attEncrypts: ''
+      });
+      _db2.default.FlowModuleAPI.saveAttachmentArea(params).then(function () {
+        _Toast2.default.show({ type: 'success', content: '保存成功' });
+        t.loadAttachment();
+      }).catch(function (err) {
+        _Toast2.default.show({ type: 'error', content: err && err.errorMsg || '保存失败' });
+      });
+    }
+  }, {
+    key: 'deleteAttachment',
+    value: function deleteAttachment(item) {
+      var t = this;
+      this.confirmDelete('确认删除该附件？', function () {
+        _db2.default.FlowModuleAPI.deleteAttachmentArea({
+          id: item.attmAreaId,
+          fileId: item.id,
+          checksum: item.checksum || ''
+        }).then(function () {
+          _Toast2.default.show({ type: 'success', content: '删除成功' });
+          t.loadAttachment();
+        }).catch(function (err) {
+          _Toast2.default.show({ type: 'error', content: err && err.errorMsg || '删除失败' });
+        });
+      });
+    }
+  }, {
+    key: 'formatMsgDate',
+    value: function formatMsgDate(v) {
+      if (!v) {
+        return '';
+      }
+      if (typeof v === 'string') {
+        return v.length > 16 ? v.substring(0, 16) : v;
+      }
+      return String(v);
+    }
+  }, {
+    key: 'renderAttachmentBlock',
+    value: function renderAttachmentBlock() {
+      var t = this;
+      if (this.props.enableAttachmentArea !== '1') {
+        return null;
+      }
+      var attmList = this.state.attmPreList || [];
+      return _react2.default.createElement(
+        'div',
+        { className: 't-MB12' },
+        _react2.default.createElement(
+          'div',
+          { className: 't-PL16 t-PR16 t-PT12 t-PB8 t-FS15 t-FC3' },
+          '\u9644\u4EF6\u533A\uFF08',
+          attmList.length,
+          '\uFF09'
+        ),
+        _react2.default.createElement(
+          _Group2.default.List,
+          null,
+          _react2.default.createElement(
+            'div',
+            { className: 't-PL16 t-PR16 t-PB12' },
+            _react2.default.createElement(_upload2.default, {
+              key: 'msgAttUpload_' + t.state.uploadKey,
+              required: false,
+              canAdd: true,
+              canDel: true,
+              initList: [],
+              initIds: '',
+              dir: 'messageboard',
+              onChange: function onChange(value) {
+                t.onUploadChange(value);
+              },
+              onDel: function onDel(value) {
+                t.onUploadChange(value);
+              }
+            }),
+            _react2.default.createElement(
+              'div',
+              { className: 't-TR t-MT10' },
+              _react2.default.createElement(
+                _Button2.default,
+                { type: 'primary', size: 'small', display: 'inline', onClick: t.saveAttachment.bind(t) },
+                '\u6DFB\u52A0\u9644\u4EF6'
+              )
+            )
+          )
+        ),
+        attmList.map(function (item, idx) {
+          return _react2.default.createElement(
+            'div',
+            { key: 'attm_' + (item.attmAreaId || item.id || idx), className: 't-BCf t-PL16 t-PR16 t-PT12 t-PB12 dd-bottom-border' },
+            _react2.default.createElement(
+              HBox,
+              { vAlign: 'center' },
+              _react2.default.createElement(
+                Box,
+                { flex: 1, className: 't-FS14 t-FC3 t-omit' },
+                item.name || '附件'
+              ),
+              item.canDelete ? _react2.default.createElement(
+                Box,
+                null,
+                _react2.default.createElement(
+                  'span',
+                  { className: 't-FCred t-FS14', onClick: t.deleteAttachment.bind(t, item) },
+                  '\u5220\u9664'
+                )
+              ) : null
+            ),
+            _react2.default.createElement(
+              'div',
+              { className: 't-FS12 t-FCddfontblue-40 t-MT6' },
+              (item.createdBy || '') + ' ' + t.formatMsgDate(item.createdDate)
+            )
+          );
+        })
+      );
+    }
+  }, {
+    key: 'renderMessageBlock',
+    value: function renderMessageBlock() {
+      var t = this;
+      if (this.props.enableMessageBoard !== '1') {
+        return null;
+      }
+      var msglist = this.state.msglist || [];
+      return _react2.default.createElement(
+        'div',
+        null,
+        _react2.default.createElement(
+          'div',
+          { className: 't-PL16 t-PR16 t-PT12 t-PB8 t-FS15 t-FC3' },
+          '\u7559\u8A00\u533A\uFF08',
+          msglist.length,
+          '\uFF09'
+        ),
+        _react2.default.createElement(
+          _Group2.default.List,
+          null,
+          _react2.default.createElement(
+            'div',
+            { className: 't-PL16 t-PR16 t-PB12' },
+            _react2.default.createElement(_TextareaField2.default, {
+              label: '',
+              minRows: 3,
+              maxRows: 6,
+              placeholder: '\u8BF7\u8F93\u5165\u7559\u8A00',
+              value: t.state.messageContent,
+              onChange: t.onMessageChange.bind(t)
+            }),
+            _react2.default.createElement(
+              'div',
+              { className: 't-TR t-MT10' },
+              _react2.default.createElement(
+                _Button2.default,
+                { type: 'primary', size: 'small', display: 'inline', onClick: t.saveMessage.bind(t) },
+                '\u6DFB\u52A0\u7559\u8A00'
+              )
+            )
+          )
+        ),
+        msglist.map(function (msg) {
+          var replies = msg.replies || [];
+          var open = t.state.replyOpenId === msg.id;
+          return _react2.default.createElement(
+            'div',
+            { key: 'msg_' + msg.id, className: 't-BCf t-PL16 t-PR16 t-PT12 t-PB12 dd-bottom-border t-MB8' },
+            _react2.default.createElement(
+              HBox,
+              { vAlign: 'center' },
+              _react2.default.createElement(
+                Box,
+                { flex: 1, className: 't-FS13 t-FCddfontblue-40' },
+                (msg.msgusername || '') + ' ' + t.formatMsgDate(msg.msgdate) + ' 留言'
+              ),
+              msg.canDelete ? _react2.default.createElement(
+                Box,
+                null,
+                _react2.default.createElement(
+                  'span',
+                  { className: 't-FCred t-FS14', onClick: t.deleteMessage.bind(t, msg.id) },
+                  '\u5220\u9664'
+                )
+              ) : null
+            ),
+            _react2.default.createElement(
+              'div',
+              { className: 't-FS15 t-FC3 t-MT8', style: { wordBreak: 'break-all' } },
+              msg.message_content
+            ),
+            _react2.default.createElement(
+              'div',
+              { className: 't-TR t-MT8' },
+              _react2.default.createElement(
+                'span',
+                { className: 'theme-color t-FS14', onClick: t.toggleReply.bind(t, msg.id) },
+                '\u56DE\u590D'
+              )
+            ),
+            open ? _react2.default.createElement(
+              'div',
+              { className: 't-MT8' },
+              _react2.default.createElement(_TextareaField2.default, {
+                label: '',
+                minRows: 2,
+                maxRows: 5,
+                placeholder: '\u8BF7\u8F93\u5165\u56DE\u590D\u5185\u5BB9',
+                value: (t.state.replyDraft || {})[msg.id] || '',
+                onChange: function onChange(v) {
+                  t.onReplyChange(msg.id, v);
+                }
+              }),
+              _react2.default.createElement(
+                'div',
+                { className: 't-TR t-MT8' },
+                _react2.default.createElement(
+                  _Button2.default,
+                  { type: 'primary', size: 'small', display: 'inline', onClick: t.saveReply.bind(t, msg.id) },
+                  '\u63D0\u4EA4'
+                )
+              )
+            ) : null,
+            replies.map(function (rep) {
+              return _react2.default.createElement(
+                'div',
+                { key: 'rep_' + rep.id, className: 't-MT10 t-PL12', style: { borderLeft: '2px solid #e5e5e5' } },
+                _react2.default.createElement(
+                  HBox,
+                  { vAlign: 'center' },
+                  _react2.default.createElement(
+                    Box,
+                    { flex: 1, className: 't-FS12 t-FCddfontblue-40' },
+                    (rep.repusername || '') + ' ' + t.formatMsgDate(rep.repdate)
+                  ),
+                  rep.canDelete ? _react2.default.createElement(
+                    Box,
+                    null,
+                    _react2.default.createElement(
+                      'span',
+                      { className: 't-FCred t-FS12', onClick: t.deleteReply.bind(t, rep.id) },
+                      '\u5220\u9664'
+                    )
+                  ) : null
+                ),
+                _react2.default.createElement(
+                  'div',
+                  { className: 't-FS14 t-FC3 t-MT4', style: { wordBreak: 'break-all' } },
+                  rep.reply_content
+                )
+              );
+            })
+          );
+        }),
+        msglist.length === 0 ? _react2.default.createElement(
+          VBox,
+          { vAlign: 'center', hAlign: 'center', className: 't-PT40 t-PB40' },
+          _react2.default.createElement(
+            Box,
+            { className: 't-FCddfontblue-40 t-FS14' },
+            '\u6682\u65E0\u7559\u8A00'
+          )
+        ) : null
+      );
+    }
+  }, {
+    key: 'render',
+    value: function render() {
+      return _react2.default.createElement(
+        'div',
+        { className: 't-BCf7', style: { minHeight: 200 } },
+        this.renderAttachmentBlock(),
+        this.renderMessageBlock()
+      );
+    }
+  }]);
+
+  return MessageBoard;
+}(_react2.default.Component);
+
+exports.default = MessageBoard;

package/lib/process_info/processInfo.js

@@ -100,6 +100,10 @@ var _RelationProcess = require('./RelationProcess');
 
 var _RelationProcess2 = _interopRequireDefault(_RelationProcess);
 
+var _MessageBoard = require('./MessageBoard');
+
+var _MessageBoard2 = _interopRequireDefault(_MessageBoard);
+
 var _select = require('../selectMember/select');
 
 var _select2 = _interopRequireDefault(_select);
@@ -259,7 +263,20 @@ var PageHome = function (_React$Component) {
         var status = '0';
         var dataId = props.dataId;
         var editType = '';
-        isSub = props.isSub ? props.isSub : '';
+        // 再次发起路由末段为 isSub=2；兼容 props 未透传时从 hash 解析
+        isSub = props.isSub != null && props.isSub !== '' && props.isSub !== 'undefined' && props.isSub !== 'null' ? String(props.isSub) : '';
+        if (isSub === '') {
+            try {
+                var hashParts = (window.location.hash || '').replace(/^#\/?/, '').split('/');
+                // process/processDetails/.../module/userId/search/isSub → isSub 在下标 11
+                if (hashParts.length >= 12 && hashParts[1] === 'processDetails') {
+                    var lastSeg = hashParts[11];
+                    if (lastSeg === '1' || lastSeg === '2') {
+                        isSub = lastSeg;
+                    }
+                }
+            } catch (e) {}
+        }
         // if(isSub!=''){
         //     window.location.reload();
         // }
@@ -514,6 +531,8 @@ var PageHome = function (_React$Component) {
             endSelect: false,
             mobileFlowChar: '0', //是否开启流程图  1开启 0禁用
             mobileSubTblDefault: '1', //移动端子表默认 1展开 0收起；未设置按展开
+            enableMessageBoard: '0', //流程启用留言板
+            enableAttachmentArea: '0', //流程启用附件区
             readScopeId: '',
             readScopeList: [],
             readRangeType: '', //传阅范围 0全部 2本组织及下属组织 4自定义
@@ -996,6 +1015,8 @@ var PageHome = function (_React$Component) {
                     var mobileFlowChar = content.mobileFlowChar;
                     // 移动端子表默认：1展开 0收起；缺省按展开
                     var mobileSubTblDefault = content.mobileSubTblDefault != null && content.mobileSubTblDefault !== '' ? String(content.mobileSubTblDefault) : '1';
+                    var enableMessageBoard = content.enableMessageBoard != null && content.enableMessageBoard !== '' ? String(content.enableMessageBoard) : '0';
+                    var enableAttachmentArea = content.enableAttachmentArea != null && content.enableAttachmentArea !== '' ? String(content.enableAttachmentArea) : '0';
 
                     //项目开发模块统一扩展
                     var mobileModuleExt;
@@ -1635,6 +1656,8 @@ var PageHome = function (_React$Component) {
                         dealReminderContent: dealReminderContent,
                         mobileFlowChar: mobileFlowChar,
                         mobileSubTblDefault: mobileSubTblDefault,
+                        enableMessageBoard: enableMessageBoard,
+                        enableAttachmentArea: enableAttachmentArea,
                         readScopeId: readScopeId,
                         readScopeList: readScopeList,
                         readRangeType: readRangeType,
@@ -1827,6 +1850,11 @@ var PageHome = function (_React$Component) {
                 // }
                 for (var b = 0; b < buttonArray.length; b++) {
                     var buttonCode = buttonArray[b];
+                    // 再次发起(isSub=2)：无论 start/pending，都不展示作废
+                    var againStart = String(t.state.isSub != null && t.state.isSub !== '' ? t.state.isSub : isSub || '') === '2';
+                    if (againStart && buttonCode == 'BASE_INVALID') {
+                        continue;
+                    }
                     //PAGE_SAVE保存按钮只有当新建时才有，HELP_ADDLOTS加签只有在会签和串签才有,RADOM_FINISH随机流程完成按钮去掉
                     if (buttonCode == 'OTHER_RELATION' || 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') {
                         continue;
@@ -1889,8 +1917,21 @@ 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')) {
+                        // 与 PC 一致：发起人配置作废 + 进行中 + 当前待办在发起节点
+                        var processStatusNow = String(content.processStatus != null ? content.processStatus : content.status != null ? content.status : '');
+                        var backToInitiator = isStart == true || isStart == 'true';
+                        if (!backToInitiator && content.processLogList && content.processLogList.length > 0 && content.doingUserList && content.doingUserList.length > 0) {
+                            var startActId = content.processLogList[0].curactivityid;
+                            if (startActId) {
+                                for (var di = 0; di < content.doingUserList.length; di++) {
+                                    if (content.doingUserList[di].activityId == startActId) {
+                                        backToInitiator = true;
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+                        if (startButtons.indexOf('BASE_INVALID') >= 0 && processStatusNow == '1' && backToInitiator) {
                             buttonList.push({ name: t.state.finalButtons.get("BASE_INVALID"), type: 'danger', display: 'inline', no: 9 });
                         }
                     }
@@ -1917,7 +1958,8 @@ var PageHome = function (_React$Component) {
                         if (buttonCode == 'PAGE_SAVE' || buttonCode == 'BASE_SUMBIT') {
                             buttonArrayNew.push(buttonCode);
                         }
-                        if (buttonCode == 'BASE_INVALID' && dataId) {
+                        // 再次发起(isSub=2)不显示作废
+                        if (buttonCode == 'BASE_INVALID' && dataId && String(t.state.isSub || isSub || '') != '2') {
                             buttonArrayNew.push(buttonCode);
                         }
                     }
@@ -3418,13 +3460,13 @@ var PageHome = function (_React$Component) {
                             selectOptions.push(option);
                         });
 
-                        var processDataList = [{ value: '1', name: '保留', disable: false, checked: true, text: '保留' }, { value: '2', name: '清除', disable: false, checked: false, text: '清除(已办人的已办记录)' }];
+                        var processDataList = [{ value: '1', name: '保留', disable: false, checked: true, text: '保留' }, { value: '2', name: '删除流程数据', disable: false, checked: false, text: '删除流程数据' }];
                         t.setState({
                             allActivity: selectOptions, //所有环节名称
                             designActivity: selectOptions[0].value, //选择的提醒环节id
                             processDataList: processDataList,
                             processDataListDefault: processDataList[0],
-                            processData: '1', //1 保留流程数据，2清除已办数据
+                            processData: '1', //1 保留流程数据，2删除流程数据
                             operate: operate,
                             pageStatus: '1'
                         }, function () {
@@ -7197,6 +7239,13 @@ var PageHome = function (_React$Component) {
                         buttonCodeList.push({ 'buttonCode': 'subprocess', 'buttonName': '发起子流程' });
                     }
                     buttonCodeList = buttonCodeList.concat();
+                    // 再次发起不展示作废（后端可能仍返回 BASE_INVALID）
+                    var againStartBtn = String(_this4.state.isSub != null && _this4.state.isSub !== '' ? _this4.state.isSub : isSub || '') === '2';
+                    if (againStartBtn) {
+                        buttonCodeList = buttonCodeList.filter(function (item) {
+                            return item && item.buttonCode != 'BASE_INVALID';
+                        });
+                    }
                     var alllength = buttonCodeList.length + extensionButtonList.length;
                     if (alllength > 3) {
                         buttonList.push({ name: '更多', type: 'secondary', display: 'inline', no: -1 });
@@ -9086,7 +9135,20 @@ var PageHome = function (_React$Component) {
                                         _react2.default.createElement(_RelationProcess2.default, { ref: "relationProcess_list", taskId: this.state.taskId, processInstanceId: this.state.processInstanceId, listType: this.state.listType })
                                     )
                                 )
-                            )
+                            ),
+                            this.state.enableMessageBoard === '1' || this.state.enableAttachmentArea === '1' ? _react2.default.createElement(
+                                _Tab2.default.Item,
+                                { key: '4', title: '\u7559\u8A00' },
+                                _react2.default.createElement(
+                                    'div',
+                                    { className: this.state.activeItemIndex == 4 ? '' : 't-DN' },
+                                    _react2.default.createElement(_MessageBoard2.default, {
+                                        processInstanceId: this.state.processInstanceId,
+                                        enableMessageBoard: this.state.enableMessageBoard,
+                                        enableAttachmentArea: this.state.enableAttachmentArea
+                                    })
+                                )
+                            ) : ''
                         )
                     )
                 ),
@@ -9834,7 +9896,7 @@ var PageHome = function (_React$Component) {
                             value: this.state.endReason,
                             onChange: this.changeEndReasonText.bind(this) }),
                         _react2.default.createElement(_CheckboxField2.default, {
-                            className: 't-W100',
+                            className: 't-W100 remind-object-field',
                             required: false,
                             label: "提醒对象",
                             readOnly: false,
@@ -9870,7 +9932,7 @@ var PageHome = function (_React$Component) {
                             value: this.state.endReason,
                             onChange: this.changeEndReasonText.bind(this) }),
                         _react2.default.createElement(_CheckboxField2.default, {
-                            className: 't-W100',
+                            className: 't-W100 remind-object-field',
                             required: false,
                             label: "提醒对象",
                             readOnly: false,
@@ -9907,7 +9969,7 @@ var PageHome = function (_React$Component) {
                             value: this.state.processDataListDefault
                         }),
                         _react2.default.createElement(_CheckboxField2.default, {
-                            className: 't-W100',
+                            className: 't-W100 remind-object-field',
                             required: true,
                             label: "提醒对象",
                             readOnly: false,

package/lib/process_info/processInfo.less

@@ -4,4 +4,24 @@
 }
 .approve-org-switch-wrap{
     background: #fff;
+}
+
+/* 结束/不通过/作废「提醒对象」：已选文字勿压住右侧箭头（slot 模式 class 在 Field 根上） */
+.remind-object-field {
+    .t-checkbox-field-value-wrap,
+    .t-checkbox-field-value-list {
+        max-width: 100%;
+        padding-right: 8px;
+        box-sizing: border-box;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+    .t-field-pos-icon {
+        flex-shrink: 0;
+        margin-left: 4px;
+    }
+    .t-checkbox-field-icon-slot {
+        flex-shrink: 0;
+    }
 }

package/lib/process_list/processList.js

@@ -200,12 +200,20 @@ var ListItem = function (_React$Component) {
         try {
           _Popup2.default.hide();
         } catch (e) {}
+        var itemInfo = this.props.data;
+        var status = String(itemInfo.status != null ? itemInfo.status : '');
+        var canDelete = status === '3' || status === '4' || status === '5';
+        // 删除项用内联红色，避免主题色覆盖 ActionSheet destructive 样式
+        var options = canDelete ? [_react2.default.createElement(
+          'span',
+          { style: { color: '#F03118' } },
+          '\u5220\u9664'
+        ), '详情', '再次发送'] : ['详情', '再次发送'];
         _ActionSheet2.default.show({
-          options: ['详情', '再次发送'],
+          options: options,
+          destructiveButtonIndex: canDelete ? 0 : undefined,
           maskClosable: true
         }, function (index) {
-          var itemInfo = _this3.props.data;
-          console.log(itemInfo);
           var param_processKey = itemInfo.processKey; // 流程类型code
           var param_businessKey = itemInfo.businessKey; // 表单数据id;
           var param_startUserId = itemInfo.startUserId; // 流程发起人id
@@ -215,9 +223,41 @@ var ListItem = function (_React$Component) {
           var type = _this3.props.fromType; //self：本应用，all:全模块
           var projectPath = _this3.props.projectPath; //项目路径
 
-          if (index == 0) {
+          var detailIndex = canDelete ? 1 : 0;
+          var resendIndex = canDelete ? 2 : 1;
+          if (canDelete && index == 0) {
+            var t = _this3;
+            _Dialog2.default.confirm({
+              locale: 'zh_CN',
+              title: '提示',
+              content: '确定删除该流程吗？',
+              onConfirm: function onConfirm() {
+                _db2.default.FlowModuleAPI.delMyProcess({
+                  processInstanceId: itemInfo.processInstanceId,
+                  module: module || 'approve'
+                }).then(function () {
+                  _Toast2.default.show({ type: 'success', content: '删除成功' });
+                  if (typeof t.props.onRefresh === 'function') {
+                    t.props.onRefresh();
+                  } else {
+                    try {
+                      window.location.reload();
+                    } catch (e) {}
+                  }
+                }).catch(function (error) {
+                  _Toast2.default.show({
+                    type: 'error',
+                    content: error && (error.errorMsg || error.message) || '删除失败'
+                  });
+                });
+              },
+              onCancel: function onCancel() {}
+            });
+            return;
+          }
+          if (index == detailIndex) {
             _this3.openProcessDetails(itemInfo, param_list_type);
-          } else if (index == 1) {
+          } else if (index == resendIndex) {
             var param = {
               code: param_processKey
             };
@@ -328,10 +368,10 @@ var ListItem = function (_React$Component) {
           }
         } else {
           if (this.props.ableClick) {
-            var itemInfo = this.props.data;
-            console.log(itemInfo);
+            var _itemInfo = this.props.data;
+            console.log(_itemInfo);
             var param_list_type = this.props.listTabType;
-            this.openProcessDetails(itemInfo, param_list_type);
+            this.openProcessDetails(_itemInfo, param_list_type);
           } else {
             this.props.updateAbleClick(true);
           }
@@ -546,7 +586,7 @@ var ListItem = function (_React$Component) {
             { className: this.props.isBatch == false ? 't-DN' : 'approve-check' },
             _react2.default.createElement(
               Box,
-              { className: this.props.isBatch == false ? 't-DN' : 't-checkbox-field-icon-list un-checked t-MR10', 'data-taskId': this.props.id, 'data-module': this.props.module, 'data-processInstanceId': this.props.processInstanceId },
+              { className: this.props.isBatch == false ? 't-DN' : 't-checkbox-field-icon-list un-checked t-MR10', 'data-taskid': this.props.id, 'data-module': this.props.module, 'data-processinstanceid': this.props.processInstanceId },
               _react2.default.createElement('i', { className: 'iconfont icon-checked t-FCf t-FS14' })
             )
           ),
@@ -1199,7 +1239,7 @@ var PageHome = function (_React$Component2) {
         var _module = '';
         $(".checked").map(function (index, item) {
           taskIds += $(item).attr("data-taskid") + ",";
-          processInstanceIds += $(item).attr("data-processInstanceId") + ",";
+          processInstanceIds += $(item).attr("data-processinstanceid") + ",";
 
           if (index == 0) {
             taskId = $(item).attr("data-taskid");
@@ -1305,7 +1345,7 @@ var PageHome = function (_React$Component2) {
         var permissionCode = "unRead";
         $(".checked").map(function (index, item) {
           taskIds += $(item).attr("data-taskid") + ",";
-          processInstanceIds += $(item).attr("data-processInstanceId") + ",";
+          processInstanceIds += $(item).attr("data-processinstanceid") + ",";
 
           if (index == 0) {
             module = $(item).attr("data-module");
@@ -1518,7 +1558,7 @@ var PageHome = function (_React$Component2) {
               ),
               _react2.default.createElement(
                 Box,
-                { className: this.state.hasBatch ? this.state.isBatch ? "t-FCc t-PR16" : "theme-color t-PR16" : "t-DN", isBatch: this.state.isBatch, onClick: this.clickBatch.bind(this, this.state.isBatch) },
+                { className: this.state.hasBatch ? this.state.isBatch ? "t-FCc t-PR16" : "theme-color t-PR16" : "t-DN", onClick: this.clickBatch.bind(this, this.state.isBatch) },
                 '\u6279\u91CF'
               )
             ),
@@ -1683,7 +1723,11 @@ var PageHome = function (_React$Component2) {
                   currentPageKey: 'page'
 
                 },
-                _react2.default.createElement(ListItem, { listTabType: '4', ableClick: this.state.ableClick, isBatch: this.state.isBatch, fromType: this.state.type, projectPath: this.state.projectPath, updateAbleClick: this.updateAbleClick.bind(this) })
+                _react2.default.createElement(ListItem, { listTabType: '4', ableClick: this.state.ableClick, isBatch: this.state.isBatch, fromType: this.state.type, projectPath: this.state.projectPath, updateAbleClick: this.updateAbleClick.bind(this), onRefresh: function onRefresh() {
+                    if (_this7.refs.transaction_myself_ref) {
+                      _this7.refs.transaction_myself_ref.fetchData({ type: 'refresh' });
+                    }
+                  } })
               )
             )
           ) : ""

package/lib/process_list/processList.less

@@ -6,4 +6,9 @@
 
 .t-mask {
     display: none !important;
-}
+}
+
+/* 我的流程 ActionSheet「删除」强制红字 */
+.t-action-sheet-panel-item.t-action-sheet-panel-item-destructive {
+    color: #F03118 !important;
+}

package/package.json

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