fmui-base 2.3.57 → 2.3.59

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.3.59：移动端不通过的流程允许作废，移动端支持关联流程
+- 2.3.58：移动端数据表设置字段的关联值支持用户岗位
 - 2.3.57：移动端自动通过返回后打开表单报错
 - 2.3.56：移动端再次发起自动编号重新生成
 - 2.3.55：作废、结束、不通过弹框样式修改

package/lib/db/db.js

@@ -383,6 +383,29 @@ context.create('FlowModuleAPI', {
       });
     }
   },
+  getRelationProcessList: {
+    url: _variables2.default.URLS.getRelationProcessList,
+    method: 'GET',
+    header: {
+      Authorization: 'Bearer ' + getLoginUserInfo().token
+    },
+    willFetch: function willFetch() {}
+  },
+  deleteRelation: {
+    url: _variables2.default.URLS.deleteRelation,
+    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
+      });
+    }
+  },
   startFlowTest: {
     url: _variables2.default.URLS.startFlowTest,
     method: 'POST',

package/lib/db/variables.js

@@ -72,6 +72,8 @@ exports.default = {
         getComponentInfoList: urlBasicPrefix + 'mobilehall/mobileoffice/getComponentInfoList' + '?', //获取关联表单字段
 
         insertBatchRelation: approveUrlPrefix + 'insertBatchRelation' + '?', // 关联流程
+        getRelationProcessList: approveUrlPrefix + 'getRelationProcessList' + '?', // 可选关联流程列表
+        deleteRelation: approveUrlPrefix + 'deleteRelation' + '?', // 删除关联流程
         startFlowTest: approveUrlPrefix + 'startFlowTest' + '?', // 检验间隔时间
         startProcess: approveUrlPrefix + 'startProcess' + '?', // 启动流程的接口
         claimTask: approveUrlPrefix + 'claimTask' + '?', //校验流程

package/lib/form/form.js

@@ -3503,6 +3503,8 @@ var PageHome = function (_React$Component) {
                       mainTblDataItem.value = userInfo.userTelephone;
                     } else if (relatepopuservalue == 'relateuserdutyname') {
                       mainTblDataItem.value = userInfo.dutyName;
+                    } else if (relatepopuservalue == 'relateuserstationname') {
+                      mainTblDataItem.value = userInfo.stationName || '';
                     } else if (relatepopuservalue == 'relateusercardid') {
                       mainTblDataItem.value = userInfo.cardId;
                     } else if (relatepopuservalue == 'relateusersex') {
@@ -3531,6 +3533,8 @@ var PageHome = function (_React$Component) {
                           mainTblDataItem.value = userInfo.userTelephone;
                         } else if (relatepopuservalue == 'relateuserdutyname') {
                           mainTblDataItem.value = userInfo.dutyName;
+                        } else if (relatepopuservalue == 'relateuserstationname') {
+                          mainTblDataItem.value = userInfo.stationName || '';
                         } else if (relatepopuservalue == 'relateusercardid') {
                           mainTblDataItem.value = userInfo.cardId;
                         } else if (relatepopuservalue == 'relateusersex') {

package/lib/process_info/RelationProcess.js

@@ -15,6 +15,14 @@ var _Boxs = require('saltui/lib/Boxs');
 
 var _Boxs2 = _interopRequireDefault(_Boxs);
 
+var _Dialog = require('saltui/lib/Dialog');
+
+var _Dialog2 = _interopRequireDefault(_Dialog);
+
+var _Toast = require('saltui/lib/Toast');
+
+var _Toast2 = _interopRequireDefault(_Toast);
+
 var _AngleRight = require('salt-icon/lib/AngleRight');
 
 var _AngleRight2 = _interopRequireDefault(_AngleRight);
@@ -50,34 +58,119 @@ var Page = function (_React$Component) {
     _this.state = {
       relationList: []
     };
-
     return _this;
   }
 
   _createClass(Page, [{
     key: 'componentDidMount',
     value: function componentDidMount() {
+      this.reload();
+    }
+  }, {
+    key: 'componentDidUpdate',
+    value: function componentDidUpdate(prevProps) {
+      if (prevProps.processInstanceId !== this.props.processInstanceId && this.props.processInstanceId) {
+        this.reload();
+      }
+    }
+  }, {
+    key: 'reload',
+    value: function reload() {
       var t = this;
-      t.setState({
-        relationList: []
-      });
       var processInstanceId = this.props.processInstanceId;
+      if (!processInstanceId || processInstanceId === '-99' || processInstanceId === 'undefined') {
+        t.setState({ relationList: [] });
+        if (typeof t.props.onCountChange === 'function') {
+          t.props.onCountChange(0);
+        }
+        return;
+      }
       _db2.default.FlowModuleAPI.getRelationProcess({ processInstanceId: processInstanceId }).then(function (content) {
+        var list = [];
+        if (Array.isArray(content)) {
+          list = content;
+        } else if (content && Array.isArray(content.data)) {
+          list = content.data;
+        } else if (content && Array.isArray(content.content)) {
+          list = content.content;
+        } else if (content && content.list && Array.isArray(content.list)) {
+          list = content.list;
+        }
         t.setState({
-          relationList: content
+          relationList: list
+        }, function () {
+          if (typeof t.props.onCountChange === 'function') {
+            t.props.onCountChange(list.length);
+          }
         });
-      }).catch(function (error) {});
+      }).catch(function () {
+        t.setState({ relationList: [] });
+        if (typeof t.props.onCountChange === 'function') {
+          t.props.onCountChange(0);
+        }
+      });
     }
   }, {
     key: 'clickDetail',
     value: function clickDetail(item) {
       var processInstanceId = item.processInstanceId;
-      var formId = item.formId;
-      var module = item.module;
-      var url = "process/processDetails/-99/" + formId + "/-99/-99/0/" + processInstanceId + "/" + module;
+      var formId = item.formId || '-99';
+      var module = item.module || 'approve';
+      var url = 'process/processDetails/-99/' + formId + '/-99/-99/0/' + processInstanceId + '/' + module;
       decodeURI(url);
       location.hash = url;
-      //location.reload();
+    }
+  }, {
+    key: 'canDelete',
+    value: function canDelete(item) {
+      var canManage = this.props.canManage === true || this.props.canManage === '1';
+      if (!canManage) {
+        return false;
+      }
+      if (String(item.canDel) !== '1') {
+        return false;
+      }
+      var currentActivityId = this.props.activityId;
+      if (currentActivityId == null || currentActivityId === '') {
+        return false;
+      }
+      return String(item.activityId) === String(currentActivityId);
+    }
+  }, {
+    key: 'deleteRelation',
+    value: function deleteRelation(item, e) {
+      if (e && e.stopPropagation) {
+        e.stopPropagation();
+      }
+      var t = this;
+      var processInstanceId = t.props.processInstanceId;
+      var relationId = item.processInstanceId;
+      _Dialog2.default.confirm({
+        locale: 'zh_CN',
+        title: '提示',
+        content: '确定删除该关联流程吗？',
+        onConfirm: function onConfirm() {
+          _db2.default.FlowModuleAPI.deleteRelation({
+            processInstanceId: processInstanceId,
+            relationId: relationId
+          }).then(function () {
+            _Toast2.default.show({
+              type: 'success',
+              content: '删除成功'
+            });
+            t.reload();
+            if (typeof t.props.onDeleted === 'function') {
+              t.props.onDeleted();
+            }
+          }).catch(function () {
+            _Toast2.default.show({
+              type: 'error',
+              content: '删除失败'
+            });
+          });
+        },
+        onCancel: function onCancel() {}
+      });
     }
   }, {
     key: 'render',
@@ -89,10 +182,10 @@ var Page = function (_React$Component) {
         t.state.relationList.map(function (item, i) {
           return _react2.default.createElement(
             HBox,
-            { className: 't-BCf t-P16 t-PR12 dd-bottom-border', onClick: t.clickDetail.bind(this, item) },
+            { key: (item.processInstanceId || '') + '_' + i, className: 't-BCf t-P16 t-PR12 dd-bottom-border', vAlign: 'center' },
             _react2.default.createElement(
               Box,
-              { flex: 1 },
+              { flex: 1, onClick: t.clickDetail.bind(t, item) },
               _react2.default.createElement(
                 'div',
                 { className: 't-omit t-FC3 t-FS16 t-LH1_3 t-MR8' },
@@ -134,16 +227,21 @@ var Page = function (_React$Component) {
                 )
               )
             ),
+            t.canDelete(item) ? _react2.default.createElement(
+              Box,
+              { className: 't-PL8 t-PR8 t-FCred t-FS14', onClick: t.deleteRelation.bind(t, item) },
+              '\u5220\u9664'
+            ) : null,
             _react2.default.createElement(
               Box,
-              null,
+              { onClick: t.clickDetail.bind(t, item) },
               _react2.default.createElement(_AngleRight2.default, { width: 20, fill: '#ccc', className: 'demo-t-list-arrow' })
             )
           );
         }.bind(this)),
         _react2.default.createElement(
           'div',
-          { className: t.state.relationList.length == 0 ? "nodata-wrapper" : "t-DN" },
+          { className: t.state.relationList.length == 0 ? 'nodata-wrapper' : 't-DN' },
           _react2.default.createElement(
             VBox,
             { vAlign: 'center', hAlign: 'center', className: 'nodata' },

package/lib/process_info/RelationProcessPicker.js

@@ -0,0 +1,509 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = undefined;
+
+var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+
+var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+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 _SearchBar = require('saltui/lib/SearchBar');
+
+var _SearchBar2 = _interopRequireDefault(_SearchBar);
+
+var _Button = require('saltui/lib/Button');
+
+var _Button2 = _interopRequireDefault(_Button);
+
+var _Toast = require('saltui/lib/Toast');
+
+var _Toast2 = _interopRequireDefault(_Toast);
+
+var _Boxs = require('saltui/lib/Boxs');
+
+var _Boxs2 = _interopRequireDefault(_Boxs);
+
+var _db = require('../db/db');
+
+var _db2 = _interopRequireDefault(_db);
+
+var _variables = require('../db/variables');
+
+var _variables2 = _interopRequireDefault(_variables);
+
+var _ScrollList = require('../ScrollList/ScrollList');
+
+var _ScrollList2 = _interopRequireDefault(_ScrollList);
+
+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;
+
+
+var PAGE_SIZE = 10;
+
+/** 列表项：已关联则禁用多选框，但仍展示 */
+function RelationPickItem(props) {
+  var item = props.data || props;
+  if (item._hidden) {
+    return null;
+  }
+  var pid = String(item.processInstanceId || item.id || '');
+  var disabled = !!item._relatedDisabled;
+  var checked = !!props.isChecked;
+  var createTime = item.createTime || item.startTime || '';
+  return _react2.default.createElement(
+    HBox,
+    {
+      className: 't-BCf t-P16 t-PR12 dd-bottom-border' + (disabled ? ' relation-pick-item-disabled' : ''),
+      vAlign: 'center',
+      onClick: function onClick() {
+        if (disabled) {
+          return;
+        }
+        if (typeof props.onToggle === 'function') {
+          props.onToggle(item);
+        }
+      }
+    },
+    _react2.default.createElement(
+      Box,
+      {
+        className: disabled ? 't-checkbox-field-icon-list un-checked disabled' : checked ? 't-checkbox-field-icon checked t-checkbox-field-icon-list' : 't-checkbox-field-icon-list un-checked',
+        style: disabled ? { opacity: 0.4, background: 'rgba(31,56,88,.15)' } : undefined
+      },
+      _react2.default.createElement('i', { className: 'iconfont icon-checked t-FCf t-FS14' })
+    ),
+    _react2.default.createElement(
+      Box,
+      { flex: 1, className: 't-PL12', style: { minWidth: 0 } },
+      _react2.default.createElement(
+        'div',
+        { className: 't-omit t-FS16 t-LH1_3 ' + (disabled ? 't-FCc' : 't-FC3') },
+        item.title || '',
+        disabled ? _react2.default.createElement(
+          'span',
+          { className: 't-FS12 t-ML8 t-FCc' },
+          '\uFF08\u5DF2\u5173\u8054\uFF09'
+        ) : null
+      ),
+      _react2.default.createElement(
+        HBox,
+        { className: 't-FCddfontblue-40 t-LH1_3 t-PT8 t-FS14', vAlign: 'center' },
+        _react2.default.createElement(
+          Box,
+          null,
+          _react2.default.createElement(
+            'span',
+            { className: 't-omit t-MR16' },
+            item.startUserName || ''
+          )
+        ),
+        _react2.default.createElement(
+          Box,
+          { flex: 1, style: { minWidth: 0 } },
+          _react2.default.createElement(
+            'span',
+            { className: 't-omit' },
+            createTime
+          )
+        )
+      )
+    )
+  );
+}
+
+/**
+ * 移动端关联流程选择：标题搜索 + ScrollList 触底分页
+ * 已关联：展示但禁用勾选；分页按服务端 count 判断，避免过滤后误判「没有更多了」
+ */
+
+var RelationProcessPicker = function (_React$Component) {
+  _inherits(RelationProcessPicker, _React$Component);
+
+  function RelationProcessPicker(props) {
+    _classCallCheck(this, RelationProcessPicker);
+
+    var _this = _possibleConstructorReturn(this, (RelationProcessPicker.__proto__ || Object.getPrototypeOf(RelationProcessPicker)).call(this, props));
+
+    _this.state = {
+      title: '',
+      selectedMap: {},
+      list: [],
+      page: 1,
+      total: 0,
+      fetchedCount: 0,
+      loading: false,
+      refreshing: false,
+      dataGetted: false,
+      noMore: false,
+      hasError: false
+    };
+    _this.searchTimer = null;
+    return _this;
+  }
+
+  _createClass(RelationProcessPicker, [{
+    key: 'componentDidMount',
+    value: function componentDidMount() {
+      this.fetchPage(1, true);
+    }
+  }, {
+    key: 'componentWillUnmount',
+    value: function componentWillUnmount() {
+      if (this.searchTimer) {
+        clearTimeout(this.searchTimer);
+      }
+    }
+  }, {
+    key: 'getExcludeIdSet',
+    value: function getExcludeIdSet() {
+      var excludeIds = this.props.excludeIds || [];
+      var set = {};
+      for (var i = 0; i < excludeIds.length; i++) {
+        if (excludeIds[i]) {
+          set[String(excludeIds[i])] = true;
+        }
+      }
+      var currentId = this.props.processInstanceId;
+      if (currentId) {
+        set[String(currentId)] = true;
+      }
+      return set;
+    }
+  }, {
+    key: 'isRelated',
+    value: function isRelated(item) {
+      var excludeSet = this.getExcludeIdSet();
+      var pid = item.processInstanceId || item.id;
+      return !!(pid && excludeSet[String(pid)]);
+    }
+  }, {
+    key: 'markList',
+    value: function markList(rawList) {
+      var selfId = String(this.props.processInstanceId || '');
+      var marked = [];
+      if (!rawList || !rawList.length) {
+        return marked;
+      }
+      for (var i = 0; i < rawList.length; i++) {
+        var row = Object.assign({}, rawList[i]);
+        var pid = String(row.processInstanceId || row.id || '');
+        // 当前流程标记隐藏（不删数组项，避免影响分页长度判断；渲染时跳过）
+        if (pid && selfId && pid === selfId) {
+          row._hidden = true;
+        }
+        row._relatedDisabled = this.isRelated(row);
+        marked.push(row);
+      }
+      return marked;
+    }
+  }, {
+    key: 'parsePayload',
+    value: function parsePayload(content) {
+      var payload = content;
+      // 兼容 DB 解包后 / 未解包 / 再包一层 content
+      if (content && content.content && _typeof(content.content) === 'object' && !Array.isArray(content.content)) {
+        var inner = content.content;
+        if (inner.data || inner.count != null || inner.content) {
+          payload = inner;
+        }
+      }
+      if (payload && payload.content && _typeof(payload.content) === 'object' && !Array.isArray(payload.content) && (payload.content.data || payload.content.count != null)) {
+        payload = payload.content;
+      }
+      var list = [];
+      if (payload && Array.isArray(payload.data)) {
+        list = payload.data;
+      } else if (Array.isArray(payload)) {
+        list = payload;
+      }
+      var total = 0;
+      if (payload && payload.count != null && payload.count !== '') {
+        total = Number(payload.count);
+      } else if (payload && payload.totalElements != null) {
+        total = Number(payload.totalElements);
+      } else if (payload && payload.total != null) {
+        total = Number(payload.total);
+      }
+      if (isNaN(total) || total < 0) {
+        total = 0;
+      }
+      return { list: list, total: total };
+    }
+  }, {
+    key: 'fetchPage',
+    value: function fetchPage(page, replace) {
+      var t = this;
+      if (t.state.loading) {
+        return;
+      }
+      t.setState(replace ? { refreshing: true, loading: true } : { loading: true, hasError: false });
+      _db2.default.FlowModuleAPI.getRelationProcessList({
+        title: t.state.title || '',
+        page: page,
+        limit: PAGE_SIZE,
+        pageSize: PAGE_SIZE
+      }).then(function (content) {
+        var parsed = t.parsePayload(content);
+        var marked = t.markList(parsed.list);
+        // 累计「原始返回条数」判断是否还有下一页；隐藏当前流程不缩短累计长度
+        var fetchedLen = (replace ? 0 : t.state.fetchedCount || 0) + parsed.list.length;
+        var nextList = replace ? marked : t.state.list.concat(marked);
+        var total = parsed.total;
+        // 仅按服务端 count 判断；绝不能用过滤/隐藏后的 list.length < pageSize
+        var noMore = false;
+        if (total > 0) {
+          noMore = fetchedLen >= total;
+        } else {
+          noMore = parsed.list.length === 0;
+        }
+        t.setState({
+          list: nextList,
+          page: page,
+          total: total,
+          fetchedCount: fetchedLen,
+          loading: false,
+          refreshing: false,
+          dataGetted: true,
+          noMore: noMore,
+          hasError: false
+        });
+      }).catch(function () {
+        t.setState({
+          loading: false,
+          refreshing: false,
+          dataGetted: true,
+          hasError: true
+        });
+        _Toast2.default.show({
+          type: 'error',
+          content: '加载可选流程失败'
+        });
+      });
+    }
+  }, {
+    key: 'onSearchChange',
+    value: function onSearchChange(value) {
+      var t = this;
+      t.setState({ title: value });
+      if (t.searchTimer) {
+        clearTimeout(t.searchTimer);
+      }
+      t.searchTimer = setTimeout(function () {
+        t.fetchPage(1, true);
+      }, 400);
+    }
+  }, {
+    key: 'onSearch',
+    value: function onSearch(value) {
+      var _this2 = this;
+
+      this.setState({ title: value }, function () {
+        _this2.fetchPage(1, true);
+      });
+    }
+  }, {
+    key: 'onRefresh',
+    value: function onRefresh() {
+      this.fetchPage(1, true);
+    }
+  }, {
+    key: 'onLoad',
+    value: function onLoad() {
+      if (this.state.noMore || this.state.loading) {
+        return;
+      }
+      this.fetchPage(this.state.page + 1, false);
+    }
+  }, {
+    key: 'toggleSelect',
+    value: function toggleSelect(item) {
+      if (!item || item._hidden || item._relatedDisabled || this.isRelated(item)) {
+        return;
+      }
+      var pid = String(item.processInstanceId || item.id || '');
+      if (!pid) {
+        return;
+      }
+      var selectedMap = Object.assign({}, this.state.selectedMap);
+      if (selectedMap[pid]) {
+        delete selectedMap[pid];
+      } else {
+        selectedMap[pid] = item;
+      }
+      this.setState({ selectedMap: selectedMap });
+    }
+  }, {
+    key: 'closePage',
+    value: function closePage() {
+      if (typeof this.props.onClose === 'function') {
+        this.props.onClose();
+        return;
+      }
+      if (typeof this.props.onCancel === 'function') {
+        this.props.onCancel();
+      }
+    }
+  }, {
+    key: 'handleCancel',
+    value: function handleCancel() {
+      this.closePage();
+    }
+  }, {
+    key: 'handleConfirm',
+    value: function handleConfirm() {
+      var t = this;
+      var keys = Object.keys(t.state.selectedMap);
+      if (!keys.length) {
+        _Toast2.default.show({
+          type: 'error',
+          content: '请选择记录'
+        });
+        return;
+      }
+      var processInstanceId = t.props.processInstanceId;
+      if (!processInstanceId) {
+        _Toast2.default.show({
+          type: 'error',
+          content: '请先保存/提交生成流程后再关联'
+        });
+        return;
+      }
+      _db2.default.FlowModuleAPI.insertBatchRelation({
+        processInstanceId: processInstanceId,
+        relationIds: keys.join(','),
+        activityId: t.props.activityId || '',
+        dataInherit: ''
+      }).then(function () {
+        _Toast2.default.show({
+          type: 'success',
+          content: '关联成功'
+        });
+        t.closePage();
+        if (typeof t.props.onSuccess === 'function') {
+          t.props.onSuccess();
+        }
+      }).catch(function () {
+        _Toast2.default.show({
+          type: 'error',
+          content: '关联失败'
+        });
+      });
+    }
+  }, {
+    key: 'render',
+    value: function render() {
+      var t = this;
+      var selectedMap = t.state.selectedMap;
+      var selectedCount = Object.keys(selectedMap).length;
+      var searchBarProps = {
+        locale: 'zh_CN',
+        placeholder: '搜索流程标题',
+        instantSearch: true,
+        hasHistory: false,
+        searchDelay: 400,
+        onChange: t.onSearchChange.bind(t),
+        onSearch: t.onSearch.bind(t)
+      };
+      var winH = typeof window !== 'undefined' && window.innerHeight ? window.innerHeight : 600;
+      var listH = Math.max(winH - 160, 240);
+      return _react2.default.createElement(
+        'div',
+        {
+          className: 't-W100 t-BCf relation-process-picker',
+          style: {
+            width: '100%',
+            height: winH + 'px',
+            display: 'flex',
+            flexDirection: 'column',
+            boxSizing: 'border-box'
+          }
+        },
+        _react2.default.createElement(
+          HBox,
+          { vAlign: 'center', className: 't-PL16 t-PR16 t-PT12 t-PB12 t-BB1', style: { flexShrink: 0 } },
+          _react2.default.createElement(
+            Box,
+            { flex: 1, className: 't-FS16 t-FAC' },
+            '\u5173\u8054\u6D41\u7A0B'
+          )
+        ),
+        _react2.default.createElement(
+          'div',
+          { className: 't-BCf', style: { flexShrink: 0 } },
+          _react2.default.createElement(_SearchBar2.default, _extends({}, searchBarProps, { value: t.state.title }))
+        ),
+        _react2.default.createElement(
+          'div',
+          { style: { flex: 1, minHeight: 0, height: listH + 'px' }, className: 'relation-process-picker-scroll' },
+          _react2.default.createElement(
+            _ScrollList2.default,
+            {
+              dataGetted: t.state.dataGetted,
+              data: t.state.list,
+              loading: t.state.loading,
+              refreshing: t.state.refreshing,
+              noMore: t.state.noMore,
+              hasError: t.state.hasError,
+              onRefresh: t.onRefresh.bind(t),
+              onLoad: t.onLoad.bind(t),
+              scrollLoad: true,
+              scrollRefresh: true,
+              noDataImage: _variables2.default.nodataIcon,
+              noDataTip: '\u6682\u65E0\u6570\u636E',
+              noMoreDataTip: '\u6CA1\u6709\u66F4\u591A\u4E86'
+            },
+            function (item, i) {
+              var pid = String(item.processInstanceId || item.id || '');
+              return _react2.default.createElement(RelationPickItem, {
+                key: pid + '_' + i,
+                data: item,
+                isChecked: !!selectedMap[pid],
+                onToggle: t.toggleSelect.bind(t)
+              });
+            }
+          )
+        ),
+        _react2.default.createElement(
+          'div',
+          { className: 't-P0', style: { flexShrink: 0 } },
+          _react2.default.createElement(
+            _Button2.default.Group,
+            null,
+            _react2.default.createElement(
+              _Button2.default,
+              { type: 'secondary', display: 'banner', onClick: t.handleCancel.bind(t) },
+              '\u53D6\u6D88'
+            ),
+            _react2.default.createElement(
+              _Button2.default,
+              { type: 'primary', display: 'banner', onClick: t.handleConfirm.bind(t) },
+              '\u786E\u5B9A',
+              selectedCount > 0 ? '(' + selectedCount + ')' : ''
+            )
+          )
+        )
+      );
+    }
+  }]);
+
+  return RelationProcessPicker;
+}(_react2.default.Component);
+
+exports.default = RelationProcessPicker;

package/lib/process_info/processInfo.js

@@ -100,6 +100,10 @@ var _RelationProcess = require('./RelationProcess');
 
 var _RelationProcess2 = _interopRequireDefault(_RelationProcess);
 
+var _RelationProcessPicker = require('./RelationProcessPicker');
+
+var _RelationProcessPicker2 = _interopRequireDefault(_RelationProcessPicker);
+
 var _MessageBoard = require('./MessageBoard');
 
 var _MessageBoard2 = _interopRequireDefault(_MessageBoard);
@@ -534,6 +538,8 @@ var PageHome = function (_React$Component) {
             mobileSubTblDefault: '1', //移动端子表默认 1展开 0收起；未设置按展开
             enableMessageBoard: '0', //流程启用留言板
             enableAttachmentArea: '0', //流程启用附件区
+            relationCount: 0, //关联流程数量
+            hasRelationBtn: false, //当前是否具备关联流程按钮权限
             readScopeId: '',
             readScopeList: [],
             readRangeType: '', //传阅范围 0全部 2本组织及下属组织 4自定义
@@ -1616,6 +1622,7 @@ var PageHome = function (_React$Component) {
                         defaultValue: defaultValue,
                         commentId: commentId,
                         buttons: buttons,
+                        hasRelationBtn: (',' + (buttons || '') + ',').indexOf(',OTHER_RELATION,') !== -1,
                         startButtons: startButtons,
                         code: content.code,
                         formItem: formItem,
@@ -1685,6 +1692,11 @@ var PageHome = function (_React$Component) {
                         startUserOrgId: content.startUserOrgId || content.startUserGroupId || '',
                         taskAssignOrgId: content.taskAssignOrgId || ''
                     }, function () {
+                        // 进页即拉取关联数量（显式传当前实例 id，避免 state 未齐）
+                        try {
+                            var pidForRelation = t.state.processInstanceId || t.props.processInstanceId;
+                            t.loadRelationCount(pidForRelation);
+                        } catch (eCount) {}
                         if (t._pendingCommentRestore != null && t._pendingCommentRestore !== '') {
                             var restoredComment = t._pendingCommentRestore;
                             t._pendingCommentRestore = null;
@@ -1857,11 +1869,12 @@ var PageHome = function (_React$Component) {
                         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') {
+                    // OTHER_RELATION 移动端已支持，不再跳过
+                    if (buttonCode == 'FLOW_REVOKE' || buttonCode == 'RADOM_FINISH' || buttonCode == 'FLOW_CANCEL' || buttonCode == 'FLOW_RECOVER' || buttonCode == 'PAGE_PRINT' || buttonCode == 'PAGE_URGE' || buttonCode == 'PAGE_REDSET' || buttonCode == 'PAGE_FEEDBACK' || buttonCode == 'RECORD' || buttonCode == 'HELP_ADDLOTS' && participantMode == '0') {
                         continue;
                     } else {
                         if (isStart == true && permissionCode == 'start' || isDraft == '1') {
-                            if (buttonCode == 'PAGE_SAVE' || buttonCode == 'BASE_SUMBIT') {
+                            if (buttonCode == 'PAGE_SAVE' || buttonCode == 'BASE_SUMBIT' || buttonCode == 'OTHER_RELATION') {
                                 buttonArrayNew.push(buttonCode);
                             }
                             // 发起人已配置作废，且流程已有数据（退回/撤回到发起人）时显示作废
@@ -1907,6 +1920,7 @@ var PageHome = function (_React$Component) {
                 buttonList.push({ name: t.state.finalButtons.get("HELP_FORWARD"), type: 'secondary', display: 'inline', no: 20 });
             } else if (listType == "4") {
                 //我的
+                var processStatusNow = String(content.processStatus != null ? content.processStatus : content.status != null ? content.status : '');
                 if (this.state.processIsComplete == "0") {
                     //当流程未结束时,
                     if (buttons.indexOf('FLOW_CANCEL') >= 0) {
@@ -1919,7 +1933,6 @@ var PageHome = function (_React$Component) {
                             buttonList.push({ name: t.state.finalButtons.get("FLOW_REVOKE"), type: 'secondary', display: 'inline', no: 7 });
                         }
                         // 与 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;
@@ -1940,6 +1953,18 @@ var PageHome = function (_React$Component) {
                         buttonList.push({ name: t.state.finalButtons.get("PAGE_URGE"), type: 'secondary', display: 'inline', no: 12 });
                     }
                 }
+                // 不通过(status=6)：与 PC 一致，点开详情允许作废（发起人节点配置了 BASE_INVALID）
+                if (processStatusNow == '6' && startButtons && startButtons.indexOf('BASE_INVALID') >= 0) {
+                    var hasInvalidBtn = false;
+                    for (var bi = 0; bi < buttonList.length; bi++) {
+                        if (buttonList[bi] && buttonList[bi].no == 9) {
+                            hasInvalidBtn = true;break;
+                        }
+                    }
+                    if (!hasInvalidBtn) {
+                        buttonList.push({ name: t.state.finalButtons.get("BASE_INVALID"), type: 'danger', display: 'inline', no: 9 });
+                    }
+                }
                 if (startButtons) {
                     if (startButtons.indexOf('HELP_CIRCULATE') >= 0) {
                         //传阅
@@ -2630,6 +2655,9 @@ var PageHome = function (_React$Component) {
                         case 'MAILSEND':
                             t.handleSubmit(18);
                             break;
+                        case 'OTHER_RELATION':
+                            t.handleSubmit('OTHER_RELATION');
+                            break;
                         default:
                             t.handleSubmit(actionSheetButtonOpt[index]);
                             break;
@@ -3599,6 +3627,9 @@ var PageHome = function (_React$Component) {
                         $(window).scrollTop(0);
                     });
                 }
+            } else if (operate == 'OTHER_RELATION') {
+                //关联流程
+                this.openRelationPicker();
             } else {
                 //其他按钮
                 if (typeof FlowCommon[operate] === "function") {
@@ -4652,6 +4683,162 @@ var PageHome = function (_React$Component) {
                 this.startSubProcess();
             }
         }
+
+        // 打开关联流程选择（标题搜索多选）
+
+    }, {
+        key: 'openRelationPicker',
+        value: function openRelationPicker() {
+            var t = this;
+            var processInstanceId = t.state.processInstanceId;
+            if (!processInstanceId || processInstanceId === '-99' || processInstanceId === 'undefined' || processInstanceId === 'null') {
+                _Toast2.default.show({
+                    type: 'error',
+                    content: '请先保存/提交生成流程后再关联'
+                });
+                return;
+            }
+            // 先拉已关联列表再打开，保证已关联流程不可选；关闭必须用本层 Popup 实例 close
+            _db2.default.FlowModuleAPI.getRelationProcess({
+                processInstanceId: processInstanceId
+            }).then(function (content) {
+                var excludeIds = [processInstanceId];
+                var list = [];
+                if (Array.isArray(content)) {
+                    list = content;
+                } else if (content && Array.isArray(content.data)) {
+                    list = content.data;
+                }
+                for (var i = 0; i < list.length; i++) {
+                    var rid = list[i].processInstanceId || list[i].id;
+                    if (rid) {
+                        excludeIds.push(String(rid));
+                    }
+                }
+                var relationRef = t.refs.relationProcess_list;
+                if (relationRef && relationRef.state && relationRef.state.relationList) {
+                    for (var j = 0; j < relationRef.state.relationList.length; j++) {
+                        var rid2 = relationRef.state.relationList[j].processInstanceId;
+                        if (rid2) {
+                            excludeIds.push(String(rid2));
+                        }
+                    }
+                }
+                var popupInst = null;
+                var closePicker = function closePicker() {
+                    try {
+                        if (popupInst && typeof popupInst.close === 'function') {
+                            popupInst.close();
+                        } else {
+                            _Popup2.default.hide();
+                        }
+                    } catch (e) {
+                        try {
+                            _Popup2.default.hide();
+                        } catch (e2) {}
+                    }
+                };
+                popupInst = _Popup2.default.show(_react2.default.createElement(_RelationProcessPicker2.default, {
+                    processInstanceId: processInstanceId,
+                    activityId: t.state.activityId,
+                    excludeIds: excludeIds,
+                    onClose: closePicker,
+                    onSuccess: function onSuccess() {
+                        t.refreshRelationTab();
+                    }
+                }), {
+                    animationType: 'slide-left',
+                    className: 'relation-process-picker-popup',
+                    maskClosable: true
+                });
+            }).catch(function () {
+                _Toast2.default.show({
+                    type: 'error',
+                    content: '获取已关联流程失败'
+                });
+            });
+        }
+
+        // 刷新关联流程页签数量与列表
+
+    }, {
+        key: 'refreshRelationTab',
+        value: function refreshRelationTab() {
+            var t = this;
+            var relationRef = t.refs.relationProcess_list;
+            if (relationRef && typeof relationRef.reload === 'function') {
+                relationRef.reload();
+            }
+            t.loadRelationCount();
+        }
+
+        // 仅刷新页签数量（不依赖 RelationProcess 是否已挂载）；可显式传入 processInstanceId
+
+    }, {
+        key: 'loadRelationCount',
+        value: function loadRelationCount(forceProcessInstanceId) {
+            var t = this;
+            var processInstanceId = forceProcessInstanceId || t.state.processInstanceId || t.props.processInstanceId;
+            if (!processInstanceId || processInstanceId === '-99' || processInstanceId === 'undefined' || processInstanceId === 'null') {
+                t.setState({ relationCount: 0 });
+                return;
+            }
+            _db2.default.FlowModuleAPI.getRelationProcess({
+                processInstanceId: processInstanceId
+            }).then(function (content) {
+                var list = t.normalizeRelationList(content);
+                t.setState({ relationCount: list.length });
+            }).catch(function () {
+                t.setState({ relationCount: 0 });
+            });
+        }
+
+        // 配合详情页 flex:0.25，完整展示「关联流程(N)」
+
+    }, {
+        key: 'getRelationTabTitle',
+        value: function getRelationTabTitle() {
+            var n = parseInt(this.state.relationCount, 10);
+            if (isNaN(n) || n < 0) {
+                n = 0;
+            }
+            return n > 0 ? '关联流程(' + n + ')' : '关联流程';
+        }
+    }, {
+        key: 'normalizeRelationList',
+        value: function normalizeRelationList(content) {
+            if (Array.isArray(content)) {
+                return content;
+            }
+            if (content && Array.isArray(content.data)) {
+                return content.data;
+            }
+            if (content && Array.isArray(content.content)) {
+                return content.content;
+            }
+            if (content && content.list && Array.isArray(content.list)) {
+                return content.list;
+            }
+            return [];
+        }
+    }, {
+        key: 'onRelationCountChange',
+        value: function onRelationCountChange(count) {
+            var n = parseInt(count, 10);
+            if (isNaN(n) || n < 0) {
+                n = 0;
+            }
+            // 与列表回写对齐，始终刷新页签数字
+            if (n !== this.state.relationCount) {
+                this.setState({
+                    relationCount: n
+                });
+            } else if (n > 0) {
+                // 同值也强制一次，避免 Tab 标题未重绘
+                this.forceUpdate();
+            }
+        }
+
         //子流程自动关联
 
     }, {
@@ -7292,6 +7479,8 @@ var PageHome = function (_React$Component) {
                                     buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: 'distributeFlow' });
                                 } else if (buttonCode == 'MAILSEND') {
                                     buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: 18 });
+                                } else if (buttonCode == 'OTHER_RELATION') {
+                                    buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: 'OTHER_RELATION' });
                                 } else {
                                     buttonCodeListNew.push({ name: buttonName, type: 'secondary', display: 'inline', no: buttonCode });
                                 }
@@ -7349,6 +7538,8 @@ var PageHome = function (_React$Component) {
                                 buttonList.push({ name: buttonName, type: 'secondary', display: 'inline', no: 20 });
                             } else if (buttonCode == 'MAILSEND') {
                                 buttonList.push({ name: buttonName, type: 'secondary', display: 'inline', no: 18 });
+                            } else if (buttonCode == 'OTHER_RELATION') {
+                                buttonList.push({ name: buttonName, type: 'secondary', display: 'inline', no: 'OTHER_RELATION' });
                             } else {
                                 buttonList.push({ name: buttonName, type: 'secondary', display: 'inline', no: buttonCode });
                             }
@@ -7923,11 +8114,19 @@ var PageHome = function (_React$Component) {
         key: 'handleChange',
         value: function handleChange(obj) {
             var t = this;
-            this.setState({ activeItemIndex: obj.active });
+            this.setState({ activeItemIndex: obj.active }, function () {
+                if (String(obj.active) === '3') {
+                    t.loadRelationCount();
+                }
+            });
             if (obj.active == '2') {
                 t.refs.flowChart_list.componentDidMount();
             } else if (obj.active == '3') {
-                t.refs.relationProcess_list.componentDidMount();
+                if (t.refs.relationProcess_list && typeof t.refs.relationProcess_list.reload === 'function') {
+                    t.refs.relationProcess_list.reload();
+                } else if (t.refs.relationProcess_list && typeof t.refs.relationProcess_list.componentDidMount === 'function') {
+                    t.refs.relationProcess_list.componentDidMount();
+                }
             }
         }
 
@@ -9127,14 +9326,26 @@ var PageHome = function (_React$Component) {
                             ),
                             _react2.default.createElement(
                                 _Tab2.default.Item,
-                                { key: '3', title: '\u5173\u8054\u6D41\u7A0B' },
+                                {
+                                    key: '3',
+                                    title: this.getRelationTabTitle()
+                                },
                                 _react2.default.createElement(
                                     _Group2.default.List,
                                     null,
                                     _react2.default.createElement(
                                         'div',
                                         { className: this.state.activeItemIndex == 3 ? '' : 't-DN' },
-                                        _react2.default.createElement(_RelationProcess2.default, { ref: "relationProcess_list", taskId: this.state.taskId, processInstanceId: this.state.processInstanceId, listType: this.state.listType })
+                                        _react2.default.createElement(_RelationProcess2.default, {
+                                            ref: "relationProcess_list",
+                                            taskId: this.state.taskId,
+                                            processInstanceId: this.state.processInstanceId,
+                                            listType: this.state.listType,
+                                            activityId: this.state.activityId,
+                                            canManage: this.state.hasRelationBtn && (this.state.listType == '0' || this.state.isDraft == '1' || this.state.permissionCode == 'start' || this.state.isStart === true),
+                                            onCountChange: this.onRelationCountChange.bind(this),
+                                            onDeleted: this.refreshRelationTab.bind(this)
+                                        })
                                     )
                                 )
                             ),

package/lib/process_info/processInfo.less

@@ -6,6 +6,38 @@
     background: #fff;
 }
 
+/* 关联流程选择弹层：slide-left 默认无 left/width，需强制全屏，否则变成右侧窄条 */
+.relation-process-picker-popup {
+    left: 0 !important;
+    right: 0 !important;
+    width: 100% !important;
+    background: #fff;
+}
+.relation-process-picker-popup .t-popup-content {
+    width: 100%;
+    height: 100%;
+}
+.relation-process-picker {
+    width: 100%;
+    box-sizing: border-box;
+}
+.relation-process-picker-scroll {
+    overflow: hidden;
+}
+.relation-process-picker-scroll .t-scroll-list,
+.relation-process-picker-scroll .t-scrollview-list {
+    height: 100%;
+}
+.relation-pick-item-disabled {
+    background: #f7f8fa;
+}
+
+/* 详情页签略加宽（0.2→0.25），保证「关联流程(N)」完整显示，仍比均分整行紧凑 */
+.approve-content .approval-details .t-tab-bar .t-tab-tab,
+.approval-details .t-tab-bar .t-tab-tab {
+    flex: 0.25 !important;
+}
+
 /* 结束/不通过/作废「提醒对象」：已选文字勿压住右侧箭头（slot 模式 class 在 Field 根上） */
 .remind-object-field {
     .t-checkbox-field-value-wrap,

package/package.json

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