fmui-base 2.3.22 → 2.3.24

package/README.md

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

package/lib/comment_list/List.js

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

package/lib/comment_list/List.less

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

package/lib/db/approveUserResolve.js

@@ -0,0 +1,41 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getUsersByGrpIdSync = getUsersByGrpIdSync;
+exports.getUsersByDutyIdSync = getUsersByDutyIdSync;
+
+var _db = require('./db');
+
+var _db2 = _interopRequireDefault(_db);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function resolveApproveUsers(apiFn, paramKey, ids) {
+  if (!ids) {
+    return Promise.resolve([]);
+  }
+  var param = {};
+  param[paramKey] = ids;
+  return apiFn(param).then(function (content) {
+    return content || [];
+  }).catch(function (err) {
+    console.log('approveUserResolve error:', err);
+    return [];
+  });
+}
+
+/** 根据群组id获取用户列表（Promise，走 DB /api/m/approve/getUserIdsByGrpId） */
+/**
+ * 办理选人：群组/职务解析为用户（提交组装 selectedActivity 时调用）
+ * 通过 DB.FlowModuleAPI 走 /api/m/approve，FORM 提交（与 natty-fetch postDataFomat:FORM 一致）
+ */
+function getUsersByGrpIdSync(groupIds) {
+  return resolveApproveUsers(_db2.default.FlowModuleAPI.getUserIdsByGrpId, 'groupIds', groupIds);
+}
+
+/** 根据职务id获取用户列表（Promise，走 DB /api/m/approve/getUserIdsByDutyId） */
+function getUsersByDutyIdSync(dutyIds) {
+  return resolveApproveUsers(_db2.default.FlowModuleAPI.getUserIdsByDutyId, 'dutyIds', dutyIds);
+}

package/lib/db/db.js

@@ -1150,6 +1150,24 @@ context.create('FlowModuleAPI', {
       Authorization: 'Bearer ' + getLoginUserInfo().token
     },
     willFetch: function willFetch() {}
+  },
+  getUserIdsByGrpId: {
+    url: _variables2.default.URLS.getUserIdsByGrpId,
+    method: 'POST',
+    postDataFomat: 'FORM',
+    header: {
+      Authorization: 'Bearer ' + getLoginUserInfo().token
+    },
+    willFetch: function willFetch() {}
+  },
+  getUserIdsByDutyId: {
+    url: _variables2.default.URLS.getUserIdsByDutyId,
+    method: 'POST',
+    postDataFomat: 'FORM',
+    header: {
+      Authorization: 'Bearer ' + getLoginUserInfo().token
+    },
+    willFetch: function willFetch() {}
   }
 
 });

package/lib/db/variables.js

@@ -144,7 +144,9 @@ exports.default = {
         getUserSetInfo: urlBasicPrefix + 'setting/userinfo/getUserSetInfo' + '?', //获取用户组织信息
         orgSwitch: urlBasicPrefix + 'front/personal/orgSwitch' + '?', //切换组织
         updateStartUserOrg: approveUrlPrefix + 'updateStartUserOrg' + '?', //更新发起人组织
-        reloadFuzhiMacroFields: approveUrlPrefix + 'reloadFuzhiMacroFields' + '?' //组织切换后重载赋值宏值
+        reloadFuzhiMacroFields: approveUrlPrefix + 'reloadFuzhiMacroFields' + '?', //组织切换后重载赋值宏值
+        getUserIdsByGrpId: approveUrlPrefix + 'getUserIdsByGrpId', //根据群组id获取用户（POST FORM）
+        getUserIdsByDutyId: approveUrlPrefix + 'getUserIdsByDutyId' //根据职务id获取用户（POST FORM）
     },
     nodataIcon: context + "/mobile/fmui/images/noData.png",
     loadingIcon: context + "/mobile/fmui/images/loading.gif",