fmui-base 2.3.30 → 2.3.31

package/README.md

@@ -3,6 +3,7 @@
 ---npm publish
 
 ## 更新日志 
+- 2.3.31：移动端推送点开的流程表单切换组织不显示，集成新疆CA
 - 2.3.30：移动端日期型字段日期格式（xx年xx月xx日）移动端办理后丢失
 - 2.3.29：移动端办理宏值签名丢失
 - 2.3.28：传阅支持群发控制，支持禁选组织、职务、群组，管理员跳转选泽的用户用户替换跳转所在的节点办理人，指定办理的环节且后续节点是固定的办理人员的情况下支持无参与者自动通过，流程办理支持多次撤回

package/lib/comment_list/List.js

@@ -146,6 +146,23 @@ var PageHome = function (_React$Component) {
             }
           }).catch(function (error) {});
         });
+      } else if (caESignatureName == '1' && caFirm == 'xjca') {
+        commentList.map(function (item) {
+          var param = {};
+          param.commentId = item.id;
+          _db2.default.FlowApproval.getXinjiangCaImage(param).then(function (content) {
+            var signatureImg = content.image;
+            if (signatureImg && signatureImg != null && signatureImg != '') {
+              if ($("#commentSign-" + item.id).find(".signPic").length > 0) {
+                $("#commentSign-" + item.id).find(".signPic").attr("src", 'data:image/png;base64,' + signatureImg);
+              } else {
+                var signPicHtml = '<img class="t-H64 t-PR5 signPic" src="data:image/png;base64,' + signatureImg + '"/>';
+                $("#commentSign-" + item.id).find('.comment-html').append(signPicHtml);
+                $("#commentSign-" + item.id).find(".userName").css("display", "none");
+              }
+            }
+          }).catch(function (error) {});
+        });
       }
     }
 

package/lib/db/db.js

@@ -274,6 +274,22 @@ context.create('FlowApproval', {
     }
   },
 
+  getXinjiangCaImage: {
+    mockUrl: 'query/getXinjiangCaImage.json',
+    url: _variables2.default.URLS.getXinjiangCaImage,
+    header: {
+      Authorization: 'Bearer ' + getLoginUserInfo().token
+    },
+    method: 'POST',
+    willFetch: function willFetch() {
+      _Toast2.default.show({
+        content: _react2.default.createElement(_loading2.default, null),
+        hasMask: true,
+        duration: 800
+      });
+    }
+  },
+
   getPreTaskInfo: {
     mockUrl: 'query/getPreTaskInfo.json',
     url: _variables2.default.URLS.getPreTaskInfo,

package/lib/db/variables.js

@@ -120,6 +120,7 @@ exports.default = {
         signCA: approveUrlPrefix + "signCA" + '?', //CA加签
         verifySign: approveUrlPrefix + "verifySign" + '?', //CA验签
         getBeiJingCaImage: approveUrlPrefix + "getBeiJingCaImage" + '?', //获取北京CA图片
+        getXinjiangCaImage: approveUrlPrefix + "getXinjiangCaImage" + '?', //获取新疆CA本地签名图
         getPreTaskInfo: approveUrlPrefix + "getPreTaskInfo" + '?', //获取上一环节CA配置
         getApproveCount: approveUrlPrefix + 'getApproveCount?', //获取审批数量
         getUmcCount: umcUrlPrefix + 'getUndoUnreadMsgCount?', //获取待办消息数量

package/lib/process_info/processInfo.js

@@ -7903,13 +7903,15 @@ var PageHome = function (_React$Component) {
         key: 'isApproveOrgSwitcherScene',
         value: function isApproveOrgSwitcherScene() {
             var permissionCode = this.state.permissionCode;
-            return permissionCode == 'pending' || permissionCode == 'start' || permissionCode == 'draft';
+            var listType = this.state.listType;
+            return permissionCode == 'pending' || permissionCode == 'start' || permissionCode == 'draft' || listType == '0' || this.state.isStart == true;
         }
     }, {
         key: 'isApproveStartOrgUpdateScene',
         value: function isApproveStartOrgUpdateScene() {
             var permissionCode = this.state.permissionCode;
-            return permissionCode == 'start' || permissionCode == 'draft' || this.state.isStart == true;
+            var listType = this.state.listType;
+            return permissionCode == 'start' || permissionCode == 'draft' || this.state.isStart == true || listType == '0';
         }
     }, {
         key: 'resolveApproveOrgTargetId',

package/package.json

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